undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"

Browse Source 
This reverts commit 6aa6f92fda.

It caused is_deleted() subroutine to output warnings when dealing with
old, legacy gitweb blobdiff URLs without either 'hb' or 'hpb'
parameters.

This fixes http://bugs.debian.org/469083

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski 2008-04-05 21:13:24 +01:00 committed by Junio C Hamano
parent 77ad7a49d3
commit 4ed4a34716
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitweb/gitweb.perl
View File

@ -2164,7 +2164,7 @@ sub parse_difftree_raw_line {
$res{'to_mode'} = $2; $res{'to_mode'} = $2;
$res{'from_id'} = $3; $res{'from_id'} = $3;
$res{'to_id'} = $4; $res{'to_id'} = $4;
$res{'status'} = $res{'status_str'} = $5; $res{'status'} = $5;
$res{'similarity'} = $6; $res{'similarity'} = $6;
if ($res{'status'} eq 'R' || $res{'status'} eq 'C') { # renamed or copied if ($res{'status'} eq 'R' || $res{'status'} eq 'C') { # renamed or copied
($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7); ($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7);
@ -2180,7 +2180,6 @@ sub parse_difftree_raw_line {
$res{'to_mode'} = pop @{$res{'from_mode'}}; $res{'to_mode'} = pop @{$res{'from_mode'}};
$res{'from_id'} = [ split(' ', $3) ]; $res{'from_id'} = [ split(' ', $3) ];
$res{'to_id'} = pop @{$res{'from_id'}}; $res{'to_id'} = pop @{$res{'from_id'}};
$res{'status_str'} = $4;
$res{'status'} = [ split('', $4) ]; $res{'status'} = [ split('', $4) ];
$res{'to_file'} = unquote($5); $res{'to_file'} = unquote($5);
} }
@ -3002,7 +3001,7 @@ sub fill_from_file_info {
sub is_deleted { sub is_deleted {
my $diffinfo = shift; my $diffinfo = shift;
return $diffinfo->{'status_str'} =~ /D/; return $diffinfo->{'to_id'} eq ('0' x 40);
} }
# does patch correspond to [previous] difftree raw line # does patch correspond to [previous] difftree raw line