提交 4ed4a347 编写于 作者: J Jakub Narebski 提交者: Junio C Hamano

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

This reverts commit 6aa6f92f.

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/469083Signed-off-by: NJakub Narebski <jnareb@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 77ad7a49
...@@ -2164,7 +2164,7 @@ sub parse_difftree_raw_line { ...@@ -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 { ...@@ -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 { ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册