]> Lady’s Gitweb - Gitweb/blobdiff - gitweb.cgi
Lady’s Gitweb / Gitweb / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
provide filename for "save as" in plaintext views
[Gitweb] / gitweb.cgi
diff --git a/gitweb.cgi b/gitweb.cgi
index d204954134f058c4488964de171ee2695ae5ad118d421b5fe7ef283fbfb2802b..e81b9541a0267607130ece733b555987cb7348d522951c13b166de9aa7d210b2 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -5,7 +5,7 @@
 # (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
 # (C) 2005, Christian Gierke <ch@gierke.de>
 #
 # (C) 2005, Kay Sievers <kay.sievers@vrfy.org>
 # (C) 2005, Christian Gierke <ch@gierke.de>
 #
-# This program is licensed under the GPL v2, or a later version
+# This program is licensed under the GPLv2
 
 use strict;
 use warnings;
 
 use strict;
 use warnings;
@@ -15,7 +15,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
 use Fcntl ':mode';
 
 my $cgi = new CGI;
-my $version =          "243";
+my $version =          "247";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
 my $my_url =           $cgi->url();
 my $my_uri =           $cgi->url(-absolute => 1);
 my $rss_link = "";
@@ -152,8 +152,8 @@ sub validate_input {
 if (!defined $action || $action eq "summary") {
        git_summary();
        exit;
 if (!defined $action || $action eq "summary") {
        git_summary();
        exit;
-} elsif ($action eq "branches") {
-       git_branches();
+} elsif ($action eq "heads") {
+       git_heads();
        exit;
 } elsif ($action eq "tags") {
        git_tags();
        exit;
 } elsif ($action eq "tags") {
        git_tags();
@@ -297,11 +297,19 @@ EOF
                if (!defined $searchtext) {
                        $searchtext = "";
                }
                if (!defined $searchtext) {
                        $searchtext = "";
                }
+               my $search_hash;
+               if (defined $hash) {
+                       $search_hash = $hash;
+               } else {
+                       $search_hash  = "HEAD";
+               }
                $cgi->param("a", "search");
                $cgi->param("a", "search");
+               $cgi->param("h", $search_hash);
                print $cgi->startform(-method => "get", -action => "$my_uri") .
                      "<div class=\"search\">\n" .
                      $cgi->hidden(-name => "p") . "\n" .
                      $cgi->hidden(-name => "a") . "\n" .
                print $cgi->startform(-method => "get", -action => "$my_uri") .
                      "<div class=\"search\">\n" .
                      $cgi->hidden(-name => "p") . "\n" .
                      $cgi->hidden(-name => "a") . "\n" .
+                     $cgi->hidden(-name => "h") . "\n" .
                      $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                      "</div>" .
                      $cgi->end_form() . "\n";
                      $cgi->textfield(-name => "s", -value => $searchtext) . "\n" .
                      "</div>" .
                      $cgi->end_form() . "\n";
@@ -443,21 +451,28 @@ sub git_read_commit {
 
        my @commit_lines;
        my %co;
 
        my @commit_lines;
        my %co;
-       my @parents;
 
        if (defined $commit_text) {
                @commit_lines = @$commit_text;
        } else {
 
        if (defined $commit_text) {
                @commit_lines = @$commit_text;
        } else {
-               open my $fd, "-|", "$gitbin/git-cat-file commit $commit_id" or return;
-               @commit_lines = map { chomp; $_ } <$fd>;
+               $/ = "\0";
+               open my $fd, "-|", "$gitbin/git-rev-list --header --parents --max-count=1 $commit_id" or return;
+               @commit_lines = split '\n', <$fd>;
                close $fd or return;
                close $fd or return;
+               $/ = "\n";
+               pop @commit_lines;
        }
        }
+       my $header = shift @commit_lines;
+       if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
+               return;
+       }
+       ($co{'id'}, my @parents) = split ' ', $header;
+       $co{'parents'} = \@parents;
+       $co{'parent'} = $parents[0];
        while (my $line = shift @commit_lines) {
                last if $line eq "\n";
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $co{'tree'} = $1;
        while (my $line = shift @commit_lines) {
                last if $line eq "\n";
                if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
                        $co{'tree'} = $1;
-               } elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
-                       push @parents, $1;
                } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                        $co{'author'} = $1;
                        $co{'author_epoch'} = $2;
                } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
                        $co{'author'} = $1;
                        $co{'author_epoch'} = $2;
@@ -476,21 +491,9 @@ sub git_read_commit {
                }
        }
        if (!defined $co{'tree'}) {
                }
        }
        if (!defined $co{'tree'}) {
-               return undef
+               return;
        };
        };
