ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge branch 'master' into build-ng

Browse source
This commit is contained in:
Eelco Dolstra 2015-07-06 17:17:51 +02:00
parent 309ef5baa9 ccf6e6062c
commit dd4f6e695e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Plugin/MercurialInput.pm
View file

@ -52,7 +52,7 @@ sub fetchInput {
die "error pulling latest change mercurial repo at `$uri':\n$stderr" if $res; die "error pulling latest change mercurial repo at `$uri':\n$stderr" if $res;
(my $res1, $stdout, $stderr) = captureStdoutStderr(600, (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; die "error getting branch and revision of $id from `$uri':\n$stderr" if $res1;
my ($revision, $revCount, $branch) = split ' ', $stdout; my ($revision, $revCount, $branch) = split ' ', $stdout;

2
src/root/common.tt
View file

@ -380,6 +380,8 @@ BLOCK renderShortEvalInput;
r[% input.revision %] r[% input.revision %]
[% ELSIF input.type == "git" %] [% ELSIF input.type == "git" %]
<tt>[% input.revision.substr(0, 7) %]</tt> <tt>[% input.revision.substr(0, 7) %]</tt>
[% ELSIF input.type == "hg" %]
<tt>[% input.revision.substr(0, 12) %]</tt>
[% ELSIF input.type == "build" || input.type == "sysbuild" %] [% ELSIF input.type == "build" || input.type == "sysbuild" %]
<a href="[% c.uri_for('/build' input.get_column('dependency')) %]">[% input.get_column('dependency') %]</a> <a href="[% c.uri_for('/build' input.get_column('dependency')) %]">[% input.get_column('dependency') %]</a>
[% ELSE %] [% ELSE %]