X-Git-Url: https://git.exim.org/buildfarm-server.git/blobdiff_plain/cf1348db8bac78b578b1b7780978d56f688105b4..a63dde634310b9d7616b324a4fcf327059c9dbd7:/templates/log.tt

diff --git a/templates/log.tt b/templates/log.tt
index eac3ed4..c5d275a 100644
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -1,3 +1,10 @@
+[%#
+
+Copyright (c) 2003-2010, Andrew Dunstan
+
+See accompanying License file for license details
+
+-%]
 [% PERL %]
 	use POSIX qw(ceil);
         my $lrfactor = 6;
@@ -19,13 +26,11 @@
 	pagebutton = 'none'
 %]
 [%- BLOCK gitlog ;
-	loglines = clog.split('\n');
-	firstline = loglines.shift;
-	commitref = firstline.replace('commit ([0-9A-Fa-f]+)','$1');
-%]
-commit <a href="[% giturl ; commitref %]">[% commitref %]</a>
-[% loglines.join("\n")  | html %]
+	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>
@@ -83,6 +88,9 @@ commit <a href="[% giturl ; commitref %]">[% commitref %]</a>
 <pre>
 [% conf | html %]
 </pre>
+<table>
+<tr>
+<td valign="top">
 <h3>Files changed this run</h3>
 [%- IF changed_this_run.0 -%]
 <pre>
@@ -90,20 +98,27 @@ commit <a href="[% giturl ; commitref %]">[% commitref %]</a>
 <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>
-<blockquote><pre>
-[%- FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
-[%IF not loop.last %]
-===================================================================
-[% END -%]
+<pre>
+<a href="https://github.com/postgres/postgres/compare/[% last_build_git_ref %]...[% git_head_ref %]">Change Set for this build</a>
+
+[% FOREACH clog IN changed_this_run_logs ; PROCESS gitlog -%]
 [%- END -%]
-</pre></blockquote>
+</pre>
+</td>
 [%- ELSE %]
-<pre>
 not recorded
 </pre>
+</td>
 [% END -%]
+</tr>
 [% IF stage != 'OK' %]
+<tr>
+<td valign="top">
 <h3>Files changed since last success</h3>
 [%- IF changed_since_success.0 %]
 <pre>
@@ -111,20 +126,29 @@ not recorded
 <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>
-<blockquote><pre>
-[%- FOREACH clog IN changed_since_success_logs ; PROCESS gitlog -%]
-[%IF not loop.last %]
-===================================================================
-[% END -%]
+<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></blockquote>
+</pre>
+</td>
 [%- ELSE %]
 <pre>
 not recorded
 </pre>
+</td>
 [% END -%]
+</tr>
 [% END %]
+</table>
 <h3>Log</h3>
 <pre>
 [% log | html %]