From 6468395bf22e4123f05d99f36f0f13d96911e89e Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 10 Jan 2011 05:26:15 -0800
Subject: [PATCH] Select predecesor build on same branch - fixes bug reported
 by Tom Lane.

---
 cgi-bin/show_log.pl | 12 ++++++------
 templates/log.tt    |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cgi-bin/show_log.pl b/cgi-bin/show_log.pl
index bc1e5d4..68ffa3d 100755
--- a/cgi-bin/show_log.pl
+++ b/cgi-bin/show_log.pl
@@ -59,26 +59,27 @@ if ($system && $logdate)
 	my $last_build_statement = q{
 		select distinct on (sysname) sysname, snapshot, stage, git_head_ref 
         from build_status 
-        where sysname = ? and snapshot < ? 
+        where sysname = ? and branch = ? and snapshot < ? 
         order by sysname, snapshot desc limit 1
 	};
 	my $last_success_statement = q{
 		select distinct on (sysname) sysname, snapshot, git_head_ref 
         from build_status 
-        where sysname = ? and snapshot < ? and stage = 'OK' 
+        where sysname = ? and branch = ? and snapshot < ? and stage = 'OK' 
         order by sysname, snapshot desc limit 1
 	};
 	my $sth=$db->prepare($statement);
 	$sth->execute($system,$logdate);
 	my $row=$sth->fetchrow_arrayref;
-	$sth->finish;
+	$branch = $row->[5];
 	$git_head_ref = $row->[9];
+	$sth->finish;
 	my $last_build_row;
 	if ($git_head_ref)
 	{
 		$last_build_row = 
 		  $db->selectrow_hashref($last_build_statement,undef,
-								 $system,$logdate);
+								 $system,$branch,$logdate);
 		$last_build_git_ref = $last_build_row->{git_head_ref}
 		  if $last_build_row;
 		
@@ -88,7 +89,7 @@ if ($system && $logdate)
 	{
 		$last_success_row =
 		  $db->selectrow_hashref($last_success_statement,undef,
-								 $system,$logdate);
+								 $system,$branch,$logdate);
 		$last_success_git_ref = $last_success_row->{git_head_ref}
 		  if $last_success_row;
 	}
@@ -97,7 +98,6 @@ if ($system && $logdate)
 	$stage=$row->[2] || "unknown";
 	$changed_this_run = $row->[3];
 	$changed_since_success = $row->[4];
-	$branch = $row->[5];
 	my $log_file_names = $row->[6];
 	$scm = $row->[7];
 	$scm ||= 'cvs'; # legacy scripts
diff --git a/templates/log.tt b/templates/log.tt
index d53e61a..07699b0 100644
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -30,6 +30,11 @@ See accompanying License file for license details
 	firstline = loglines.shift;
 	commitref = firstline.replace('commit ([0-9A-Fa-f]+)','$1');
 %]
+<!--
+git_head_ref [% git_head_ref %]
+last_build_git_ref [% last_build_git_ref %]
+last_success_git_ref [% last_success_git_ref %]
+-->
 commit <a href="[% giturl ; commitref %]">[% commitref %]</a>
 [% loglines.join("\n")  | html %]
 
-- 
2.30.2