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

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index e68122ea6853534e5a3968ae710e28a087667f9cb3a06440dd21450a212ac4bb..43302b19cdb734d9a0a4661816ed5ac654b2677babb7f8a1677c83b9085e322a 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -370,7 +370,12 @@ sub filter_snapshot_fmts {
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
 }
 
 our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";

-do $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+if (-e $GITWEB_CONFIG) {
+       do $GITWEB_CONFIG;
+} else {
+       our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
+       do $GITWEB_CONFIG_SYSTEM if -e $GITWEB_CONFIG_SYSTEM;
+}

 
 # version of the core git binary
 our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
 
 # version of the core git binary
 our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";


@@ -2165,7 +2170,7 @@ sub parse_difftree_raw_line {
                $res{'to_mode'} = $2;
                $res{'from_id'} = $3;
                $res{'to_id'} = $4;
                $res{'to_mode'} = $2;
                $res{'from_id'} = $3;
                $res{'to_id'} = $4;

-               $res{'status'} = $res{'status_str'} = $5;
+               $res{'status'} = $5;

                $res{'similarity'} = $6;
                if ($res{'status'} eq 'R' || $res{'status'} eq 'C') { # renamed or copied
                        ($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7);
                $res{'similarity'} = $6;
                if ($res{'status'} eq 'R' || $res{'status'} eq 'C') { # renamed or copied
                        ($res{'from_file'}, $res{'to_file'}) = map { unquote($_) } split("\t", $7);


@@ -2181,7 +2186,6 @@ sub parse_difftree_raw_line {
                $res{'to_mode'} = pop @{$res{'from_mode'}};
                $res{'from_id'} = [ split(' ', $3) ];
                $res{'to_id'} = pop @{$res{'from_id'}};
                $res{'to_mode'} = pop @{$res{'from_mode'}};
                $res{'from_id'} = [ split(' ', $3) ];
                $res{'to_id'} = pop @{$res{'from_id'}};

-               $res{'status_str'} = $4;

                $res{'status'} = [ split('', $4) ];
                $res{'to_file'} = unquote($5);
        }
                $res{'status'} = [ split('', $4) ];
                $res{'to_file'} = unquote($5);
        }


@@ -3003,7 +3007,7 @@ sub fill_from_file_info {
 sub is_deleted {
        my $diffinfo = shift;
 
 sub is_deleted {
        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