Mercurial > hg > mercurial

changeset 115:cab9916671ea Darjeeling-5.1.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fail on exit code, rather than on messages in stderr
author Pavel.Sher
date Fri, 30 Jul 2010 20:36:04 +0400
parents e90aaec1b600
children ebca599e7e51
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Mon Jul 19 13:00:20 2010 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/BaseCommand.java	Fri Jul 30 20:36:04 2010 +0400
@@ -70,6 +70,12 @@
     }
   }
 
+  protected void failIfNonZeroExitCode(@NotNull GeneralCommandLine cli, @NotNull ExecResult res) throws VcsException {
+    if (res.getExitCode() != 0) {
+      CommandUtil.commandFailed(cli.getCommandLineString(), res);
+    }
+  }
+
   public Set<String> getPrivateData() {
     return Collections.singleton(mySettings.getPassword());
   }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Mon Jul 19 13:00:20 2010 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Fri Jul 30 20:36:04 2010 +0400
@@ -72,6 +72,6 @@
     cli.addParameter(dir.getName());
 
     ExecResult res = runCommand(cli, 24*3600); // some repositories are quite large, we set timeout to 24 hours
-    failIfNotEmptyStdErr(cli, res);
+    failIfNonZeroExitCode(cli, res);
   }
 }