-       if (!($commit_id =~ m/^[0-9a-fA-F]{40}$/)) {
-               # lookup hash by textual id
-               open my $fd, "-|", "$gitbin/git-rev-parse --verify $commit_id" or return;
-               my $hash_id = <$fd>;
-               close $fd or return;
-               chomp $hash_id;
-               $co{'id'} = $hash_id
-       } else {
-               $co{'id'} = $commit_id;
-       }
-       $co{'parents'} = \@parents;
-       $co{'parent'} = $parents[0];
-       $co{'comment'} = \@commit_lines;
+
        foreach my $title (@commit_lines) {
                if ($title ne "") {
                        $co{'title'} = chop_str($title, 80, 5);
        foreach my $title (@commit_lines) {
                if ($title ne "") {
                        $co{'title'} = chop_str($title, 80, 5);
@@ -515,6 +518,11 @@ sub git_read_commit {
                        last;
                }
        }
                        last;
                }
        }
+       # remove added spaces
+       foreach my $line (@commit_lines) {
+               $line =~ s/^    //;
+       }
+       $co{'comment'} = \@commit_lines;
 
        my $age = time - $co{'committer_epoch'};
        $co{'age'} = $age;
 
        my $age = time - $co{'committer_epoch'};
        $co{'age'} = $age;
@@ -1059,15 +1067,15 @@ sub git_summary {
                print "</table\n>";
        }
 
                print "</table\n>";
        }
 
