From 692c34b6a48f8c780024110f730f03ce1a3fbcff Mon Sep 17 00:00:00 2001
From: "timeless%mac.com" <timeless%mac.com>
Date: Thu, 30 May 2002 04:45:11 +0000
Subject: [PATCH] Bug 144837 bonsai file display always shows trunk revision
 r=tara

---
 webtools/bonsai/cvsblame.cgi | 4 +++-
 webtools/bonsai/cvslog.cgi   | 4 +++-
 webtools/bonsai/rview.cgi    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webtools/bonsai/cvsblame.cgi b/webtools/bonsai/cvsblame.cgi
index e1f58aaa5c6f..d9a441b4d465 100755
--- a/webtools/bonsai/cvsblame.cgi
+++ b/webtools/bonsai/cvsblame.cgi
@@ -105,6 +105,8 @@ my ($file_head, $file_tail) = $filename =~ m@(.*/)?(.+)@;
 #
 $::opt_rev = '';
 $::opt_rev = $::FORM{rev} if defined $::FORM{rev} and $::FORM{rev} ne 'HEAD';
+my $revstr = '';
+$revstr = "&rev=$::opt_rev" unless $::opt_rev eq '';
 my $browse_revtag = 'HEAD';
 $browse_revtag = $::opt_rev if ($::opt_rev =~ /[A-Za-z]/);
 my $revision = '';
@@ -261,7 +263,7 @@ print qq(
         </TD>
        </TR><TR>
         <TD NOWRAP>
-         <A HREF="cvslog.cgi?file=$filename">Full Change Log</A>
+         <A HREF="cvslog.cgi?file=$filename$revstr">Full Change Log</A>
         </TD>
 $graph_cell
        </TR>
diff --git a/webtools/bonsai/cvslog.cgi b/webtools/bonsai/cvslog.cgi
index 974278ec75bb..05e7b1167615 100755
--- a/webtools/bonsai/cvslog.cgi
+++ b/webtools/bonsai/cvslog.cgi
@@ -75,6 +75,8 @@ my ($file_head, $file_tail) = $filename =~ m@(.*/)?(.+)@;
 #
 $::opt_rev = "";
 $::opt_rev = $::FORM{'rev'} if defined $::FORM{'rev'} && $::FORM{'rev'} !~ m/^(HEAD|MAIN)$/;
+my $revstr = '';
+$revstr = "&rev=$::opt_rev" unless $::opt_rev eq '';
 my $browse_revtag = 'HEAD';
 $browse_revtag = $::opt_rev if ($::opt_rev =~ /[A-Za-z]/);
 my $revision = '';
@@ -219,7 +221,7 @@ print qq(
         </TD>
        </TR><TR>
         <TD>
-         <A HREF="cvsblame.cgi?file=$filename">blame</A>&nbsp;
+         <A HREF="cvsblame.cgi?file=$filename$revstr">blame</A>&nbsp;
         </TD><TD NOWRAP>
          Annotate the author of each line.
         </TD>
diff --git a/webtools/bonsai/rview.cgi b/webtools/bonsai/rview.cgi
index e9d2aee4af3c..d245198a8852 100755
--- a/webtools/bonsai/rview.cgi
+++ b/webtools/bonsai/rview.cgi
@@ -201,7 +201,7 @@ $split = int(@files/4)+1;
 
 for $_ (@files){
     $_ =~ s/\,v//;
-    print qq{<a href="$registryurl/file.cgi?cvsroot=$CVS_ROOT&file=$_&dir=$dir"}
+    print qq{<a href="$registryurl/file.cgi?cvsroot=$CVS_ROOT&file=$_&dir=$dir$revstr"}
           . " onclick=\"return js_file_menu('$dir','$_','$rev','$CVS_ROOT',event)\">\n";
     print "<dt>$_</a>\n";
     if( $j % $split == 0 ){