annotate mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Settings.java @ 65:3cb4f95a4f6f

do not show credentials in the error messages
author Pavel.Sher
date Thu, 09 Jul 2009 21:21:36 +0400
parents c9f14e3ef86d
children e6971dc6b17c
rev   line source
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
1 /*
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
2 * Copyright 2000-2007 JetBrains s.r.o.
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
3 *
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
4 * Licensed under the Apache License, Version 2.0 (the "License");
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
5 * you may not use this file except in compliance with the License.
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
6 * You may obtain a copy of the License at
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
7 *
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
8 * http://www.apache.org/licenses/LICENSE-2.0
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
9 *
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
10 * Unless required by applicable law or agreed to in writing, software
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
11 * distributed under the License is distributed on an "AS IS" BASIS,
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
13 * See the License for the specific language governing permissions and
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
14 * limitations under the License.
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
15 */
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
16 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
17
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
18 import jetbrains.buildServer.buildTriggers.vcs.mercurial.Constants;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
19 import jetbrains.buildServer.buildTriggers.vcs.mercurial.PathUtil;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
20 import jetbrains.buildServer.util.Hash;
44
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
21 import jetbrains.buildServer.util.StringUtil;
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
22 import jetbrains.buildServer.vcs.VcsRoot;
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
23 import org.jetbrains.annotations.NotNull;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
24
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
25 import java.io.File;
46
13d5f0f56e70 compatibility with TeamCity 3.x
Pavel.Sher
parents: 45
diff changeset
26 import java.util.HashSet;
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
27 import java.util.Set;
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
28
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
29 /**
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
30 * Represents Mercurial repository settings
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
31 */
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
32 public class Settings {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
33 private String myRepository;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
34 private String myHgCommandPath;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
35 private File myWorkingDir;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
36 private File myWorkFolderParentDir;
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
37 private String myUsername;
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
38 private String myPassword;
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
39 private String myBranchName;
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
40 private static final String DEFAULT_BRANCH_NAME = "default";
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
41
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
42 public Settings(@NotNull File workFolderParentDir, @NotNull VcsRoot vcsRoot) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
43 myWorkFolderParentDir = workFolderParentDir;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
44 setRepository(vcsRoot.getProperty(Constants.REPOSITORY_PROP));
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
45 setHgCommandPath(vcsRoot.getProperty(Constants.HG_COMMAND_PATH_PROP));
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
46 myBranchName = vcsRoot.getProperty(Constants.BRANCH_NAME_PROP);
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
47
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
48 myUsername = vcsRoot.getProperty(Constants.USERNAME);
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
49 myPassword = vcsRoot.getProperty(Constants.PASSWORD);
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
50 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
51
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
52 public Settings() {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
53 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
54
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
55 public void setRepository(@NotNull final String repository) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
56 myRepository = repository;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
57 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
58
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
59 /**
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
60 * Returns repository path
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
61 * @return repository path
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
62 */
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
63 @NotNull
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
64 public String getRepository() {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
65 return myRepository;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
66 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
67
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
68 /**
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
69 * Returns name of the branch to use (returns 'default' if no branch specified)
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
70 * @return see above
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
71 */
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
72 @NotNull
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
73 public String getBranchName() {
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
74 return StringUtil.isEmpty(myBranchName) ? DEFAULT_BRANCH_NAME : myBranchName;
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
75 }
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
76
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
77 /**
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
78 * Returns true if current branch is default branch
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
79 * @return see above
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
80 */
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
81 public boolean isDefaultBranch() {
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
82 return getBranchName().equals(DEFAULT_BRANCH_NAME);
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
83 }
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
84
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
85 /**
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
86 * Returns path to hg command
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
87 * @return path to hg command
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
88 */
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
89 @NotNull
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
90 public String getHgCommandPath() {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
91 return myHgCommandPath;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
92 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
93
65
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
94 public String getUsername() {
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
95 return myUsername;
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
96 }
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
97
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
98 public String getPassword() {
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
99 return myPassword;
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
100 }
3cb4f95a4f6f do not show credentials in the error messages
Pavel.Sher
parents: 64
diff changeset
101
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
102 private final static Set<String> AUTH_PROTOS = new HashSet<String>();
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
103 static {
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
104 AUTH_PROTOS.add("http://");
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
105 AUTH_PROTOS.add("https://");
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
106 AUTH_PROTOS.add("ssh://");
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
107 }
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
108
44
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
109 /**
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
110 * Returns URL to use for push command
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
111 * @return URL to use for push command
44
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
112 */
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
113 public String getPushUrl() {
63
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
114 if (containsCredentials(myRepository)) return myRepository;
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
115
45
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
116 String cre = "";
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
117 if (!StringUtil.isEmpty(myUsername)) {
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
118 cre += myUsername;
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
119 if (!StringUtil.isEmpty(myPassword)) {
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
120 cre += ":" + myPassword;
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
121 }
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
122 cre += "@";
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
123 }
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
124
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
125 for (String proto: AUTH_PROTOS) {
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
126 if (myRepository.startsWith(proto)) {
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
127 return proto + cre + myRepository.substring(proto.length());
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
128 }
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
129 }
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
130
4059fcc5473e ask for credentials on mercurial settings page
Pavel.Sher
parents: 44
diff changeset
131 return myRepository;
44
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
132 }
1490e2981799 labeling/tagging support
Pavel.Sher
parents: 29
diff changeset
133
63
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
134 private boolean containsCredentials(final String repository) {
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
135 for (String proto: AUTH_PROTOS) {
64
c9f14e3ef86d minor fix
Pavel.Sher
parents: 63
diff changeset
136 if (repository.startsWith(proto)) {
c9f14e3ef86d minor fix
Pavel.Sher
parents: 63
diff changeset
137 String withoutProto = repository.substring(proto.length());
63
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
138 int comma = withoutProto.indexOf(':');
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
139 int at = withoutProto.indexOf('@');
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
140 if (at != -1 && comma != -1 && at > comma) return true;
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
141 }
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
142 }
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
143 return false;
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
144 }
cef5cfe52e3e do not set credentials in the url if url already has them
C:\Documents and Settings\pavel.sher\Application Data\The Bat!
parents: 57
diff changeset
145
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
146 public void setHgCommandPath(@NotNull final String hgCommandPath) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
147 myHgCommandPath = hgCommandPath;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
148 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
149
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
150 public void setWorkingDir(@NotNull final File workingDir) {
46
13d5f0f56e70 compatibility with TeamCity 3.x
Pavel.Sher
parents: 45
diff changeset
151 myWorkingDir = PathUtil.getCanonicalFile(workingDir);
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
152 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
153
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
154 /**
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
155 * Returns directory where repository is supposed to be cloned, i.e. working directory of cloned repository
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
156 * @return repository working directory
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
157 */
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
158 @NotNull
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
159 public File getLocalRepositoryDir() {
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
160 if (myWorkingDir != null) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
161 return myWorkingDir;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
162 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
163
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
164 return getDefaultWorkDir(myWorkFolderParentDir, myRepository);
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
165 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
166
29
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
167 /**
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
168 * Returns true if current working directory contains copy of repository (contains .hg directory)
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
169 * @return see above
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
170 */
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
171 public boolean hasCopyOfRepository() {
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
172 // need better way to check that repository copy is ok
57
99e757f2527b branches support
Pavel.Sher
parents: 46
diff changeset
173 return getLocalRepositoryDir().isDirectory() && new File(getLocalRepositoryDir(), ".hg").isDirectory();
29
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
174 }
798e750e4f26 first version of agent side checkout
Pavel.Sher
parents: 27
diff changeset
175
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
176 public static String DEFAULT_WORK_DIR_PREFIX = "hg_";
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
177
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
178 private static File getDefaultWorkDir(@NotNull File workFolderParentDir, @NotNull String repPath) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
179 String workingDirname = DEFAULT_WORK_DIR_PREFIX + String.valueOf(Hash.calc(normalize(repPath)));
46
13d5f0f56e70 compatibility with TeamCity 3.x
Pavel.Sher
parents: 45
diff changeset
180 return PathUtil.getCanonicalFile(new File(workFolderParentDir, workingDirname));
27
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
181 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
182
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
183 private static String normalize(final String path) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
184 String normalized = PathUtil.normalizeSeparator(path);
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
185 if (path.endsWith("/")) {
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
186 return normalized.substring(0, normalized.length()-1);
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
187 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
188 return normalized;
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
189 }
7944e8985ebd prepare modules structure for agent side checkout
Pavel.Sher
parents:
diff changeset
190 }