gitweb: Cleanup and uniquify die_error calls

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 852896a1e96495d96e81e1e2b7703d365e2a6d0ffa27678ebc5c3e1d546c0bf4..f6c5f29cbdb4a537ff6110862c39d1dec79435734459683e44427e491c4ee7a6 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -592,7 +592,7 @@ sub esc_html ($;%) {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -606,7 +606,7 @@ sub esc_path {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -835,7 +835,7 @@ sub file_type_long {
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments

-## which don't beling to other sections
+## which don't belong to other sections

 
 # format line of commit message.
 sub format_log_line_html {
 
 # format line of commit message.
 sub format_log_line_html {


@@ -987,7 +987,7 @@ sub git_get_project_config {
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 

-       my @x = (git_cmd(), 'repo-config');
+       my @x = (git_cmd(), 'config');

        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";
        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";


@@ -1691,7 +1691,7 @@ sub git_header_html {
 
        my $title = "$site_name";
        if (defined $project) {
 
        my $title = "$site_name";
        if (defined $project) {

-               $title .= " - $project";
+               $title .= " - " . to_utf8($project);

                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {
                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {


@@ -1964,7 +1964,7 @@ sub git_print_page_path {
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),

-                     -title => 'tree root'}, "[$project]");
+                     -title => 'tree root'}, to_utf8("[$project]"));

        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;
        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;


@@ -1975,17 +1975,17 @@ sub git_print_page_path {
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),

-                                     -title => esc_html($fullname)}, esc_path($dir));
+                                     -title => $fullname}, esc_path($dir));

                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),
                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),
                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                        print " / ";
                } else {
                        print esc_path($basename);
                        print " / ";
                } else {
                        print esc_path($basename);


@@ -2240,7 +2240,7 @@ sub git_difftree_body {
                        }
                        print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},
                        }
                        print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
                                                     hash_base=>$hash, file_name=>$diff{'file'})},

