Mercurial > hg > mercurial

changeset 516:4688509f4e3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch Faradi-7.1.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 30 Nov 2012 16:02:20 +0400
parents 89e9c06fbc76 (current diff) d4c6c9ebbe8a (diff)
children 5634b52d72ad
files
diffstat 3 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java	Mon Nov 26 13:23:43 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java	Fri Nov 30 16:02:20 2012 +0400
@@ -1,5 +1,6 @@
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
+import com.intellij.execution.configurations.GeneralCommandLine;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -22,4 +23,12 @@
     return cmd;
   }
 
+  protected void addHttpAuthParams(@NotNull GeneralCommandLine cmd) {
+    if (myAuthSettings.getUsername() == null || myAuthSettings.getPassword() == null)
+      return;
+    cmd.addParameters("--config", "auth.tc.prefix=*");
+    cmd.addParameters("--config", "auth.tc.username=" + myAuthSettings.getUsername());
+    cmd.addParameters("--config", "auth.tc.password=" + myAuthSettings.getPassword());
+    cmd.addParameters("--config", "auth.tc.schemes=http https");
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java	Mon Nov 26 13:23:43 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java	Fri Nov 30 16:02:20 2012 +0400
@@ -42,8 +42,12 @@
   public void call() throws VcsException {
     MercurialCommandLine cli = createCommandLine();
     cli.addParameter("push");
-    String repositoryUrl = myAuthSettings != null ? myAuthSettings.getRepositoryUrlWithCredentials(myRepositoryUrl) : myRepositoryUrl;
-    cli.addParameter(repositoryUrl);
+    if (myRepositoryUrl.startsWith("http")) {
+      addHttpAuthParams(cli);
+      cli.addParameter(myRepositoryUrl);
+    } else {
+      cli.addParameter(myAuthSettings.getRepositoryUrlWithCredentials(myRepositoryUrl));
+    }
     runCommand(cli, myCommandSettings.setFailWhenStderrNotEmpty(true));
   }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java	Mon Nov 26 13:23:43 2012 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java	Fri Nov 30 16:02:20 2012 +0400
@@ -15,7 +15,6 @@
  */
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
-import com.intellij.execution.configurations.GeneralCommandLine;
 import jetbrains.buildServer.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 
@@ -64,7 +63,7 @@
     cli.addParameter("update");
     if (myTraceback)
       cli.addParameter("--traceback");
-    addAuthConfigParams(cli);
+    addHttpAuthParams(cli);
     cli.addParameter("-C");
     cli.addParameter("-r");
     if (myToId != null) {
@@ -81,17 +80,6 @@
       delete(lock);
   }
 
-  private void addAuthConfigParams(GeneralCommandLine cmd) {
-    if (myAuthSettings == null)
-      return;
-    if (myAuthSettings.getUsername() == null || myAuthSettings.getPassword() == null)
-      return;
-    cmd.addParameters("--config", "auth.tc.prefix=*");
-    cmd.addParameters("--config", "auth.tc.username=" + myAuthSettings.getUsername());
-    cmd.addParameters("--config", "auth.tc.password=" + myAuthSettings.getPassword());
-    cmd.addParameters("--config", "auth.tc.schemes=http https");
-  }
-
   @NotNull
   private File getWorkingDirLock() {
     return new File(getWorkDirectory(), ".hg" + File.separator + "wlock");