Mercurial > hg > mercurial

changeset 780:2afd4572bc92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Run commands requiring an authentication in non-interactive mode
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 16 Apr 2014 17:38:38 +0200
parents 609987ff0e9c
children 44b15b5a87e8
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/VcsRootCommand.java
diffstat 4 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Thu Apr 10 12:45:15 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Wed Apr 16 17:38:38 2014 +0200
@@ -38,7 +38,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ArchiveCommand extends VcsRootCommand {
+public class ArchiveCommand extends AuthCommand {
   private final static int MAX_CMD_LEN = 900;
 
   private File myDestination;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java	Thu Apr 10 12:45:15 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java	Wed Apr 16 17:38:38 2014 +0200
@@ -16,6 +16,7 @@
 
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
+import com.intellij.execution.configurations.GeneralCommandLine;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -37,4 +38,13 @@
     cmd.addParameters("--config", "ui.interactive=False");
     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/CatCommand.java	Thu Apr 10 12:45:15 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CatCommand.java	Wed Apr 16 17:38:38 2014 +0200
@@ -31,7 +31,7 @@
 import static java.util.Collections.singletonList;
 import static jetbrains.buildServer.buildTriggers.vcs.mercurial.HgFileUtil.deleteDir;
 
-public class CatCommand extends VcsRootCommand {
+public class CatCommand extends AuthCommand {
   private String myRevId;
 
   private List<String> myRelativePaths = new ArrayList<String>();
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/VcsRootCommand.java	Thu Apr 10 12:45:15 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/VcsRootCommand.java	Wed Apr 16 17:38:38 2014 +0200
@@ -16,7 +16,6 @@
 
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
-import com.intellij.execution.configurations.GeneralCommandLine;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -43,15 +42,4 @@
     String password = myAuthSettings.getPassword();
     return password != null ? Collections.singleton(password) : Collections.<String>emptySet();
   }
-
-  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");
-  }
 }