Mercurial > hg > mercurial
changeset 163:447a6ce2b471
Remove redundant udpate
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 04 Feb 2011 12:29:31 +0300 |
parents | 738d878b236c |
children | b49bde1eb33e |
files | mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java Tue Feb 01 17:58:36 2011 +0300 +++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java Fri Feb 04 12:29:31 2011 +0300 @@ -20,6 +20,9 @@ import org.jetbrains.annotations.NotNull; public class UpdateCommand extends BaseCommand { + + private static final int UPDATE_TIMEOUT_SECONDS = 8 * 3600;//8 hours + private String myToId; public UpdateCommand(@NotNull final Settings settings) { @@ -35,16 +38,12 @@ GeneralCommandLine cli = createCommandLine(); cli.addParameter("update"); cli.addParameter("-C"); - cli.addParameter(getSettings().getBranchName()); - runCommand(cli); - - cli = createCommandLine(); - cli.addParameter("update"); - cli.addParameter("-C"); + cli.addParameter("-r"); if (myToId != null) { - cli.addParameter("-r"); cli.addParameter(myToId); + } else { + cli.addParameter(getSettings().getBranchName()); } - runCommand(cli, 8*3600); // execution timeout is set to 8 hours for large repositories + runCommand(cli, UPDATE_TIMEOUT_SECONDS); } }