Revert "gitweb: extend blame to show links to diff and previous"

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index b75a81ba29c086542556cc1482f110ca0e5a0bd07c4d8080b88642ad2dc20845..64ec4f25c0e3fc9d82c631d3c434bea2dc7181a2082b99c476198cbe34a6c094 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2320,7 +2320,7 @@ sub git_project_index {
        print $cgi->header(
                -type => 'text/plain',
                -charset => 'utf-8',
-               -content_disposition => qq(inline; filename="index.aux"));
+               -content_disposition => 'inline; filename="index.aux"');
 
        foreach my $pr (@projects) {
                if (!exists $pr->{'owner'}) {
@@ -2479,7 +2479,7 @@ sub git_blame2 {
        print <<HTML;
 <div class="page_body">
 <table class="blame">
-<tr><th>Prev</th><th>Diff</th><th>Commit</th><th>Line</th><th>Data</th></tr>
+<tr><th>Commit</th><th>Line</th><th>Data</th></tr>
 HTML
        while (<$fd>) {
                /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
@@ -2487,8 +2487,6 @@ HTML
                my $rev = substr($full_rev, 0, 8);
                my $lineno = $2;
                my $data = $3;
-               my %pco = parse_commit($full_rev);
-               my $parent = $pco{'parent'};
 
                if (!defined $last_rev) {
                        $last_rev = $full_rev;
@@ -2497,25 +2495,11 @@ HTML
                        $current_color = ++$current_color % $num_colors;
                }
                print "<tr class=\"$rev_color[$current_color]\">\n";
-               # Print the Prev link
-               print "<td class=\"sha1\">";
-               print $cgi->a({-href => href(action=>"blame", hash_base=>$parent, file_name=>$file_name)},
-                             esc_html(substr($parent, 0, 8)));
-               print "</td>\n";
-               # Print the Diff (blobdiff) link
-               print "<td>";
-               print $cgi->a({-href => href(action=>"blobdiff", file_name=>$file_name, hash_parent_base=>$parent,
-                                            hash_base=>$full_rev)},
-                             esc_html("Diff"));
-               print "</td>\n";
-               # Print the Commit link
                print "<td class=\"sha1\">" .
                        $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
                                esc_html($rev)) . "</td>\n";
-               # Print the Line number
                print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
                      esc_html($lineno) . "</a></td>\n";
-               # Print the Data
                print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                print "</tr>\n";
        }
@@ -2682,7 +2666,7 @@ sub git_blob_plain {
        print $cgi->header(
                -type => "$type",
                -expires=>$expires,
-               -content_disposition => "inline; filename=\"$save_as\"");
+               -content_disposition => 'inline; filename="' . quotemeta($save_as) . '"');
        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;
@@ -2856,10 +2840,11 @@ sub git_snapshot {
 
        my $filename = basename($project) . "-$hash.tar.$suffix";
 
-       print $cgi->header(-type => 'application/x-tar',
-                          -content_encoding => $ctype,
-                          -content_disposition => "inline; filename=\"$filename\"",
-                          -status => '200 OK');
+       print $cgi->header(
+               -type => 'application/x-tar',
+               -content_encoding => $ctype,
+               -content_disposition => 'inline; filename="' . quotemeta($filename) . '"',
+               -status => '200 OK');
 
        my $git_command = git_cmd_str();
        open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
@@ -3169,7 +3154,7 @@ sub git_blobdiff {
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,
-                       -content_disposition => qq(inline; filename=") . quotemeta($file_name) . qq(.patch"));
+                       -content_disposition => 'inline; filename="' . quotemeta($file_name) . '.patch"');
 
                print "X-Git-Url: " . $cgi->self_url() . "\n\n";
 
@@ -3272,7 +3257,7 @@ sub git_commitdiff {
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,
-                       -content_disposition => qq(inline; filename="$filename"));
+                       -content_disposition => 'inline; filename="' . quotemeta($filename) . '"');
                my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                print <<TEXT;
 From: $co{'author'}