X-Git-Url: https://git.exim.org/buildfarm-server.git/blobdiff_plain/1c558dd75c7ab4f9f4b99ed80713c811d69ab24c..77f0f9c5c215c72ce7a105bb3ac16d1c8f3b8a68:/templates/log.tt

diff --git a/templates/log.tt b/templates/log.tt
index da255f2..29d51e8 100644
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -1,6 +1,13 @@
+[%#
+
+Copyright (c) 2003-2010, Andrew Dunstan
+
+See accompanying License file for license details
+
+-%]
 [% PERL %]
 	use POSIX qw(ceil);
-        my $lrfactor = 6;
+        my $lrfactor = 4;
 	$stash->set(lrfactor => $lrfactor);
         my $rows = $stash->get('log_file_names'); 
 	my $logrows = ceil(scalar(@$rows)/$lrfactor);
@@ -18,6 +25,13 @@
 	bodyclass = 'none'
 	pagebutton = 'none'
 %]
+[%- BLOCK gitlog ;
+	commitref = clog.replace('^commit ([0-9A-Fa-f]+)(.|\n)*','$1');
+	logtail = clog.replace('^commit ([0-9A-Fa-f]+)','');
+	logtail = logtail.replace('\n',' ');
+
+%]<a href="[% giturl ; commitref %]">[% commitref %]</a>[% logtail | html %]
+[% END -%]
 <h1>PostgreSQL Build Farm Log</h1>
 <h2>Details for system "[% system %]"[% IF stage != 'OK' %] failure at stage [% stage ; ELSE %], status 'OK'[% END %], snapshot taken [% urldt %]</h2>
 <table cellspacing="0">
@@ -55,10 +69,10 @@
 [% END %]
 [% cell = 0; FOREACH logstage  IN log_file_names ; striplog = logstage.replace('\.log$','') ; cell = loop.count %]
   [% IF loop.first %] 
-    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs</th>
+    <br /> <table><tr><th class='head' rowspan='[% logrows %]'>Stage Logs<br /><br />Total run time<br />[% run_time %]</th>
   [% END %]
     [% IF loop.count > 1 and loop.count % lrfactor == 1 %]<tr>[% END %]
-    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a></td>
+    <td><a href='show_stage_log.pl?nm=[% system %]&amp;dt=[% urldt | uri %]&amp;stg=[% striplog %]'>[% striplog %]</a> ([% stage_times.$logstage.stage_duration %])</td>
     [% IF loop.count % lrfactor == 0 %]</tr>[% END %]
 [% END %]
 
@@ -74,28 +88,68 @@
 <pre>
 [% conf | html %]
 </pre>
+<table>
+<tr>
+<td valign="top">
 <h3>Files changed this run</h3>
-<pre>
 [%- IF changed_this_run.0 -%]
+<pre>
 [%- FOREACH changed IN changed_this_run %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]
+</pre>
+[% END %]
+</td>
+<td valign="top" style="padding-left: 10pt;">
+[% IF changed_this_run_logs.0 %]
+<h5>Git log</h5>
+<pre>
+[% IF last_build_git_ref && git_head_ref %]
+<a href="https://github.com/postgres/postgres/compare/[% last_build_git_ref %]...[% git_head_ref %]">Change Set for this build</a>
+[% END %]
+[% FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
+[%- END -%]
+</pre>
+</td>
 [%- ELSE %]
 not recorded
-[% END -%]
 </pre>
+</td>
+[% END -%]
+</tr>
 [% IF stage != 'OK' %]
+<tr>
+<td valign="top">
 <h3>Files changed since last success</h3>
-<pre>
 [%- IF changed_since_success.0 %]
+<pre>
 [%- FOREACH changed IN changed_since_success %]
 <a href="[% IF scm == 'git' ; giturl; changed.1; ELSE ; cvsurl ; changed.0; 'rev='; changed.1; END %]">[% changed.0 ; IF scm == 'cvs'; ' '; changed.1; END %]</a>
 [%- END -%]
+</pre>
+[% END %]
+</td>
+<td valign="top" style="padding-left: 10pt;">
+[% IF changed_since_success_logs.0 %]
+<h5>Git log</h5>
+<pre>
+<a href="https://github.com/postgres/postgres/compare/[% last_success_git_ref %]...[% last_build_git_ref %]">Change Set prior to this build</a>
+
+<a href="https://github.com/postgres/postgres/compare/[% last_success_git_ref %]...[% git_head_ref %]">Change Set including this build</a>
+
+[% FOREACH clog IN changed_since_success_logs ; PROCESS gitlog -%]
+[%- END -%]
+</pre>
+</td>
 [%- ELSE %]
+<pre>
 not recorded
-[% END -%]
 </pre>
+</td>
+[% END -%]
+</tr>
 [% END %]
+</table>
 <h3>Log</h3>
 <pre>
 [% log | html %]