changeset 341:abfaa81ee52b

Merge branch Eluru-6.5.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 12 Dec 2011 11:51:38 +0300
parents b799355b4016 (current diff) 7700af586e11 (diff)
children 040cd38f6f9e
files mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialAgentSideVcsSupport.java mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PullCommand.java
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java	Fri Dec 02 15:35:00 2011 +0300
+++ b/mercurial-agent/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialIncludeRuleUpdater.java	Mon Dec 12 11:51:38 2011 +0300
@@ -98,7 +98,7 @@
     }
     String defaultPullUrl = getDefaultPullUrl(mySettings, myUseLocalMirrors);
     myLogger.message("Start pulling changes from " + removePrivateData(defaultPullUrl, Collections.singleton(mySettings.getPassword())));
-    new PullCommand(mySettings, workingDir).execute(myPullTimeout);
+    new PullCommand(mySettings, workingDir, defaultPullUrl).execute(myPullTimeout);
     myLogger.message("Changes successfully pulled");
   }
 
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PullCommand.java	Fri Dec 02 15:35:00 2011 +0300
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PullCommand.java	Mon Dec 12 11:51:38 2011 +0300
@@ -27,14 +27,21 @@
  */
 public class PullCommand extends VcsRootCommand {
 
+  private final String myPullUrl;
+
   public PullCommand(@NotNull Settings settings, @NotNull File workingDir) {
+    this(settings, workingDir, settings.getRepository());
+  }
+
+  public PullCommand(@NotNull Settings settings, @NotNull File workingDir, @NotNull String pullUrl) {
     super(settings, workingDir);
+    myPullUrl = pullUrl;
   }
 
   public void execute(int timeout) throws VcsException {
     GeneralCommandLine cli = createCommandLine();
     cli.addParameter("pull");
-    cli.addParameter(getSettings().getRepositoryUrl());
+    cli.addParameter(myPullUrl);
     runCommand(cli, timeout);
   }
 }