gitweb: optimize per-file history generation

[Gitweb] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index fc42778e211aac54b315bae8be02504f1c0a40261b9bc7bf4ca3c376cd0e6489..10f8fda2adb3c36866d7165512a5eebe5e65cda70b960f276979b590c1ca5dfb 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -327,7 +327,7 @@ EOF
                } elsif (defined $hash) {
                        $search_hash = $hash;
                } else {
                } elsif (defined $hash) {
                        $search_hash = $hash;
                } else {

-                       $search_hash  = "HEAD";
+                       $search_hash = "HEAD";

                }
                $cgi->param("a", "search");
                $cgi->param("h", $search_hash);
                }
                $cgi->param("a", "search");
                $cgi->param("h", $search_hash);


@@ -1767,8 +1767,8 @@ sub git_opml {
                }
 
                my $path = esc_html(chop_str($proj{'path'}, 25, 5));
                }
 
                my $path = esc_html(chop_str($proj{'path'}, 25, 5));

-               my $rss =  "$my_url?p=$proj{'path'};a=rss";
-               my $html =  "$my_url?p=$proj{'path'};a=summary";
+               my $rss  = "$my_url?p=$proj{'path'};a=rss";
+               my $html = "$my_url?p=$proj{'path'};a=summary";

                print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
        }
        print "</outline>\n".
                print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
        }
        print "</outline>\n".


@@ -1943,7 +1943,7 @@ sub git_commit {
              "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
              "</td>" .
              "</tr>\n";
              "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
              "</td>" .
              "</tr>\n";

-       my $parents  = $co{'parents'};
+       my $parents = $co{'parents'};

        foreach my $par (@$parents) {
                print "<tr>" .
                      "<td>parent</td>" .
        foreach my $par (@$parents) {
                print "<tr>" .
                      "<td>parent</td>" .


@@ -2295,16 +2295,13 @@ sub git_history {
              "</div>\n";
        print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b><br/></div>\n";
 
              "</div>\n";
        print "<div class=\"page_path\"><b>/" . esc_html($file_name) . "</b><br/></div>\n";
 

-       open my $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree -r --stdin -- \'$file_name\'";
-       my $commit;
+       open my $fd, "-|",
+               "$gitbin/git-rev-list --full-history $hash -- \'$file_name\'";

        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        while (my $line = <$fd>) {
                if ($line =~ m/^([0-9a-fA-F]{40})/){
        print "<table cellspacing=\"0\">\n";
        my $alternate = 0;
        while (my $line = <$fd>) {
                if ($line =~ m/^([0-9a-fA-F]{40})/){

-                       $commit = $1;
-                       next;
-               }
-               if ($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/ && (defined $commit)) {
+                       my $commit = $1;

                        my %co = git_read_commit($commit);
                        if (!%co) {
                                next;
                        my %co = git_read_commit($commit);
                        if (!%co) {
                                next;


@@ -2336,7 +2333,6 @@ sub git_history {
                        }
                        print "</td>\n" .
                              "</tr>\n";
                        }
                        print "</td>\n" .
                              "</tr>\n";

-                       undef $commit;

                }
        }
        print "</table>\n";
                }
        }
        print "</table>\n";