-                                     "blob") . " | ";
+                                     "blob");

                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "D") { # deleted
                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "D") { # deleted


@@ -2379,7 +2379,6 @@ sub git_patchset_body {
        my $patch_line;
        my $diffinfo;
        my (%from, %to);
        my $patch_line;
        my $diffinfo;
        my (%from, %to);

-       my ($from_id, $to_id);

 
        print "<div class=\"patchset\">\n";
 
 
        print "<div class=\"patchset\">\n";
 


@@ -2393,6 +2392,7 @@ sub git_patchset_body {
  PATCH:
        while ($patch_line) {
                my @diff_header;
  PATCH:
        while ($patch_line) {
                my @diff_header;

+               my ($from_id, $to_id);

 
                # git diff header
                #assert($patch_line =~ m/^diff /) if DEBUG;
 
                # git diff header
                #assert($patch_line =~ m/^diff /) if DEBUG;


@@ -2404,7 +2404,7 @@ sub git_patchset_body {
                while ($patch_line = <$fd>) {
                        chomp $patch_line;
 
                while ($patch_line = <$fd>) {
                        chomp $patch_line;
 

-                       last EXTENDED_HEADER if ($patch_line =~ m/^--- /);
+                       last EXTENDED_HEADER if ($patch_line =~ m/^--- |^diff /);

 
                        if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                $from_id = $1;
 
                        if ($patch_line =~ m/^index ([0-9a-fA-F]{40})..([0-9a-fA-F]{40})/) {
                                $from_id = $1;


@@ -2413,7 +2413,6 @@ sub git_patchset_body {
 
                        push @diff_header, $patch_line;
                }
 
                        push @diff_header, $patch_line;
                }

-               #last PATCH unless $patch_line;

                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line
                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line


@@ -2440,11 +2439,15 @@ sub git_patchset_body {
                                $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
                                                     hash=>$diffinfo->{'from_id'},
                                                     file_name=>$from{'file'});
                                $from{'href'} = href(action=>"blob", hash_base=>$hash_parent,
                                                     hash=>$diffinfo->{'from_id'},
                                                     file_name=>$from{'file'});

+                       } else {
+                               delete $from{'href'};

                        }
                        if ($diffinfo->{'status'} ne "D") { # not deleted file
                                $to{'href'} = href(action=>"blob", hash_base=>$hash,
                                                   hash=>$diffinfo->{'to_id'},
                                                   file_name=>$to{'file'});
                        }
                        if ($diffinfo->{'status'} ne "D") { # not deleted file
                                $to{'href'} = href(action=>"blob", hash_base=>$hash,
                                                   hash=>$diffinfo->{'to_id'},
                                                   file_name=>$to{'file'});

+                       } else {
+                               delete $to{'href'};

                        }
                        # this is first patch for raw difftree line with $patch_idx index
                        # we index @$difftree array from 0, but number patches from 1
                        }
                        # this is first patch for raw difftree line with $patch_idx index
                        # we index @$difftree array from 0, but number patches from 1


@@ -2476,11 +2479,11 @@ sub git_patchset_body {
                        # match <path>
                        if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
                        # match <path>
                        if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},

-                                                       esc_path($from{'file'}));
+                                                      esc_path($from{'file'}));

                        }
                        if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
                        }
                        if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {

-                               $patch_line = $cgi->a({-href=>$to{'href'}, -class=>"path"},
-                                                     esc_path($to{'file'}));
+                               $patch_line .= $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                                      esc_path($to{'file'}));

                        }
                        # match <mode>
                        if ($patch_line =~ m/\s(\d{6})$/) {
                        }
                        # match <mode>
                        if ($patch_line =~ m/\s(\d{6})$/) {


@@ -2519,8 +2522,13 @@ sub git_patchset_body {
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;

+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }
+               next PATCH if ($patch_line =~ m/^diff /);

                #assert($patch_line =~ m/^---/) if DEBUG;
                #assert($patch_line =~ m/^---/) if DEBUG;

-               if ($from{'href'}) {
+               if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {

                        $patch_line = '--- a/' .
                                      $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                              esc_path($from{'file'}));
                        $patch_line = '--- a/' .
                                      $cgi->a({-href=>$from{'href'}, -class=>"path"},
                                              esc_path($from{'file'}));


@@ -2528,11 +2536,10 @@ sub git_patchset_body {
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;

-               last PATCH unless $patch_line;

                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;
                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;

-               if ($to{'href'}) {
+               if ($to{'href'} && $patch_line =~ m!^\+\+\+ "?b/!) {

                        $patch_line = '+++ b/' .
                                      $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                              esc_path($to{'file'}));
                        $patch_line = '+++ b/' .
                                      $cgi->a({-href=>$to{'href'}, -class=>"path"},
                                              esc_path($to{'file'}));


@@ -3148,7 +3155,7 @@ sub git_blame2 {
        }
        $ftype = git_get_type($hash);
        if ($ftype !~ "blob") {
        }
        $ftype = git_get_type($hash);
        if ($ftype !~ "blob") {

-               die_error("400 Bad Request", "Object is not a blob");
+               die_error('400 Bad Request', "Object is not a blob");

        }
        open ($fd, "-|", git_cmd(), "blame", '-p', '--',
              $file_name, $hash_base)
        }
        open ($fd, "-|", git_cmd(), "blame", '-p', '--',
              $file_name, $hash_base)


@@ -3214,7 +3221,7 @@ HTML
                        print "</td>\n";
                }
                open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")
                        print "</td>\n";
                }
                open (my $dd, "-|", git_cmd(), "rev-parse", "$full_rev^")

-                       or die_error("could not open git-rev-parse");
+                       or die_error(undef, "Open git-rev-parse failed");

                my $parent_commit = <$dd>;
                close $dd;
                chomp($parent_commit);
                my $parent_commit = <$dd>;
                close $dd;
                chomp($parent_commit);


@@ -3604,7 +3611,7 @@ sub git_snapshot {
                $hash = git_get_head_hash($project);
        }
 
                $hash = git_get_head_hash($project);
        }
 

-       my $filename = basename($project) . "-$hash.tar.$suffix";
+       my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";

 
        print $cgi->header(
                -type => "application/$ctype",
 
        print $cgi->header(
                -type => "application/$ctype",


@@ -3616,7 +3623,7 @@ sub git_snapshot {
        $name =~ s/\047/\047\\\047\047/g;
        open my $fd, "-|",
        "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
        $name =~ s/\047/\047\\\047\047/g;
        open my $fd, "-|",
        "$git archive --format=tar --prefix=\'$name\'/ $hash | $command"

-               or die_error(undef, "Execute git-tar-tree failed.");
+               or die_error(undef, "Execute git-tar-tree failed");

        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
        binmode STDOUT, ':raw';
        print <$fd>;
        binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi


@@ -3713,7 +3720,7 @@ sub git_commit {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {

-                               $cgi->a({-href => href(action=>"commitdiff",
+                               $cgi->a({-href => href(action=>"commit",

                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .
                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .