Merge branch 'master' into build-ng

2015-07-06 17:17:51 +02:00
parent 309ef5baa9 ccf6e6062c
commit dd4f6e695e
2 changed files with 3 additions and 1 deletions
--- a/src/lib/Hydra/Plugin/MercurialInput.pm
+++ b/src/lib/Hydra/Plugin/MercurialInput.pm
@ -52,7 +52,7 @@ sub fetchInput {
    die "error pulling latest change mercurial repo at `$uri':\n$stderr" if $res;

    (my $res1, $stdout, $stderr) = captureStdoutStderr(600,
-        "hg", "log", "-r", $id, "--template", "{node|short} {rev} {branch}");
+        "hg", "log", "-r", $id, "--template", "{node} {rev} {branch}");
    die "error getting branch and revision of $id from `$uri':\n$stderr" if $res1;

    my ($revision, $revCount, $branch) = split ' ', $stdout;