Mercurial > hg > mercurial
changeset 498:5e902e2ef315
Merge branch Faradi-7.1.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Thu, 25 Oct 2012 20:21:23 +0400 |
parents | e4210c35aa24 (current diff) ed098534dab4 (diff) |
children | 6bc8a8c4ab2f |
files | |
diffstat | 6 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AuthCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -0,0 +1,25 @@ +package jetbrains.buildServer.buildTriggers.vcs.mercurial.command; + +import org.jetbrains.annotations.NotNull; + +import java.io.File; + +/** + * Command that may require authentication + */ +public class AuthCommand extends VcsRootCommand { + + public AuthCommand(@NotNull CommandSettings commandSettings, + @NotNull String hgPath, + @NotNull File workingDir, + @NotNull AuthSettings authSettings) { + super(commandSettings, hgPath, workingDir, authSettings); + } + + protected MercurialCommandLine createCL() { + MercurialCommandLine cmd = super.createCL(); + cmd.addParameters("--config", "ui.interactive=False"); + return cmd; + } + +}
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java Wed Oct 24 17:34:06 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -21,7 +21,7 @@ import java.io.File; import java.io.IOException; -public class CloneCommand extends VcsRootCommand { +public class CloneCommand extends AuthCommand { private String myToId; private boolean myUpdateWorkingDir = true; private String myRepository;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java Wed Oct 24 17:34:06 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -24,7 +24,7 @@ * @author Pavel.Sher * Date: 16.07.2008 */ -public class IdentifyCommand extends VcsRootCommand { +public class IdentifyCommand extends AuthCommand { private boolean myInLocalRepository = false; private ChangeSet myChangeSet;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PullCommand.java Wed Oct 24 17:34:06 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PullCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -27,7 +27,7 @@ * @author Pavel.Sher * Date: 14.07.2008 */ -public class PullCommand extends VcsRootCommand { +public class PullCommand extends AuthCommand { private String myPullUrl; private int myTimeout;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java Wed Oct 24 17:34:06 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -23,7 +23,7 @@ /** * @author pavel */ -public class PushCommand extends VcsRootCommand { +public class PushCommand extends AuthCommand { private String myRepositoryUrl;
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java Wed Oct 24 17:34:06 2012 +0400 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java Thu Oct 25 20:21:23 2012 +0400 @@ -23,7 +23,7 @@ import static com.intellij.openapi.util.io.FileUtil.delete; -public class UpdateCommand extends VcsRootCommand { +public class UpdateCommand extends AuthCommand { private static final int UPDATE_TIMEOUT_SECONDS = 8 * 3600;//8 hours