From 50e35539fbb3891af08e7fcad6d92389ce8a5a4c Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Sep 2004 02:22:29 +0000
Subject: [PATCH] Make multidiff work with files that have been cvs removed.
 Bug #180528 r=timeless

git-svn-id: svn://10.0.0.236/trunk@162648 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bonsai/multidiff.cgi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bonsai/multidiff.cgi b/mozilla/webtools/bonsai/multidiff.cgi
index 7edc9116526..f0e8faf5a80 100755
--- a/mozilla/webtools/bonsai/multidiff.cgi
+++ b/mozilla/webtools/bonsai/multidiff.cgi
@@ -77,13 +77,12 @@ for my $k (@revs) {
         next;
     }
     my $prevrev = &PrevRev($rev);
-    
-    # this doesn't handle files in the attic
     my $fullname = "$cvsroot/$dir/$file,v";
-    if (IsHidden($fullname)) {
+    $fullname = "$cvsroot/$dir/Attic/$file,v" if (! -r $fullname);
+    if (! -r $fullname || IsHidden($fullname)) {
         next;
     }
-    open( DIFF, "$rcsdiffcommand -u -r$prevrev -r$rev" . escape_shell($fullname) ." 2>&1|" );
+    open( DIFF, "$rcsdiffcommand -r$prevrev -r$rev -u " . shell_escape($fullname) ." 2>&1|" ) || die "rcsdiff failed\n";
     while(<DIFF>){
 		if (($_ =~ /RCS file/) || ($_ =~ /rcsdiff/)) { 
 			$_ =~ s/(^.*)(.*\/)(.*)/$1 $3/;