-       my $branchlist = git_read_refs("refs/heads");
-       if (defined @$branchlist) {
+       my $headlist = git_read_refs("refs/heads");
+       if (defined @$headlist) {
                print "<div>\n" .
                print "<div>\n" .
-                     $cgi->a({-href => "$my_uri?p=$project;a=branches", -class => "title"}, "branches") .
+                     $cgi->a({-href => "$my_uri?p=$project;a=heads", -class => "title"}, "heads") .
                      "</div>\n";
                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;
                      "</div>\n";
                my $i = 16;
                print "<table cellspacing=\"0\">\n";
                my $alternate = 0;
-               foreach my $entry (@$branchlist) {
+               foreach my $entry (@$headlist) {
                        my %tag = %$entry;
                        if ($alternate) {
                                print "<tr class=\"dark\">\n";
                        my %tag = %$entry;
                        if ($alternate) {
                                print "<tr class=\"dark\">\n";
@@ -1087,7 +1095,7 @@ sub git_summary {
                                      "</td>\n" .
                                      "</tr>";
                        } else {
                                      "</td>\n" .
                                      "</tr>";
                        } else {
-                               print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=branches"}, "...") . "</td>\n" .
+                               print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=heads"}, "...") . "</td>\n" .
                                "</tr>";
                                last;
                        }
                                "</tr>";
                                last;
                        }
@@ -1195,7 +1203,7 @@ sub git_tags {
        git_footer_html();
 }
 
        git_footer_html();
 }
 
-sub git_branches {
+sub git_heads {
        my $head = git_read_hash("$project/HEAD");
        git_header_html();
        print "<div class=\"page_nav\">\n" .
        my $head = git_read_hash("$project/HEAD");
        git_header_html();
        print "<div class=\"page_nav\">\n" .
@@ -1273,7 +1281,6 @@ sub git_blob {
                $hash = git_get_hash_by_path($base, $file_name, "blob");
        }
        open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");
                $hash = git_get_hash_by_path($base, $file_name, "blob");
        }
        open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");
-       my $base = $file_name || "";
        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .
        git_header_html();
        if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
                print "<div class=\"page_nav\">\n" .
@@ -1283,9 +1290,13 @@ sub git_blob {
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") . "<br/>\n";
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
                      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") . "<br/>\n";
-               print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash"}, "plain") . "<br/>\n" .
-                     "</div>\n";
-               print "<div>" .
+               if (defined $file_name) {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash;f=$file_name"}, "plain") . "<br/>\n";
+               } else {
+                       print $cgi->a({-href => "$my_uri?p=$project;a=blob_plain;h=$hash"}, "plain") . "<br/>\n";
+               }
+               print "</div>\n".
+                      "<div>" .
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) .
                      "</div>\n";
        } else {
                      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) .
                      "</div>\n";
        } else {
@@ -1315,7 +1326,11 @@ sub git_blob {
 }
 
 sub git_blob_plain {
 }
 
 sub git_blob_plain {
-       print $cgi->header(-type => "text/plain", -charset => 'utf-8');
+       my $save_as = "$hash.txt";
+       if (defined $file_name) {
+               $save_as = $file_name;
+       }
+       print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"$save_as\"");
        open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or return;
        undef $/;
        print <$fd>;
        open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or return;
        undef $/;
        print <$fd>;
@@ -1937,7 +1952,7 @@ sub git_commitdiff_plain {
        }
        close $fd;
 
        }
        close $fd;
 
-       print $cgi->header(-type => "text/plain", -charset => 'utf-8');
+       print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\"");
        my %co = git_read_commit($hash);
        my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
        my $comment = $co{'comment'};
        my %co = git_read_commit($hash);
        my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
        my $comment = $co{'comment'};
@@ -2081,7 +2096,7 @@ sub git_search {
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";
        my $alternate = 0;
        if ($commit_search) {
                $/ = "\0";
-               open my $fd, "-|", "$gitbin/git-rev-list --header $hash";
+               open my $fd, "-|", "$gitbin/git-rev-list --header --parents $hash" or next;
                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;
                while (my $commit_text = <$fd>) {
                        if (!grep m/$searchtext/i, $commit_text) {
                                next;
@@ -2093,8 +2108,7 @@ sub git_search {
                                next;
                        }
                        my @commit_lines = split "\n", $commit_text;
                                next;
                        }
                        my @commit_lines = split "\n", $commit_text;
-                       my $commit = shift @commit_lines;
-                       my %co = git_read_commit($commit, \@commit_lines);
+                       my %co = git_read_commit(undef, \@commit_lines);
                        if (!%co) {
                                next;
                        }
                        if (!%co) {
                                next;
                        }
@@ -2107,7 +2121,7 @@ sub git_search {
                        print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                              "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
                              "<td>" .
                        print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                              "<td><i>" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "</i></td>\n" .
                              "<td>" .
-                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "<b>" . escapeHTML(chop_str($co{'title'}, 50)) . "</b><br/>");
+                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}", -class => "list"}, "<b>" . escapeHTML(chop_str($co{'title'}, 50)) . "</b><br/>");
                        my $comment = $co{'comment'};
                        foreach my $line (@$comment) {
                                if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
                        my $comment = $co{'comment'};
                        foreach my $line (@$comment) {
                                if ($line =~ m/^(.*)($searchtext)(.*)$/i) {
@@ -2122,8 +2136,8 @@ sub git_search {
                        }
                        print "</td>\n" .
                              "<td class=\"link\">" .
                        }
                        print "</td>\n" .
                              "<td class=\"link\">" .
-                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
-                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$commit"}, "tree");
+                             $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}"}, "commit") .
+                             " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}"}, "tree");
                        print "</td>\n" .
                              "</tr>\n";
                }
                        print "</td>\n" .
                              "</tr>\n";
                }
🐙🌐 Git·web: A C·G·I script for rendering Git repositories
This page took 0.209323 seconds and 4 git commands to generate.