Mercurial > hg > mercurial
changeset 165:cfd745c297f1
Fix TW-10172
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 04 Feb 2011 13:53:02 +0300 |
parents | b49bde1eb33e |
children | c3157374a356 2faaa84c0896 |
files | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Fri Feb 04 12:31:26 2011 +0300 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Fri Feb 04 13:53:02 2011 +0300 @@ -180,9 +180,6 @@ if (isEmpty(properties.get(Constants.REPOSITORY_PROP))) { result.add(new InvalidProperty(Constants.REPOSITORY_PROP, "Repository must be specified")); } - if (isEmpty(properties.get(Constants.SERVER_CLONE_PATH_PROP))) { - properties.put(Constants.SERVER_CLONE_PATH_PROP, myDefaultWorkFolderParent.getAbsolutePath()); - } return result; } }; @@ -245,7 +242,6 @@ public Map<String, String> getDefaultVcsProperties() { Map<String, String> defaults = new HashMap<String, String>(); defaults.put(Constants.HG_COMMAND_PATH_PROP, "hg"); - defaults.put(Constants.SERVER_CLONE_PATH_PROP, myDefaultWorkFolderParent.getAbsolutePath()); return defaults; }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Feb 04 12:31:26 2011 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Fri Feb 04 13:53:02 2011 +0300 @@ -36,9 +36,7 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -388,6 +386,20 @@ assertFiles(Arrays.asList("M dir6/file6.txt", "A dir5/file5.txt"), changes.get(1)); } + //TW-10172 + public void should_not_fill_server_clone_path() { + assertFalse(myVcs.getDefaultVcsProperties().containsKey(Constants.SERVER_CLONE_PATH_PROP)); + + Map<String, String> rootProperties = new HashMap<String, String>() {{ + put(Constants.HG_COMMAND_PATH_PROP, "hg"); + put(Constants.REPOSITORY_PROP, "http://somewhere.com/path"); + }}; + + assertFalse(rootProperties.containsKey(Constants.SERVER_CLONE_PATH_PROP)); + myVcs.getVcsPropertiesProcessor().process(rootProperties); + assertFalse(rootProperties.containsKey(Constants.SERVER_CLONE_PATH_PROP)); + } + private void assertFiles(final List<String> expectedFiles, final ModificationData modificationData) { List<String> actualFiles = new ArrayList<String>(); for (VcsChange vc: modificationData.getChanges()) {