changeset 503:6bc8a8c4ab2f

Merge branch Faradi-7.1.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 29 Oct 2012 17:56:44 +0400
parents 5e902e2ef315 (current diff) 2755266b7dd5 (diff)
children bee5c3240036
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java
diffstat 5 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleaner.java	Thu Oct 25 20:21:23 2012 +0400
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleaner.java	Mon Oct 29 17:56:44 2012 +0400
@@ -30,7 +30,7 @@
 
   @NotNull
   public String getCleanerName() {
-    return "Mercurial mirrors clean";
+    return "Mercurial mirrors cleaner";
   }
 
   public void registerDirectoryCleaners(@NotNull DirectoryCleanersProviderContext context,
--- a/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Thu Oct 25 20:21:23 2012 +0400
+++ b/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Mon Oct 29 17:56:44 2012 +0400
@@ -12,11 +12,6 @@
 
   <l:settingsGroup title="General Settings">
   <tr>
-    <th><label for="hgCommandPath">HG Command Path: <l:star/></label></th>
-    <td><props:textProperty name="hgCommandPath" className="longField" />
-      <span class="error" id="error_hgCommandPath"></span></td>
-  </tr>
-  <tr>
     <th><label for="repositoryPath">Pull Changes From: <l:star/></label></th>
     <td><props:textProperty name="repositoryPath" className="longField" onchange="updateBranchName(this.value)"/>
       <span class="error" id="error_repositoryPath"></span></td>
@@ -47,6 +42,13 @@
       <div class="smallNote" style="margin: 0;">Uncompressed transfer is faster for repositories in the LAN.</div>
     </td>
   </tr>
+  <tr>
+    <th><label for="hgCommandPath">HG Command Path: <l:star/></label></th>
+    <td>
+      <props:textProperty name="hgCommandPath" className="longField" />
+      <span class="error" id="error_hgCommandPath"></span>
+    </td>
+  </tr>
   </l:settingsGroup>
   <l:settingsGroup title="Authorization settings">
   <tr>
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu Oct 25 20:21:23 2012 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Mon Oct 29 17:56:44 2012 +0400
@@ -28,7 +28,6 @@
 import jetbrains.buildServer.util.FileUtil;
 import jetbrains.buildServer.util.cache.ResetCacheRegister;
 import jetbrains.buildServer.vcs.*;
-import jetbrains.buildServer.vcs.impl.VcsRootImpl;
 import jetbrains.buildServer.vcs.patches.PatchBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -248,8 +247,9 @@
   @Nullable
   public Map<String, String> getDefaultVcsProperties() {
     Map<String, String> defaults = new HashMap<String, String>();
+    defaults.put(Constants.BRANCH_NAME_PROP, "default");
     defaults.put(Constants.HG_COMMAND_PATH_PROP, "hg");
-    defaults.put(Constants.UNCOMPRESSED_TRANSFER, "false");
+    defaults.put(Constants.UNCOMPRESSED_TRANSFER, "true");
     return defaults;
   }
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Oct 25 20:21:23 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Mon Oct 29 17:56:44 2012 +0400
@@ -513,7 +513,7 @@
     root.addAllProperties(myVcs.getDefaultVcsProperties());
     root.addProperty(Constants.REPOSITORY_PROP, "http://host.com/path");
     HgVcsRoot hgRoot = new HgVcsRoot(root);
-    assertFalse(hgRoot.isUncompressedTransfer());
+    assertTrue(hgRoot.isUncompressedTransfer());
   }
 
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/VcsRootBuilder.java	Thu Oct 25 20:21:23 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/VcsRootBuilder.java	Mon Oct 29 17:56:44 2012 +0400
@@ -20,6 +20,7 @@
   private long myRootId = 1L;
   private String myHgPath;
   private String myUserForTag;
+  private boolean myUncompressed = true;
 
   public static VcsRootBuilder vcsRoot() {
     return new VcsRootBuilder();
@@ -33,6 +34,7 @@
     vcsRoot.addProperty(Constants.PASSWORD, myPassword);
     vcsRoot.addProperty(Constants.BRANCH_NAME_PROP, myBranch);
     vcsRoot.addProperty(Constants.USER_FOR_TAG, myUserForTag);
+    vcsRoot.addProperty(Constants.UNCOMPRESSED_TRANSFER, String.valueOf(myUncompressed));
     return vcsRoot;
   }