Mercurial > hg > mercurial
changeset 778:7273dafff141
pull member up
author | eugene.petrenko@jetbrains.com |
---|---|
date | Thu, 10 Apr 2014 12:30:30 +0200 |
parents | 5a146af499ed |
children | 609987ff0e9c |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/VcsRootCommand.java |
diffstat | 2 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java Thu Apr 10 12:28:19 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java Thu Apr 10 12:30:30 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; @@ -38,13 +37,4 @@ 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/VcsRootCommand.java Thu Apr 10 12:28:19 2014 +0200 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/VcsRootCommand.java Thu Apr 10 12:30:30 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; @@ -42,4 +43,15 @@ 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"); + } }