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
This commit is contained in:
cls%seawood.org 2004-09-22 02:22:29 +00:00
parent 9012bc4efb
commit 50e35539fb

View File

@ -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/;