Mercurial > hg > mercurial
annotate mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java @ 157:43f4c91d5eaa
Implement BranchSupport interface
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Tue, 11 Jan 2011 20:38:46 +0300 |
parents | 3a8af53dea6b 7e36394a9c00 |
children | 5198b02fc5e9 |
rev | line source |
---|---|
25 | 1 /* |
95 | 2 * Copyright 2000-2010 JetBrains s.r.o. |
25 | 3 * |
4 * Licensed under the Apache License, Version 2.0 (the "License"); | |
5 * you may not use this file except in compliance with the License. | |
6 * You may obtain a copy of the License at | |
7 * | |
8 * http://www.apache.org/licenses/LICENSE-2.0 | |
9 * | |
10 * Unless required by applicable law or agreed to in writing, software | |
11 * distributed under the License is distributed on an "AS IS" BASIS, | |
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
13 * See the License for the specific language governing permissions and | |
14 * limitations under the License. | |
15 */ | |
0 | 16 package jetbrains.buildServer.buildTriggers.vcs.mercurial; |
17 | |
103 | 18 import jetbrains.buildServer.BuildAgent; |
0 | 19 import jetbrains.buildServer.Used; |
20 import jetbrains.buildServer.buildTriggers.vcs.AbstractVcsPropertiesProcessor; | |
21 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*; | |
22 import jetbrains.buildServer.log.Loggers; | |
103 | 23 import jetbrains.buildServer.serverSide.*; |
24 import jetbrains.buildServer.util.EventDispatcher; | |
0 | 25 import jetbrains.buildServer.util.FileUtil; |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
26 import jetbrains.buildServer.util.StringUtil; |
103 | 27 import jetbrains.buildServer.util.filters.Filter; |
28 import jetbrains.buildServer.util.filters.FilterUtil; | |
0 | 29 import jetbrains.buildServer.vcs.*; |
30 import jetbrains.buildServer.vcs.patches.PatchBuilder; | |
31 import org.jetbrains.annotations.NotNull; | |
32 import org.jetbrains.annotations.Nullable; | |
33 | |
1 | 34 import java.io.File; |
35 import java.io.FileFilter; | |
36 import java.io.FileInputStream; | |
37 import java.io.IOException; | |
38 import java.util.*; | |
21 | 39 import java.util.concurrent.ConcurrentHashMap; |
40 import java.util.concurrent.ConcurrentMap; | |
41 import java.util.concurrent.locks.Lock; | |
42 import java.util.concurrent.locks.ReentrantLock; | |
1 | 43 |
19 | 44 /** |
45 * Mercurial VCS plugin for TeamCity works as follows: | |
46 * <ul> | |
47 * <li>clones repository to internal storage | |
48 * <li>before any operation with working copy of repository pulls changes from the original repository | |
49 * <li>executes corresponding hg command | |
50 * </ul> | |
51 * | |
57 | 52 * <p>Working copy of repository is created in the $TEAMCITY_DATA_PATH/system/caches/hg_<hash code> folder. |
19 | 53 * <p>Personal builds (remote runs) are not yet supported, they require corresponding functionality from the IDE. |
54 */ | |
148
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
55 public class MercurialVcsSupport extends ServerVcsSupport implements LabelingSupport, VcsFileContentProvider, BranchSupport { |
21 | 56 private ConcurrentMap<String, Lock> myWorkDirLocks= new ConcurrentHashMap<String, Lock>(); |
57 private VcsManager myVcsManager; | |
27
7944e8985ebd
prepare modules structure for agent side checkout
Pavel.Sher
parents:
25
diff
changeset
|
58 private File myDefaultWorkFolderParent; |
0 | 59 |
21 | 60 public MercurialVcsSupport(@NotNull final VcsManager vcsManager, |
61 @NotNull ServerPaths paths, | |
103 | 62 @NotNull final SBuildServer server, |
63 @NotNull EventDispatcher<BuildServerListener> dispatcher) { | |
21 | 64 myVcsManager = vcsManager; |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
65 myDefaultWorkFolderParent = new File(paths.getCachesDir(), "mercurial"); |
103 | 66 dispatcher.addListener(new BuildServerAdapter() { |
67 @Override | |
121 | 68 public void cleanupFinished() { |
69 super.cleanupFinished(); | |
70 server.getExecutor().submit(new Runnable() { | |
71 public void run() { | |
72 removeOldWorkFolders(); | |
73 } | |
74 }); | |
75 } | |
76 | |
77 @Override | |
103 | 78 public void sourcesVersionReleased(@NotNull final BuildAgent agent) { |
79 super.sourcesVersionReleased(agent); | |
80 server.getExecutor().submit(new Runnable() { | |
81 public void run() { | |
82 Set<File> clonedRepos = getAllClonedRepos(); | |
83 if (clonedRepos == null) return; | |
84 for (File f: clonedRepos) { | |
85 lockWorkDir(f); | |
86 try { | |
87 FileUtil.delete(f); | |
88 } finally { | |
89 unlockWorkDir(f); | |
90 } | |
91 } | |
92 } | |
93 }); | |
94 } | |
95 }); | |
0 | 96 } |
97 | |
90 | 98 private Collection<ModifiedFile> computeModifiedFilesForMergeCommit(final Settings settings, final ChangeSet cur) throws VcsException { |
99 ChangedFilesCommand cfc = new ChangedFilesCommand(settings); | |
100 cfc.setRevId(cur.getId()); | |
101 return cfc.execute(); | |
102 } | |
103 | |
145
3a8af53dea6b
Normilize file separators and map paths when collect changes
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
104 private List<VcsChange> toVcsChanges(final List<ModifiedFile> modifiedFiles, String prevVer, String curVer, CheckoutRules rules) { |
0 | 105 List<VcsChange> files = new ArrayList<VcsChange>(); |
106 for (ModifiedFile mf: modifiedFiles) { | |
145
3a8af53dea6b
Normilize file separators and map paths when collect changes
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
107 String normalizedPath = PathUtil.normalizeSeparator(mf.getPath()); |
0 | 108 VcsChangeInfo.Type changeType = getChangeType(mf.getStatus()); |
109 if (changeType == null) { | |
110 Loggers.VCS.warn("Unable to convert status: " + mf.getStatus() + " to VCS change type"); | |
111 changeType = VcsChangeInfo.Type.NOT_CHANGED; | |
112 } | |
145
3a8af53dea6b
Normilize file separators and map paths when collect changes
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
113 files.add(new VcsChange(changeType, mf.getStatus().getName(), normalizedPath, rules.map(mf.getPath()), prevVer, curVer)); |
0 | 114 } |
115 return files; | |
116 } | |
117 | |
118 private VcsChangeInfo.Type getChangeType(final ModifiedFile.Status status) { | |
119 switch (status) { | |
120 case ADDED:return VcsChangeInfo.Type.ADDED; | |
121 case MODIFIED:return VcsChangeInfo.Type.CHANGED; | |
122 case REMOVED:return VcsChangeInfo.Type.REMOVED; | |
123 } | |
124 return null; | |
125 } | |
126 | |
127 @NotNull | |
86 | 128 public byte[] getContent(@NotNull final VcsModification vcsModification, |
129 @NotNull final VcsChangeInfo change, | |
130 @NotNull final VcsChangeInfo.ContentType contentType, | |
131 @NotNull final VcsRoot vcsRoot) throws VcsException { | |
44 | 132 syncClonedRepository(vcsRoot); |
12 | 133 String version = contentType == VcsChangeInfo.ContentType.AFTER_CHANGE ? change.getAfterChangeRevisionNumber() : change.getBeforeChangeRevisionNumber(); |
134 return getContent(change.getRelativeFileName(), vcsRoot, version); | |
0 | 135 } |
136 | |
137 @NotNull | |
86 | 138 public byte[] getContent(@NotNull final String filePath, @NotNull final VcsRoot vcsRoot, @NotNull final String version) throws VcsException { |
44 | 139 syncClonedRepository(vcsRoot); |
140 Settings settings = createSettings(vcsRoot); | |
12 | 141 CatCommand cc = new CatCommand(settings); |
59
30cc10fe9479
accept version in two formats: with rev number and without
Pavel.Sher
parents:
58
diff
changeset
|
142 cc.setRevId(new ChangeSet(version).getId()); |
12 | 143 File parentDir = cc.execute(Collections.singletonList(filePath)); |
30 | 144 try { |
145 File file = new File(parentDir, filePath); | |
146 if (file.isFile()) { | |
147 try { | |
148 return FileUtil.loadFileBytes(file); | |
149 } catch (IOException e) { | |
150 throw new VcsException("Failed to load content of file: " + file.getAbsolutePath(), e); | |
151 } | |
152 } else { | |
153 Loggers.VCS.warn("Unable to obtain content of the file: " + filePath); | |
12 | 154 } |
30 | 155 } finally { |
118
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
156 deleteTmpDir(parentDir); |
12 | 157 } |
0 | 158 return new byte[0]; |
159 } | |
160 | |
86 | 161 @NotNull |
0 | 162 public String getName() { |
28
a7cab5083ada
libraries moved on top level, dummy implementation of agent side checkout interface
Pavel.Sher
parents:
27
diff
changeset
|
163 return Constants.VCS_NAME; |
0 | 164 } |
165 | |
86 | 166 @NotNull |
0 | 167 @Used("jsp") |
168 public String getDisplayName() { | |
169 return "Mercurial"; | |
170 } | |
171 | |
172 @Nullable | |
173 public PropertiesProcessor getVcsPropertiesProcessor() { | |
174 return new AbstractVcsPropertiesProcessor() { | |
175 public Collection<InvalidProperty> process(final Map<String, String> properties) { | |
176 List<InvalidProperty> result = new ArrayList<InvalidProperty>(); | |
177 if (isEmpty(properties.get(Constants.HG_COMMAND_PATH_PROP))) { | |
178 result.add(new InvalidProperty(Constants.HG_COMMAND_PATH_PROP, "Path to 'hg' command must be specified")); | |
179 } | |
180 if (isEmpty(properties.get(Constants.REPOSITORY_PROP))) { | |
181 result.add(new InvalidProperty(Constants.REPOSITORY_PROP, "Repository must be specified")); | |
182 } | |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
183 if (isEmpty(properties.get(Constants.SERVER_CLONE_PATH_PROP))) { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
184 properties.put(Constants.SERVER_CLONE_PATH_PROP, myDefaultWorkFolderParent.getAbsolutePath()); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
185 } |
0 | 186 return result; |
187 } | |
188 }; | |
189 } | |
190 | |
86 | 191 @NotNull |
0 | 192 public String getVcsSettingsJspFilePath() { |
193 return "mercurialSettings.jsp"; | |
194 } | |
195 | |
196 @NotNull | |
86 | 197 public String getCurrentVersion(@NotNull final VcsRoot root) throws VcsException { |
19 | 198 // we will return full version of the most recent change as current version |
44 | 199 syncClonedRepository(root); |
200 Settings settings = createSettings(root); | |
57 | 201 BranchesCommand branches = new BranchesCommand(settings); |
202 Map<String, ChangeSet> result = branches.execute(); | |
203 if (!result.containsKey(settings.getBranchName())) { | |
204 throw new VcsException("Unable to find current version for the branch: " + settings.getBranchName()); | |
205 } | |
206 | |
207 return result.get(settings.getBranchName()).getFullVersion(); | |
0 | 208 } |
209 | |
106 | 210 public boolean sourcesUpdatePossibleIfChangesNotFound(@NotNull final VcsRoot root) { |
211 return false; | |
212 } | |
213 | |
86 | 214 @NotNull |
0 | 215 public String describeVcsRoot(final VcsRoot vcsRoot) { |
216 return "mercurial: " + vcsRoot.getProperty(Constants.REPOSITORY_PROP); | |
217 } | |
218 | |
106 | 219 @Override |
220 public TestConnectionSupport getTestConnectionSupport() { | |
221 return new TestConnectionSupport() { | |
222 public String testConnection(@NotNull final VcsRoot vcsRoot) throws VcsException { | |
223 Settings settings = createSettings(vcsRoot); | |
224 IdentifyCommand id = new IdentifyCommand(settings); | |
225 StringBuilder res = new StringBuilder(); | |
226 res.append(quoteIfNeeded(settings.getHgCommandPath())); | |
227 res.append(" identify "); | |
228 final String obfuscatedUrl = CommandUtil.removePrivateData(settings.getRepositoryUrl(), Collections.singleton(settings.getPassword())); | |
229 res.append(quoteIfNeeded(obfuscatedUrl)); | |
230 res.append('\n').append(id.execute()); | |
231 return res.toString(); | |
232 } | |
233 }; | |
0 | 234 } |
235 | |
17 | 236 private String quoteIfNeeded(@NotNull String str) { |
237 if (str.indexOf(' ') != -1) { | |
238 return "\"" + str + "\""; | |
239 } | |
240 | |
241 return str; | |
242 } | |
243 | |
0 | 244 @Nullable |
245 public Map<String, String> getDefaultVcsProperties() { | |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
246 Map<String, String> defaults = new HashMap<String, String>(); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
247 defaults.put(Constants.HG_COMMAND_PATH_PROP, "hg"); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
248 defaults.put(Constants.SERVER_CLONE_PATH_PROP, myDefaultWorkFolderParent.getAbsolutePath()); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
249 return defaults; |
0 | 250 } |
251 | |
86 | 252 public String getVersionDisplayName(@NotNull final String version, @NotNull final VcsRoot root) throws VcsException { |
59
30cc10fe9479
accept version in two formats: with rev number and without
Pavel.Sher
parents:
58
diff
changeset
|
253 return new ChangeSet(version).getId(); |
0 | 254 } |
255 | |
256 @NotNull | |
257 public Comparator<String> getVersionComparator() { | |
19 | 258 // comparator is called when TeamCity needs to sort modifications in the order of their appearance, |
259 // currently we sort changes by revision number, not sure however that this is a good idea, | |
260 // probably it would be better to sort them by timestamp (and to add timestamp into the version). | |
0 | 261 return new Comparator<String>() { |
262 public int compare(final String o1, final String o2) { | |
263 try { | |
264 return new ChangeSet(o1).getRevNumber() - new ChangeSet(o2).getRevNumber(); | |
265 } catch (Exception e) { | |
266 return 1; | |
267 } | |
268 } | |
269 }; | |
270 } | |
271 | |
19 | 272 // builds patch from version to version |
79 | 273 private void buildIncrementalPatch(final Settings settings, @NotNull final ChangeSet fromVer, @NotNull final ChangeSet toVer, final PatchBuilder builder, final CheckoutRules checkoutRules) |
0 | 274 throws VcsException, IOException { |
275 StatusCommand st = new StatusCommand(settings); | |
276 st.setFromRevId(fromVer.getId()); | |
277 st.setToRevId(toVer.getId()); | |
278 List<ModifiedFile> modifiedFiles = st.execute(); | |
279 List<String> notDeletedFiles = new ArrayList<String>(); | |
280 for (ModifiedFile f: modifiedFiles) { | |
281 if (f.getStatus() != ModifiedFile.Status.REMOVED) { | |
282 notDeletedFiles.add(f.getPath()); | |
283 } | |
284 } | |
285 | |
47
c785bc4c5f39
minor fix: do not call cat command if there are no files to export
Pavel.Sher
parents:
46
diff
changeset
|
286 if (notDeletedFiles.isEmpty()) return; |
c785bc4c5f39
minor fix: do not call cat command if there are no files to export
Pavel.Sher
parents:
46
diff
changeset
|
287 |
0 | 288 CatCommand cc = new CatCommand(settings); |
289 cc.setRevId(toVer.getId()); | |
290 File parentDir = cc.execute(notDeletedFiles); | |
291 | |
292 try { | |
293 for (ModifiedFile f: modifiedFiles) { | |
79 | 294 String mappedPath = checkoutRules.map(f.getPath()); |
295 if (mappedPath == null) continue; // skip | |
296 final File virtualFile = new File(mappedPath); | |
0 | 297 if (f.getStatus() == ModifiedFile.Status.REMOVED) { |
298 builder.deleteFile(virtualFile, true); | |
299 } else { | |
300 File realFile = new File(parentDir, f.getPath()); | |
301 FileInputStream is = new FileInputStream(realFile); | |
302 try { | |
11 | 303 builder.changeOrCreateBinaryFile(virtualFile, null, is, realFile.length()); |
0 | 304 } finally { |
305 is.close(); | |
306 } | |
307 } | |
308 } | |
309 } finally { | |
118
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
310 deleteTmpDir(parentDir); |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
311 } |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
312 } |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
313 |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
314 private void deleteTmpDir(File parentDir) { |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
315 boolean dirDeleted = FileUtil.delete(parentDir); |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
316 if (!dirDeleted) { |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
317 Loggers.VCS.warn("Can not delete directory \"" + parentDir.getAbsolutePath() + "\""); |
0 | 318 } |
319 } | |
320 | |
19 | 321 // builds patch by exporting files using specified version |
79 | 322 private void buildFullPatch(final Settings settings, @NotNull final ChangeSet toVer, final PatchBuilder builder, final CheckoutRules checkoutRules) |
0 | 323 throws IOException, VcsException { |
324 CloneCommand cl = new CloneCommand(settings); | |
57 | 325 // clone from the local repository |
67
e6971dc6b17c
always use url with credentials if username/password are specified
Pavel.Sher
parents:
62
diff
changeset
|
326 cl.setRepository(settings.getLocalRepositoryDir().getAbsolutePath()); |
0 | 327 cl.setToId(toVer.getId()); |
57 | 328 cl.setUpdateWorkingDir(false); |
0 | 329 File tempDir = FileUtil.createTempDirectory("mercurial", toVer.getId()); |
330 try { | |
331 final File repRoot = new File(tempDir, "rep"); | |
332 cl.setDestDir(repRoot.getAbsolutePath()); | |
333 cl.execute(); | |
57 | 334 |
335 UpdateCommand up = new UpdateCommand(settings); | |
336 up.setWorkDirectory(repRoot.getAbsolutePath()); | |
337 up.setToId(toVer.getId()); | |
338 up.execute(); | |
339 | |
0 | 340 buildPatchFromDirectory(builder, repRoot, new FileFilter() { |
341 public boolean accept(final File file) { | |
342 return !(file.isDirectory() && ".hg".equals(file.getName())); | |
343 } | |
79 | 344 }, checkoutRules); |
0 | 345 } finally { |
346 FileUtil.delete(tempDir); | |
347 } | |
348 } | |
349 | |
79 | 350 private void buildPatchFromDirectory(final PatchBuilder builder, final File repRoot, final FileFilter filter, final CheckoutRules checkoutRules) throws IOException { |
351 buildPatchFromDirectory(repRoot, builder, repRoot, filter, checkoutRules); | |
0 | 352 } |
353 | |
79 | 354 private void buildPatchFromDirectory(File curDir, final PatchBuilder builder, final File repRoot, final FileFilter filter, final CheckoutRules checkoutRules) throws IOException { |
0 | 355 File[] files = curDir.listFiles(filter); |
356 if (files != null) { | |
357 for (File realFile: files) { | |
358 String relPath = realFile.getAbsolutePath().substring(repRoot.getAbsolutePath().length()); | |
79 | 359 String mappedPath = checkoutRules.map(relPath); |
97 | 360 if (mappedPath != null && mappedPath.length() > 0) { |
79 | 361 final File virtualFile = new File(mappedPath); |
362 if (realFile.isDirectory()) { | |
363 builder.createDirectory(virtualFile); | |
364 buildPatchFromDirectory(realFile, builder, repRoot, filter, checkoutRules); | |
365 } else { | |
366 final FileInputStream is = new FileInputStream(realFile); | |
367 try { | |
368 builder.createBinaryFile(virtualFile, null, is, realFile.length()); | |
369 } finally { | |
370 is.close(); | |
371 } | |
0 | 372 } |
97 | 373 } else { |
374 if (realFile.isDirectory()) { | |
375 buildPatchFromDirectory(realFile, builder, repRoot, filter, checkoutRules); | |
376 } | |
0 | 377 } |
378 } | |
379 } | |
380 } | |
381 | |
19 | 382 // updates current working copy of repository by pulling changes from the repository specified in VCS root |
44 | 383 private void syncClonedRepository(final VcsRoot root) throws VcsException { |
384 Settings settings = createSettings(root); | |
57 | 385 File workDir = settings.getLocalRepositoryDir(); |
21 | 386 lockWorkDir(workDir); |
387 try { | |
29 | 388 if (settings.hasCopyOfRepository()) { |
0 | 389 // update |
8 | 390 PullCommand pull = new PullCommand(settings); |
391 pull.execute(); | |
0 | 392 } else { |
393 // clone | |
394 CloneCommand cl = new CloneCommand(settings); | |
22 | 395 cl.setDestDir(workDir.getAbsolutePath()); |
18 | 396 cl.setUpdateWorkingDir(false); |
0 | 397 cl.execute(); |
398 } | |
21 | 399 } finally { |
400 unlockWorkDir(workDir); | |
0 | 401 } |
402 } | |
403 | |
44 | 404 @Override |
405 public LabelingSupport getLabelingSupport() { | |
406 return this; | |
407 } | |
408 | |
106 | 409 @NotNull |
410 public VcsFileContentProvider getContentProvider() { | |
411 return this; | |
412 } | |
413 | |
156
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
414 @NotNull |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
415 public String getRemoteRunOnBranchPattern() { |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
416 return "remote-run/{teamcity.user}/.+"; |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
417 } |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
418 |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
419 @NotNull |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
420 public Map<String, String> getBranchesRevisions(@NotNull VcsRoot root) throws VcsException { |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
421 syncClonedRepository(root); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
422 Settings settings = createSettings(root); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
423 BranchesCommand branches = new BranchesCommand(settings); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
424 Map<String, String> result = new HashMap<String, String>(); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
425 for (Map.Entry<String, ChangeSet> entry : branches.execute().entrySet()) { |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
426 result.put(entry.getKey(), entry.getValue().getId()); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
427 } |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
428 return result; |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
429 } |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
430 |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
431 @NotNull |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
432 public Map<String, String> getBranchRootOptions(@NotNull VcsRoot root, @NotNull String branchName) { |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
433 final Map<String, String> options = new HashMap<String, String>(root.getProperties()); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
434 options.put(Constants.BRANCH_NAME_PROP, branchName); |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
435 return options; |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
436 } |
7e36394a9c00
Implement new methods from BranchSupport
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
155
diff
changeset
|
437 |
148
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
438 public List<ModificationData> collectChanges(@NotNull VcsRoot fromRoot, @NotNull String fromRootRevision, |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
439 @NotNull VcsRoot toRoot, @Nullable String toRootRevision, |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
440 @NotNull CheckoutRules checkoutRules) throws VcsException { |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
441 //we get all branches while clone, if vcs roots are related it is doesn't matter in which one search for branch point |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
442 syncClonedRepository(fromRoot); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
443 String branchPoint = getBranchPoint(fromRoot, fromRootRevision, toRootRevision); |
155
b71e3e8fc990
We should collect changes in the 'toRoot'
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
151
diff
changeset
|
444 return ((CollectChangesByCheckoutRules) getCollectChangesPolicy()).collectChanges(toRoot, branchPoint, toRootRevision, checkoutRules); |
148
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
445 } |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
446 |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
447 private String getBranchPoint(@NotNull VcsRoot root, String branchOneRev, String branchTwoRev) throws VcsException { |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
448 Settings settings = createSettings(root); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
449 LogCommand lc = new LogCommand(settings); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
450 lc.setFromRevId(new ChangeSetRevision(branchOneRev).getId()); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
451 lc.setToRevId(new ChangeSetRevision(branchTwoRev).getId()); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
452 lc.setLimit(1); |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
453 List<ChangeSet> changeSets = lc.execute(); |
151
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
454 ChangeSet cs = changeSets.get(0); |
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
455 if (cs.isInitial()) { |
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
456 return cs.getId(); |
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
457 } else { |
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
458 return cs.getParents().get(0).getId(); |
97da90dac992
If branch point is initial cset - do no try to find its parents
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
148
diff
changeset
|
459 } |
148
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
460 } |
403d16397f5c
Initial implementation of BranchSupport interface
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
461 |
106 | 462 @NotNull |
463 public CollectChangesPolicy getCollectChangesPolicy() { | |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
464 return new CollectChangesByCheckoutRules() { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
465 public List<ModificationData> collectChanges(@NotNull VcsRoot root, @NotNull String fromVersion, @Nullable String currentVersion, @NotNull CheckoutRules checkoutRules) throws VcsException { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
466 syncClonedRepository(root); |
106 | 467 |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
468 // first obtain changes between specified versions |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
469 List<ModificationData> result = new ArrayList<ModificationData>(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
470 if (currentVersion == null) return result; |
106 | 471 |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
472 Settings settings = createSettings(root); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
473 LogCommand lc = new LogCommand(settings); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
474 String fromId = new ChangeSetRevision(fromVersion).getId(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
475 lc.setFromRevId(fromId); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
476 lc.setToRevId(new ChangeSetRevision(currentVersion).getId()); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
477 List<ChangeSet> changeSets = lc.execute(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
478 if (changeSets.isEmpty()) { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
479 return result; |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
480 } |
106 | 481 |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
482 // invoke status command for each changeset and determine what files were modified in these changesets |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
483 StatusCommand st = new StatusCommand(settings); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
484 ChangeSet prev = new ChangeSet(fromVersion); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
485 for (ChangeSet cur : changeSets) { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
486 if (cur.getId().equals(fromId)) continue; // skip already reported changeset |
106 | 487 |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
488 String prevId = prev.getId(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
489 List<ChangeSetRevision> curParents = cur.getParents(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
490 boolean merge = curParents != null && curParents.size() > 1; |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
491 if (curParents != null && !merge) { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
492 prevId = curParents.get(0).getId(); |
106 | 493 } |
494 | |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
495 List<ModifiedFile> modifiedFiles = new ArrayList<ModifiedFile>(); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
496 if (merge) { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
497 modifiedFiles.addAll(computeModifiedFilesForMergeCommit(settings, cur)); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
498 } else { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
499 st.setFromRevId(prevId); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
500 st.setToRevId(cur.getId()); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
501 modifiedFiles = st.execute(); |
106 | 502 } |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
503 |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
504 // changeset full version will be set into VcsChange structure and |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
505 // stored in database (note that getContent method will be invoked with this version) |
145
3a8af53dea6b
Normilize file separators and map paths when collect changes
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
144
diff
changeset
|
506 List<VcsChange> files = toVcsChanges(modifiedFiles, prev.getFullVersion(), cur.getFullVersion(), checkoutRules); |
144
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
507 if (files.isEmpty() && !merge) continue; |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
508 ModificationData md = new ModificationData(cur.getTimestamp(), files, cur.getDescription(), cur.getUser(), root, cur.getFullVersion(), cur.getId()); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
509 if (merge) { |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
510 md.setCanBeIgnored(false); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
511 } |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
512 result.add(md); |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
513 prev = cur; |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
514 } |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
515 |
2e90ef872b68
Collect changes using CheckoutRules.
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
142
diff
changeset
|
516 return result; |
106 | 517 } |
518 }; | |
519 } | |
520 | |
521 @NotNull | |
522 public BuildPatchPolicy getBuildPatchPolicy() { | |
523 return new BuildPatchByCheckoutRules() { | |
524 public void buildPatch(@NotNull final VcsRoot root, | |
525 @Nullable final String fromVersion, | |
526 @NotNull final String toVersion, | |
527 @NotNull final PatchBuilder builder, | |
528 @NotNull final CheckoutRules checkoutRules) throws IOException, VcsException { | |
529 syncClonedRepository(root); | |
530 Settings settings = createSettings(root); | |
531 if (fromVersion == null) { | |
532 buildFullPatch(settings, new ChangeSet(toVersion), builder, checkoutRules); | |
533 } else { | |
534 buildIncrementalPatch(settings, new ChangeSet(fromVersion), new ChangeSet(toVersion), builder, checkoutRules); | |
535 } | |
536 } | |
537 }; | |
538 } | |
539 | |
22 | 540 private void lockWorkDir(@NotNull File workDir) { |
21 | 541 getWorkDirLock(workDir).lock(); |
542 } | |
543 | |
22 | 544 private void unlockWorkDir(@NotNull File workDir) { |
21 | 545 getWorkDirLock(workDir).unlock(); |
546 } | |
547 | |
31 | 548 @Override |
106 | 549 public boolean allowSourceCaching() { |
31 | 550 // since a copy of repository for each VCS root is already stored on disk |
106 | 551 // we do not need separate cache for our patches |
552 return false; | |
31 | 553 } |
554 | |
22 | 555 private Lock getWorkDirLock(final File workDir) { |
556 String path = workDir.getAbsolutePath(); | |
557 Lock lock = myWorkDirLocks.get(path); | |
21 | 558 if (lock == null) { |
559 lock = new ReentrantLock(); | |
22 | 560 Lock curLock = myWorkDirLocks.putIfAbsent(path, lock); |
21 | 561 if (curLock != null) { |
562 lock = curLock; | |
563 } | |
564 } | |
565 return lock; | |
566 } | |
567 | |
23 | 568 private void removeOldWorkFolders() { |
103 | 569 Set<File> workDirs = getAllClonedRepos(); |
570 if (workDirs == null) return; | |
571 | |
572 for (VcsRoot vcsRoot: getMercurialVcsRoots()) { | |
573 try { | |
574 Settings s = createSettings(vcsRoot); | |
575 workDirs.remove(PathUtil.getCanonicalFile(s.getLocalRepositoryDir())); | |
576 } catch (VcsException e) { | |
577 Loggers.VCS.error(e); | |
578 } | |
579 } | |
580 | |
581 for (File f: workDirs) { | |
582 lockWorkDir(f); | |
583 try { | |
584 FileUtil.delete(f); | |
585 } finally { | |
586 unlockWorkDir(f); | |
587 } | |
588 } | |
589 } | |
590 | |
591 private Collection<VcsRoot> getMercurialVcsRoots() { | |
592 List<VcsRoot> res = new ArrayList<VcsRoot>(myVcsManager.getAllRegisteredVcsRoots()); | |
593 FilterUtil.filterCollection(res, new Filter<VcsRoot>() { | |
594 public boolean accept(@NotNull final VcsRoot data) { | |
595 return getName().equals(data.getVcsName()); | |
596 } | |
597 }); | |
598 return res; | |
599 } | |
600 | |
601 @Nullable | |
602 private Set<File> getAllClonedRepos() { | |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
603 File workFoldersParent = myDefaultWorkFolderParent; |
103 | 604 if (!workFoldersParent.isDirectory()) return null; |
23 | 605 |
606 Set<File> workDirs = new HashSet<File>(); | |
607 File[] files = workFoldersParent.listFiles(new FileFilter() { | |
608 public boolean accept(final File file) { | |
609 return file.isDirectory() && file.getName().startsWith(Settings.DEFAULT_WORK_DIR_PREFIX); | |
610 } | |
611 }); | |
612 if (files != null) { | |
613 for (File f: files) { | |
46 | 614 workDirs.add(PathUtil.getCanonicalFile(f)); |
23 | 615 } |
616 } | |
103 | 617 return workDirs; |
23 | 618 } |
44 | 619 |
620 public String label(@NotNull String label, @NotNull String version, @NotNull VcsRoot root, @NotNull CheckoutRules checkoutRules) throws VcsException { | |
621 syncClonedRepository(root); | |
622 | |
623 Settings settings = createSettings(root); | |
624 | |
625 // I do not know why but hg tag does not work correctly if | |
626 // update command was not invoked for the current repo | |
627 // in such case if there were no tags before Mercurial attempts to | |
628 // create new head when tag is pushed to the parent repository | |
629 UpdateCommand uc = new UpdateCommand(settings); | |
630 uc.execute(); | |
631 | |
632 String fixedTagname = fixTagName(label); | |
633 TagCommand tc = new TagCommand(settings); | |
634 tc.setRevId(new ChangeSet(version).getId()); | |
635 tc.setTag(fixedTagname); | |
636 tc.execute(); | |
637 | |
638 PushCommand pc = new PushCommand(settings); | |
101 | 639 // pc.setForce(true); |
44 | 640 pc.execute(); |
641 return fixedTagname; | |
642 } | |
643 | |
644 private String fixTagName(final String label) { | |
645 // according to Mercurial documentation http://hgbook.red-bean.com/hgbookch8.html#x12-1570008 | |
646 // tag name must not contain: | |
118
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
647 // Colon (ASCII 58, �:�) |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
648 // Carriage return (ASCII 13, �\r�) |
80eb7fdc4de0
Add logging for deleting tmp directories
nd@localhost.localdomain
parents:
106
diff
changeset
|
649 // Newline (ASCII 10, �\n�) |
44 | 650 // all these characters will be replaced with _ (underscore) |
651 return label.replace(':', '_').replace('\r', '_').replace('\n', '_'); | |
652 } | |
653 | |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
654 private Settings createSettings(final VcsRoot root) throws VcsException { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
655 Settings settings = new Settings(myDefaultWorkFolderParent, root); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
656 String customClonePath = root.getProperty(Constants.SERVER_CLONE_PATH_PROP); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
657 if (!StringUtil.isEmptyOrSpaces(customClonePath) && !myDefaultWorkFolderParent.equals(new File(customClonePath).getAbsoluteFile())) { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
658 File parentDir = new File(customClonePath); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
659 createClonedRepositoryParentDir(parentDir); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
660 |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
661 // take last part of repository path |
67
e6971dc6b17c
always use url with credentials if username/password are specified
Pavel.Sher
parents:
62
diff
changeset
|
662 String repPath = settings.getRepositoryUrl(); |
62
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
663 String[] splitted = repPath.split("[/\\\\]"); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
664 if (splitted.length > 0) { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
665 repPath = splitted[splitted.length-1]; |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
666 } |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
667 |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
668 File customWorkingDir = new File(parentDir, repPath); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
669 settings.setWorkingDir(customWorkingDir); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
670 } else { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
671 createClonedRepositoryParentDir(myDefaultWorkFolderParent); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
672 } |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
673 return settings; |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
674 } |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
675 |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
676 private void createClonedRepositoryParentDir(final File parentDir) throws VcsException { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
677 if (!parentDir.exists() && !parentDir.mkdirs()) { |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
678 throw new VcsException("Failed to create parent directory for cloned repository: " + parentDir.getAbsolutePath()); |
b328c6b6526d
TW-5636: Mercurial plugin can easilly hit Windows MAX_PATH limitations
Pavel.Sher
parents:
59
diff
changeset
|
679 } |
44 | 680 } |
48 | 681 |
682 public boolean isAgentSideCheckoutAvailable() { | |
683 return true; | |
684 } | |
0 | 685 } |