annotate mercurial/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java @ 25:7047f643747f

license added, preamble added to source code
author Pavel.Sher
date Mon, 21 Jul 2008 21:15:24 +0400
parents 3ddf410c2fd6
children
rev   line source
25
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
1 /*
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
2 * Copyright 2000-2007 JetBrains s.r.o.
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
3 *
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
4 * Licensed under the Apache License, Version 2.0 (the "License");
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
5 * you may not use this file except in compliance with the License.
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
6 * You may obtain a copy of the License at
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
7 *
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
8 * http://www.apache.org/licenses/LICENSE-2.0
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
9 *
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
10 * Unless required by applicable law or agreed to in writing, software
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
11 * distributed under the License is distributed on an "AS IS" BASIS,
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
13 * See the License for the specific language governing permissions and
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
14 * limitations under the License.
7047f643747f license added, preamble added to source code
Pavel.Sher
parents: 23
diff changeset
15 */
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
16 package jetbrains.buildServer.buildTriggers.vcs.mercurial;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
17
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
18 import jetbrains.buildServer.CollectChangesByIncludeRule;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
19 import jetbrains.buildServer.Used;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
20 import jetbrains.buildServer.buildTriggers.vcs.AbstractVcsPropertiesProcessor;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
21 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
22 import jetbrains.buildServer.log.Loggers;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
23 import jetbrains.buildServer.serverSide.InvalidProperty;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
24 import jetbrains.buildServer.serverSide.PropertiesProcessor;
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
25 import jetbrains.buildServer.serverSide.SBuildServer;
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
26 import jetbrains.buildServer.serverSide.ServerPaths;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
27 import jetbrains.buildServer.util.FileUtil;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
28 import jetbrains.buildServer.vcs.*;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
29 import jetbrains.buildServer.vcs.patches.PatchBuilder;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
30 import org.jetbrains.annotations.NotNull;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
31 import org.jetbrains.annotations.Nullable;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
32
1
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
33 import java.io.File;
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
34 import java.io.FileFilter;
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
35 import java.io.FileInputStream;
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
36 import java.io.IOException;
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
37 import java.util.*;
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
38 import java.util.concurrent.ConcurrentHashMap;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
39 import java.util.concurrent.ConcurrentMap;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
40 import java.util.concurrent.TimeUnit;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
41 import java.util.concurrent.locks.Lock;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
42 import java.util.concurrent.locks.ReentrantLock;
1
56e7f34ca887 added TeamCity libs, fix tests
Pavel.Sher
parents: 0
diff changeset
43
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
44 /**
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
45 * Mercurial VCS plugin for TeamCity works as follows:
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
46 * <ul>
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
47 * <li>clones repository to internal storage
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
48 * <li>before any operation with working copy of repository pulls changes from the original repository
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
49 * <li>executes corresponding hg command
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
50 * </ul>
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
51 *
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
52 * <p>Working copy of repository is created in the $TEAMCITY_DATA_PATH/system/caches/mercurial folder.
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
53 * <p>Personal builds (remote runs) are not yet supported, they require corresponding functionality from the IDE.
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
54 * <p>Checkout on agent mode is not yet supported too.
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
55 */
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
56 public class MercurialVcsSupport extends VcsSupport implements CollectChangesByIncludeRule {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
57 private ServerPaths myServerPaths;
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
58 private ConcurrentMap<String, Lock> myWorkDirLocks= new ConcurrentHashMap<String, Lock>();
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
59 private static final int OLD_WORK_DIRS_CLEANUP_PERIOD = 600;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
60 private VcsManager myVcsManager;
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
61
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
62 public MercurialVcsSupport(@NotNull final VcsManager vcsManager,
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
63 @NotNull ServerPaths paths,
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
64 @NotNull SBuildServer server) {
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
65 vcsManager.registerVcsSupport(this);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
66 myServerPaths = paths;
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
67 myVcsManager = vcsManager;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
68 server.getExecutor().scheduleAtFixedRate(new Runnable() {
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
69 public void run() {
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
70 removeOldWorkFolders();
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
71 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
72 }, 0, OLD_WORK_DIRS_CLEANUP_PERIOD, TimeUnit.SECONDS);
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
73 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
74
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
75 public List<ModificationData> collectBuildChanges(final VcsRoot root,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
76 @NotNull final String fromVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
77 @NotNull final String currentVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
78 final CheckoutRules checkoutRules) throws VcsException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
79 updateWorkingDirectory(root);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
80 return VcsSupportUtil.collectBuildChanges(root, fromVersion, currentVersion, checkoutRules, this);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
81 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
82
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
83 public List<ModificationData> collectBuildChanges(final VcsRoot root,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
84 final String fromVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
85 final String currentVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
86 final IncludeRule includeRule) throws VcsException {
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
87 // first obtain changes between specified versions
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
88 List<ModificationData> result = new ArrayList<ModificationData>();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
89 Settings settings = new Settings(myServerPaths, root);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
90 LogCommand lc = new LogCommand(settings);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
91 lc.setFromRevId(new ChangeSet(fromVersion).getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
92 lc.setToRevId(new ChangeSet(currentVersion).getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
93 List<ChangeSet> changeSets = lc.execute();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
94 if (changeSets.isEmpty()) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
95 return result;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
96 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
97
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
98 // invoke status command for each changeset and determine what files were modified in these changesets
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
99 Iterator<ChangeSet> it = changeSets.iterator();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
100 ChangeSet prev = it.next(); // skip first changeset (cause it was already reported)
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
101 StatusCommand st = new StatusCommand(settings);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
102 while (it.hasNext()) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
103 ChangeSet cur = it.next();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
104 st.setFromRevId(prev.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
105 st.setToRevId(cur.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
106 List<ModifiedFile> modifiedFiles = st.execute();
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
107 // changeset full version will be set into VcsChange structure and
20
90f5e574fb73 comments
Pavel.Sher
parents: 19
diff changeset
108 // stored in database (note that getContent method will be invoked with this version)
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
109 List<VcsChange> files = toVcsChanges(modifiedFiles, prev.getFullVersion(), cur.getFullVersion(), includeRule);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
110 if (files.isEmpty()) continue;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
111 ModificationData md = new ModificationData(cur.getTimestamp(), files, cur.getSummary(), cur.getUser(), root, cur.getFullVersion(), cur.getFullVersion());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
112 result.add(md);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
113 prev = cur;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
114 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
115
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
116 return result;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
117 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
118
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
119 private List<VcsChange> toVcsChanges(final List<ModifiedFile> modifiedFiles, String prevVer, String curVer, final IncludeRule includeRule) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
120 List<VcsChange> files = new ArrayList<VcsChange>();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
121 for (ModifiedFile mf: modifiedFiles) {
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
122 String normalizedPath = PathUtil.normalizeSeparator(mf.getPath());
12
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
123 if (!normalizedPath.startsWith(includeRule.getFrom())) continue; // skip files which do not match include rule
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
124
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
125 VcsChangeInfo.Type changeType = getChangeType(mf.getStatus());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
126 if (changeType == null) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
127 Loggers.VCS.warn("Unable to convert status: " + mf.getStatus() + " to VCS change type");
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
128 changeType = VcsChangeInfo.Type.NOT_CHANGED;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
129 }
12
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
130 files.add(new VcsChange(changeType, mf.getStatus().getName(), normalizedPath, normalizedPath, prevVer, curVer));
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
131 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
132 return files;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
133 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
134
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
135 private VcsChangeInfo.Type getChangeType(final ModifiedFile.Status status) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
136 switch (status) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
137 case ADDED:return VcsChangeInfo.Type.ADDED;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
138 case MODIFIED:return VcsChangeInfo.Type.CHANGED;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
139 case REMOVED:return VcsChangeInfo.Type.REMOVED;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
140 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
141 return null;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
142 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
143
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
144 @NotNull
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
145 public byte[] getContent(final VcsModification vcsModification,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
146 final VcsChangeInfo change,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
147 final VcsChangeInfo.ContentType contentType,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
148 final VcsRoot vcsRoot) throws VcsException {
12
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
149 updateWorkingDirectory(vcsRoot);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
150 String version = contentType == VcsChangeInfo.ContentType.AFTER_CHANGE ? change.getAfterChangeRevisionNumber() : change.getBeforeChangeRevisionNumber();
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
151 return getContent(change.getRelativeFileName(), vcsRoot, version);
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
152 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
153
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
154 @NotNull
12
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
155 public byte[] getContent(final String filePath, final VcsRoot vcsRoot, final String version) throws VcsException {
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
156 updateWorkingDirectory(vcsRoot);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
157 Settings settings = new Settings(myServerPaths, vcsRoot);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
158 CatCommand cc = new CatCommand(settings);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
159 ChangeSet cs = new ChangeSet(version);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
160 cc.setRevId(cs.getId());
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
161 File parentDir = cc.execute(Collections.singletonList(filePath));
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
162 File file = new File(parentDir, filePath);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
163 if (file.isFile()) {
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
164 try {
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
165 return FileUtil.loadFileBytes(file);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
166 } catch (IOException e) {
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
167 throw new VcsException("Failed to load content of file: " + file.getAbsolutePath(), e);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
168 }
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
169 } else {
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
170 Loggers.VCS.warn("Unable to obtain content of the file: " + filePath);
6989ac0f8cac getContent supported
Pavel.Sher
parents: 11
diff changeset
171 }
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
172 return new byte[0];
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
173 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
174
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
175 public String getName() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
176 return "mercurial";
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
177 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
178
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
179 @Used("jsp")
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
180 public String getDisplayName() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
181 return "Mercurial";
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
182 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
183
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
184 @Nullable
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
185 public PropertiesProcessor getVcsPropertiesProcessor() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
186 return new AbstractVcsPropertiesProcessor() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
187 public Collection<InvalidProperty> process(final Map<String, String> properties) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
188 List<InvalidProperty> result = new ArrayList<InvalidProperty>();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
189 if (isEmpty(properties.get(Constants.HG_COMMAND_PATH_PROP))) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
190 result.add(new InvalidProperty(Constants.HG_COMMAND_PATH_PROP, "Path to 'hg' command must be specified"));
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
191 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
192 if (isEmpty(properties.get(Constants.REPOSITORY_PROP))) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
193 result.add(new InvalidProperty(Constants.REPOSITORY_PROP, "Repository must be specified"));
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
194 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
195 return result;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
196 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
197 };
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
198 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
199
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
200 public String getVcsSettingsJspFilePath() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
201 return "mercurialSettings.jsp";
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
202 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
203
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
204 @NotNull
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
205 public String getCurrentVersion(final VcsRoot root) throws VcsException {
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
206 // we will return full version of the most recent change as current version
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
207 updateWorkingDirectory(root);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
208 Settings settings = new Settings(myServerPaths, root);
9
7dadebd03515 use tip command instead of log in getCurrentVersion method
Pavel.Sher
parents: 8
diff changeset
209 TipCommand lc = new TipCommand(settings);
7dadebd03515 use tip command instead of log in getCurrentVersion method
Pavel.Sher
parents: 8
diff changeset
210 ChangeSet changeSet = lc.execute();
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
211 return changeSet.getFullVersion();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
212 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
213
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
214 public String describeVcsRoot(final VcsRoot vcsRoot) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
215 return "mercurial: " + vcsRoot.getProperty(Constants.REPOSITORY_PROP);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
216 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
217
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
218 public boolean isTestConnectionSupported() {
16
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
219 return true;
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
220 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
221
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
222 @Nullable
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
223 public String testConnection(final VcsRoot vcsRoot) throws VcsException {
16
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
224 Settings settings = new Settings(myServerPaths, vcsRoot);
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
225 IdentifyCommand id = new IdentifyCommand(settings);
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
226 StringBuilder res = new StringBuilder();
17
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
227 res.append(quoteIfNeeded(settings.getHgCommandPath()));
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
228 res.append(" identify ");
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
229 res.append(quoteIfNeeded(settings.getRepository()));
16
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
230 res.append('\n').append(id.execute());
7aa397165fa0 identify command added, test connection now uses identify command
Pavel.Sher
parents: 13
diff changeset
231 return res.toString();
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
232 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
233
17
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
234 private String quoteIfNeeded(@NotNull String str) {
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
235 if (str.indexOf(' ') != -1) {
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
236 return "\"" + str + "\"";
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
237 }
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
238
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
239 return str;
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
240 }
21b5b1c5dd74 test connection minor fix
Pavel.Sher
parents: 16
diff changeset
241
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
242 @Nullable
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
243 public Map<String, String> getDefaultVcsProperties() {
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
244 return Collections.singletonMap(Constants.HG_COMMAND_PATH_PROP, "hg");
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
245 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
246
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
247 public String getVersionDisplayName(final String version, final VcsRoot root) throws VcsException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
248 return version;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
249 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
250
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
251 @NotNull
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
252 public Comparator<String> getVersionComparator() {
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
253 // comparator is called when TeamCity needs to sort modifications in the order of their appearance,
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
254 // currently we sort changes by revision number, not sure however that this is a good idea,
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
255 // probably it would be better to sort them by timestamp (and to add timestamp into the version).
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
256 return new Comparator<String>() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
257 public int compare(final String o1, final String o2) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
258 try {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
259 return new ChangeSet(o1).getRevNumber() - new ChangeSet(o2).getRevNumber();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
260 } catch (Exception e) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
261 return 1;
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
262 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
263 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
264 };
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
265 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
266
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
267 public void buildPatch(final VcsRoot root,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
268 @Nullable final String fromVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
269 @NotNull final String toVersion,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
270 final PatchBuilder builder,
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
271 final CheckoutRules checkoutRules) throws IOException, VcsException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
272 updateWorkingDirectory(root);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
273 Settings settings = new Settings(myServerPaths, root);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
274 if (fromVersion == null) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
275 buildFullPatch(settings, new ChangeSet(toVersion), builder);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
276 } else {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
277 buildIncrementalPatch(settings, new ChangeSet(fromVersion), new ChangeSet(toVersion), builder);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
278 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
279 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
280
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
281 // builds patch from version to version
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
282 private void buildIncrementalPatch(final Settings settings, @NotNull final ChangeSet fromVer, @NotNull final ChangeSet toVer, final PatchBuilder builder)
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
283 throws VcsException, IOException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
284 StatusCommand st = new StatusCommand(settings);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
285 st.setFromRevId(fromVer.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
286 st.setToRevId(toVer.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
287 List<ModifiedFile> modifiedFiles = st.execute();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
288 List<String> notDeletedFiles = new ArrayList<String>();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
289 for (ModifiedFile f: modifiedFiles) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
290 if (f.getStatus() != ModifiedFile.Status.REMOVED) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
291 notDeletedFiles.add(f.getPath());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
292 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
293 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
294
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
295 CatCommand cc = new CatCommand(settings);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
296 cc.setRevId(toVer.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
297 File parentDir = cc.execute(notDeletedFiles);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
298
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
299 try {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
300 for (ModifiedFile f: modifiedFiles) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
301 final File virtualFile = new File(f.getPath());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
302 if (f.getStatus() == ModifiedFile.Status.REMOVED) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
303 builder.deleteFile(virtualFile, true);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
304 } else {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
305 File realFile = new File(parentDir, f.getPath());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
306 FileInputStream is = new FileInputStream(realFile);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
307 try {
11
568707240741 fix patch
Pavel.Sher
parents: 9
diff changeset
308 builder.changeOrCreateBinaryFile(virtualFile, null, is, realFile.length());
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
309 } finally {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
310 is.close();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
311 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
312 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
313 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
314 } finally {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
315 FileUtil.delete(parentDir);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
316 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
317 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
318
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
319 // builds patch by exporting files using specified version
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
320 private void buildFullPatch(final Settings settings, @NotNull final ChangeSet toVer, final PatchBuilder builder)
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
321 throws IOException, VcsException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
322 CloneCommand cl = new CloneCommand(settings);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
323 cl.setToId(toVer.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
324 File tempDir = FileUtil.createTempDirectory("mercurial", toVer.getId());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
325 try {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
326 final File repRoot = new File(tempDir, "rep");
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
327 cl.setDestDir(repRoot.getAbsolutePath());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
328 cl.execute();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
329 buildPatchFromDirectory(builder, repRoot, new FileFilter() {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
330 public boolean accept(final File file) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
331 return !(file.isDirectory() && ".hg".equals(file.getName()));
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
332 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
333 });
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
334 } finally {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
335 FileUtil.delete(tempDir);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
336 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
337 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
338
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
339 private void buildPatchFromDirectory(final PatchBuilder builder, final File repRoot, final FileFilter filter) throws IOException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
340 buildPatchFromDirectory(repRoot, builder, repRoot, filter);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
341 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
342
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
343 private void buildPatchFromDirectory(File curDir, final PatchBuilder builder, final File repRoot, final FileFilter filter) throws IOException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
344 File[] files = curDir.listFiles(filter);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
345 if (files != null) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
346 for (File realFile: files) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
347 String relPath = realFile.getAbsolutePath().substring(repRoot.getAbsolutePath().length());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
348 final File virtualFile = new File(relPath);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
349 if (realFile.isDirectory()) {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
350 builder.createDirectory(virtualFile);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
351 buildPatchFromDirectory(realFile, builder, repRoot, filter);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
352 } else {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
353 final FileInputStream is = new FileInputStream(realFile);
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
354 try {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
355 builder.createBinaryFile(virtualFile, null, is, realFile.length());
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
356 } finally {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
357 is.close();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
358 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
359 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
360 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
361 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
362 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
363
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
364 // updates current working copy of repository by pulling changes from the repository specified in VCS root
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
365 private void updateWorkingDirectory(final VcsRoot root) throws VcsException {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
366 Settings settings = new Settings(myServerPaths, root);
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
367 File workDir = settings.getWorkingDir();
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
368 lockWorkDir(workDir);
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
369 try {
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
370 if (hasRepositoryCopy(workDir)) {
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
371 // update
8
2cb2df5a0dcd fix working directory update (use pull command)
Pavel.Sher
parents: 1
diff changeset
372 PullCommand pull = new PullCommand(settings);
2cb2df5a0dcd fix working directory update (use pull command)
Pavel.Sher
parents: 1
diff changeset
373 pull.execute();
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
374 } else {
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
375 // clone
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
376 CloneCommand cl = new CloneCommand(settings);
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
377 cl.setDestDir(workDir.getAbsolutePath());
18
d787c696225c do not update local working directory
Pavel.Sher
parents: 17
diff changeset
378 cl.setUpdateWorkingDir(false);
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
379 cl.execute();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
380 }
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
381 } finally {
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
382 unlockWorkDir(workDir);
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
383 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
384 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
385
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
386 private void lockWorkDir(@NotNull File workDir) {
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
387 getWorkDirLock(workDir).lock();
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
388 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
389
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
390 private void unlockWorkDir(@NotNull File workDir) {
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
391 getWorkDirLock(workDir).unlock();
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
392 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
393
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
394 private Lock getWorkDirLock(final File workDir) {
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
395 String path = workDir.getAbsolutePath();
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
396 Lock lock = myWorkDirLocks.get(path);
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
397 if (lock == null) {
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
398 lock = new ReentrantLock();
22
0d6f27953b30 synchronization fixes
Pavel.Sher
parents: 21
diff changeset
399 Lock curLock = myWorkDirLocks.putIfAbsent(path, lock);
21
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
400 if (curLock != null) {
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
401 lock = curLock;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
402 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
403 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
404 return lock;
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
405 }
c76d6a2b27f6 proper synchronization for working directories
Pavel.Sher
parents: 20
diff changeset
406
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
407 private boolean hasRepositoryCopy(final File workDir) {
19
40b2cf04cd4b some comments added
Pavel.Sher
parents: 18
diff changeset
408 // need better way to check that repository copy is ok
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
409 return workDir.isDirectory() && new File(workDir, ".hg").isDirectory();
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
410 }
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
411
23
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
412 private void removeOldWorkFolders() {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
413 File workFoldersParent = new File(myServerPaths.getCachesDir(), "mercurial");
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
414 if (!workFoldersParent.isDirectory()) return;
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
415
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
416 Set<File> workDirs = new HashSet<File>();
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
417 File[] files = workFoldersParent.listFiles(new FileFilter() {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
418 public boolean accept(final File file) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
419 return file.isDirectory() && file.getName().startsWith(Settings.DEFAULT_WORK_DIR_PREFIX);
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
420 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
421 });
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
422 if (files != null) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
423 for (File f: files) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
424 workDirs.add(FileUtil.getCanonicalFile(f));
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
425 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
426 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
427
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
428 for (VcsRoot vcsRoot: myVcsManager.getAllRegisteredVcsRoots()) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
429 if (getName().equals(vcsRoot.getVcsName())) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
430 Settings s = new Settings(myServerPaths, vcsRoot);
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
431 workDirs.remove(FileUtil.getCanonicalFile(s.getWorkingDir()));
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
432 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
433 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
434
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
435 for (File f: workDirs) {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
436 lockWorkDir(f);
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
437 try {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
438 FileUtil.delete(f);
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
439 } finally {
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
440 unlockWorkDir(f);
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
441 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
442 }
3ddf410c2fd6 minor change
Pavel.Sher
parents: 22
diff changeset
443 }
0
a530ea876f55 mercurial support sources added
Pavel.Sher
parents:
diff changeset
444 }