tar-tree deprecation: we eat our own dog food.

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 8a064b753927693497149ffd42af51c1b910ac6b379cf98fa4aff3530893014e..60f77c399e6d45fb6da4a0046dacf6583d047ae2860cdf1b7f1a5eec8b659daf 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -41,11 +41,19 @@ our $home_link_str = "++GITWEB_HOME_LINK_STR++";
 # replace this with something more descriptive for clearer bookmarks
 our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
 
 # replace this with something more descriptive for clearer bookmarks
 our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
 

+# filename of html text to include at top of each page
+our $site_header = "++GITWEB_SITE_HEADER++";

 # html text to include at home page
 our $home_text = "++GITWEB_HOMETEXT++";
 # html text to include at home page
 our $home_text = "++GITWEB_HOMETEXT++";

+# filename of html text to include at bottom of each page
+our $site_footer = "++GITWEB_SITE_FOOTER++";
+
+# URI of stylesheets
+our @stylesheets = ("++GITWEB_CSS++");
+our $stylesheet;
+# default is not to define style sheet, but it can be overwritten later
+undef $stylesheet;

 
 

-# URI of default stylesheet
-our $stylesheet = "++GITWEB_CSS++";

 # URI of GIT logo
 our $logo = "++GITWEB_LOGO++";
 # URI of GIT favicon, assumed to be image/png type
 # URI of GIT logo
 our $logo = "++GITWEB_LOGO++";
 # URI of GIT favicon, assumed to be image/png type


@@ -102,6 +110,10 @@ our %feature = (
                'sub' => \&feature_pickaxe,
                'override' => 0,
                'default' => [1]},
                'sub' => \&feature_pickaxe,
                'override' => 0,
                'default' => [1]},

+
+       'pathinfo' => {
+               'override' => 0,
+               'default' => [0]},

 );
 
 sub gitweb_check_feature {
 );
 
 sub gitweb_check_feature {


@@ -112,6 +124,10 @@ sub gitweb_check_feature {
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
                $feature{$name}{'override'},
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }

+       if (!defined $sub) {
+               warn "feature $name is not overrideable";
+               return @defaults;
+       }

        return $sub->(@defaults);
 }
 
        return $sub->(@defaults);
 }
 


@@ -155,6 +171,13 @@ sub feature_snapshot {
        return ($ctype, $suffix, $command);
 }
 
        return ($ctype, $suffix, $command);
 }
 

+sub gitweb_have_snapshot {
+       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
+       my $have_snapshot = (defined $ctype && defined $suffix);
+
+       return $have_snapshot;
+}
+

 # To enable system wide have in $GITWEB_CONFIG
 # $feature{'pickaxe'}{'default'} = [1];
 # To have project specific config enable override in $GITWEB_CONFIG
 # To enable system wide have in $GITWEB_CONFIG
 # $feature{'pickaxe'}{'default'} = [1];
 # To have project specific config enable override in $GITWEB_CONFIG


@@ -173,6 +196,22 @@ sub feature_pickaxe {
        return ($_[0]);
 }
 
        return ($_[0]);
 }
 

+# checking HEAD file with -e is fragile if the repository was
+# initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed
+# and then pruned.
+sub check_head_link {
+       my ($dir) = @_;
+       my $headfile = "$dir/HEAD";
+       return ((-e $headfile) ||
+               (-l $headfile && readlink($headfile) =~ /^refs\/heads\//));
+}
+
+sub check_export_ok {
+       my ($dir) = @_;
+       return (check_head_link($dir) &&
+               (!$export_ok || -e "$dir/$export_ok"));
+}
+

 # rename detection options for git-diff and git-diff-tree
 # - default is '-M', with the cost proportional to
 #   (number of removed files) * (number of new files).
 # rename detection options for git-diff and git-diff-tree
 # - default is '-M', with the cost proportional to
 #   (number of removed files) * (number of new files).


@@ -205,7 +244,7 @@ our $project = $cgi->param('p');
 if (defined $project) {
        if (!validate_pathname($project) ||
            !(-d "$projectroot/$project") ||
 if (defined $project) {
        if (!validate_pathname($project) ||
            !(-d "$projectroot/$project") ||

-           !(-e "$projectroot/$project/HEAD") ||
+           !check_head_link("$projectroot/$project") ||

            ($export_ok && !(-e "$projectroot/$project/$export_ok")) ||
            ($strict_export && !project_in_list($project))) {
                undef $project;
            ($export_ok && !(-e "$projectroot/$project/$export_ok")) ||
            ($strict_export && !project_in_list($project))) {
                undef $project;


@@ -282,7 +321,7 @@ sub evaluate_path_info {
        # find which part of PATH_INFO is project
        $project = $path_info;
        $project =~ s,/+$,,;
        # find which part of PATH_INFO is project
        $project = $path_info;
        $project =~ s,/+$,,;

-       while ($project && !-e "$projectroot/$project/HEAD") {
+       while ($project && !check_head_link("$projectroot/$project")) {

                $project =~ s,/*[^/]*$,,;
        }
        # validate project
                $project =~ s,/*[^/]*$,,;
        }
        # validate project


@@ -368,6 +407,7 @@ exit;
 
 sub href(%) {
        my %params = @_;
 
 sub href(%) {
        my %params = @_;

+       my $href = $my_uri;

 
        my @mapping = (
                project => "p",
 
        my @mapping = (
                project => "p",


@@ -386,6 +426,19 @@ sub href(%) {
 
        $params{'project'} = $project unless exists $params{'project'};
 
 
        $params{'project'} = $project unless exists $params{'project'};
 

+       my ($use_pathinfo) = gitweb_check_feature('pathinfo');
+       if ($use_pathinfo) {
+               # use PATH_INFO for project name
+               $href .= "/$params{'project'}" if defined $params{'project'};
+               delete $params{'project'};
+
+               # Summary just uses the project path URL
+               if (defined $params{'action'} && $params{'action'} eq 'summary') {
+                       delete $params{'action'};
+               }
+       }
+
+       # now encode the parameters explicitly

        my @result = ();
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
        my @result = ();
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);


@@ -393,7 +446,9 @@ sub href(%) {
                        push @result, $symbol . "=" . esc_param($params{$name});
                }
        }
                        push @result, $symbol . "=" . esc_param($params{$name});
                }
        }

-       return "$my_uri?" . join(';', @result);
+       $href .= "?" . join(';', @result) if scalar @result;
+
+       return $href;

 }
 
 
 }
 
 


@@ -458,6 +513,7 @@ sub esc_html {
        $str = decode("utf8", $str, Encode::FB_DEFAULT);
        $str = escapeHTML($str);
        $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)
        $str = decode("utf8", $str, Encode::FB_DEFAULT);
        $str = escapeHTML($str);
        $str =~ s/\014/^L/g; # escape FORM FEED (FF) character (e.g. in COPYING file)

+       $str =~ s/\033/^[/g; # "escape" ESCAPE (\e) character (e.g. commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1)

        return $str;
 }
 
        return $str;
 }
 


@@ -808,8 +864,7 @@ sub git_get_projects_list {
 
                                my $subdir = substr($File::Find::name, $pfxlen + 1);
                                # we check related file in $projectroot
 
                                my $subdir = substr($File::Find::name, $pfxlen + 1);
                                # we check related file in $projectroot

-                               if (-e "$projectroot/$subdir/HEAD" && (!$export_ok ||
-                                   -e "$projectroot/$subdir/$export_ok")) {
+                               if (check_export_ok("$projectroot/$subdir")) {

                                        push @list, { path => $subdir };
                                        $File::Find::prune = 1;
                                }
                                        push @list, { path => $subdir };
                                        $File::Find::prune = 1;
                                }


@@ -830,8 +885,7 @@ sub git_get_projects_list {
                        if (!defined $path) {
                                next;
                        }
                        if (!defined $path) {
                                next;
                        }

-                       if (-e "$projectroot/$path/HEAD" && (!$export_ok ||
-                           -e "$projectroot/$path/$export_ok")) {
+                       if (check_export_ok("$projectroot/$path")) {

                                my $pr = {
                                        path => $path,
                                        owner => decode("utf8", $owner, Encode::FB_DEFAULT),
                                my $pr = {
                                        path => $path,
                                        owner => decode("utf8", $owner, Encode::FB_DEFAULT),


@@ -1344,8 +1398,17 @@ sub git_header_html {
 <meta name="generator" content="gitweb/$version git/$git_version"/>
 <meta name="robots" content="index, nofollow"/>
 <title>$title</title>
 <meta name="generator" content="gitweb/$version git/$git_version"/>
 <meta name="robots" content="index, nofollow"/>
 <title>$title</title>

-<link rel="stylesheet" type="text/css" href="$stylesheet"/>

 EOF
 EOF

+# print out each stylesheet that exist
+       if (defined $stylesheet) {
+#provides backwards capability for those people who define style sheet in a config file
+               print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n";
+       } else {
+               foreach my $stylesheet (@stylesheets) {
+                       next unless $stylesheet;
+                       print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n";
+               }
+       }

        if (defined $project) {
                printf('<link rel="alternate" title="%s log" '.
                       'href="%s" type="application/rss+xml"/>'."\n",
        if (defined $project) {
                printf('<link rel="alternate" title="%s log" '.
                       'href="%s" type="application/rss+xml"/>'."\n",


@@ -1363,8 +1426,15 @@ EOF
        }
 
        print "</head>\n" .
        }
 
        print "</head>\n" .

-             "<body>\n" .
-             "<div class=\"page_header\">\n" .
+             "<body>\n";
+
+       if (-f $site_header) {
+               open (my $fd, $site_header);
+               print <$fd>;
+               close $fd;
+       }
+
+       print "<div class=\"page_header\">\n" .

              "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
              "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
              "</a>\n";
              "<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
              "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
              "</a>\n";


@@ -1415,8 +1485,15 @@ sub git_footer_html {
                print $cgi->a({-href => href(project=>undef, action=>"project_index"),
                              -class => "rss_logo"}, "TXT") . "\n";
        }
                print $cgi->a({-href => href(project=>undef, action=>"project_index"),
                              -class => "rss_logo"}, "TXT") . "\n";
        }

-       print "</div>\n" .
-             "</body>\n" .
+       print "</div>\n" ;
+
+       if (-f $site_footer) {
+               open (my $fd, $site_footer);
+               print <$fd>;
+               close $fd;
+       }
+
+       print "</body>\n" .

              "</html>";
 }
 
              "</html>";
 }
 


@@ -1665,9 +1742,9 @@ sub git_print_tree_entry {
                                      "history");
                }
                print " | " .
                                      "history");
                }
                print " | " .

-                     $cgi->a({-href => href(action=>"blob_plain",
-                                            hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
-                             "raw");
+                       $cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base,
+                                              file_name=>"$basedir$t->{'name'}")},
+                               "raw");

                print "</td>\n";
 
        } elsif ($t->{'type'} eq "tree") {
                print "</td>\n";
 
        } elsif ($t->{'type'} eq "tree") {


@@ -2014,7 +2091,8 @@ sub git_shortlog_body {
                print "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
                print "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .

-                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree");
+                     $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree") . " | " .
+                     $cgi->a({-href => href(action=>"snapshot", hash=>$commit)}, "snapshot");

                print "</td>\n" .
                      "</tr>\n";
        }
                print "</td>\n" .
                      "</tr>\n";
        }


@@ -2063,9 +2141,8 @@ sub git_history_body {
                                          href(action=>"commit", hash=>$commit), $ref);
                print "</td>\n" .
                      "<td class=\"link\">" .
                                          href(action=>"commit", hash=>$commit), $ref);
                print "</td>\n" .
                      "<td class=\"link\">" .

-                     $cgi->a({-href => href(action=>"commit", hash=>$commit)}, "commit") . " | " .
-                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff") . " | " .
-                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype);
+                     $cgi->a({-href => href(action=>$ftype, hash_base=>$commit, file_name=>$file_name)}, $ftype) . " | " .
+                     $cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");

 
                if ($ftype eq 'blob') {
                        my $blob_current = git_get_hash_by_path($hash_base, $file_name);
 
                if ($ftype eq 'blob') {
                        my $blob_current = git_get_hash_by_path($hash_base, $file_name);


@@ -2468,22 +2545,30 @@ sub git_blame2 {
 <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
 HTML
        while (<$fd>) {
 <tr><th>Commit</th><th>Line</th><th>Data</th></tr>
 HTML
        while (<$fd>) {

-               /^([0-9a-fA-F]{40}).*?(\d+)\)\s{1}(\s*.*)/;
-               my $full_rev = $1;
+               my ($full_rev, $author, $date, $lineno, $data) =
+                       /^([0-9a-f]{40}).*?\s\((.*?)\s+([-\d]+ [:\d]+ [-+\d]+)\s+(\d+)\)\s(.*)/;

                my $rev = substr($full_rev, 0, 8);
                my $rev = substr($full_rev, 0, 8);

-               my $lineno = $2;
-               my $data = $3;
+               my $print_c8 = 0;

 
                if (!defined $last_rev) {
                        $last_rev = $full_rev;
 
                if (!defined $last_rev) {
                        $last_rev = $full_rev;

+                       $print_c8 = 1;

                } elsif ($last_rev ne $full_rev) {
                        $last_rev = $full_rev;
                        $current_color = ++$current_color % $num_colors;
                } elsif ($last_rev ne $full_rev) {
                        $last_rev = $full_rev;
                        $current_color = ++$current_color % $num_colors;

+                       $print_c8 = 1;

                }
                print "<tr class=\"$rev_color[$current_color]\">\n";
                }
                print "<tr class=\"$rev_color[$current_color]\">\n";

-               print "<td class=\"sha1\">" .
-                       $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
-                               esc_html($rev)) . "</td>\n";
+               print "<td class=\"sha1\"";
+               if ($print_c8 == 1) {
+                       print " title=\"$author, $date\"";
+               }
+               print ">";
+               if ($print_c8 == 1) {
+                       print $cgi->a({-href => href(action=>"commit", hash=>$full_rev, file_name=>$file_name)},
+                                     esc_html($rev));
+               }
+               print "</td>\n";

                print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
                      esc_html($lineno) . "</a></td>\n";
                print "<td class=\"pre\">" . esc_html($data) . "</td>\n";
                print "<td class=\"linenr\"><a id=\"l$lineno\" href=\"#l$lineno\" class=\"linenr\">" .
                      esc_html($lineno) . "</a></td>\n";
                print "<td class=\"pre\">" . esc_html($data) . "</td>\n";


@@ -2652,7 +2737,7 @@ sub git_blob_plain {
        print $cgi->header(
                -type => "$type",
                -expires=>$expires,
        print $cgi->header(
                -type => "$type",
                -expires=>$expires,

-               -content_disposition => 'inline; filename="' . quotemeta($save_as) . '"');
+               -content_disposition => 'inline; filename="' . "$save_as" . '"');

        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;
        undef $/;
        binmode STDOUT, ':raw';
        print <$fd>;


@@ -2736,17 +2821,16 @@ sub git_blob {
 }
 
 sub git_tree {
 }
 
 sub git_tree {

-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
+       my $have_snapshot = gitweb_have_snapshot();

 
 

+       if (!defined $hash_base) {
+               $hash_base = "HEAD";
+       }

        if (!defined $hash) {
        if (!defined $hash) {

-               $hash = git_get_head_hash($project);

                if (defined $file_name) {
                if (defined $file_name) {

-                       my $base = $hash_base || $hash;
-                       $hash = git_get_hash_by_path($base, $file_name, "tree");
-               }
-               if (!defined $hash_base) {
-                       $hash_base = $hash;
+                       $hash = git_get_hash_by_path($hash_base, $file_name, "tree");
+               } else {
+                       $hash = $hash_base;

                }
        }
        $/ = "\0";
                }
        }
        $/ = "\0";


@@ -2813,7 +2897,6 @@ sub git_tree {
 }
 
 sub git_snapshot {
 }
 
 sub git_snapshot {

-

        my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
        my $have_snapshot = (defined $ctype && defined $suffix);
        if (!$have_snapshot) {
        my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
        my $have_snapshot = (defined $ctype && defined $suffix);
        if (!$have_snapshot) {


@@ -2829,12 +2912,15 @@ sub git_snapshot {
        print $cgi->header(
                -type => 'application/x-tar',
                -content_encoding => $ctype,
        print $cgi->header(
                -type => 'application/x-tar',
                -content_encoding => $ctype,

-               -content_disposition => 'inline; filename="' . quotemeta($filename) . '"',
+               -content_disposition => 'inline; filename="' . "$filename" . '"',

                -status => '200 OK');
 
                -status => '200 OK');
 

-       my $git_command = git_cmd_str();
-       open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or
-               die_error(undef, "Execute git-tar-tree failed.");
+       my $git = git_cmd_str();
+       my $name = $project;
+       $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.");

        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


@@ -2923,12 +3009,10 @@ sub git_commit {
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $co{'id'});
 
        my $refs = git_get_references();
        my $ref = format_ref_marker($refs, $co{'id'});
 

-       my ($ctype, $suffix, $command) = gitweb_check_feature('snapshot');
-       my $have_snapshot = (defined $ctype && defined $suffix);
+       my $have_snapshot = gitweb_have_snapshot();

 
        my @views_nav = ();
        if (defined $file_name && defined $co{'parent'}) {
 
        my @views_nav = ();
        if (defined $file_name && defined $co{'parent'}) {

-               my $parent = $co{'parent'};

                push @views_nav,
                        $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
                                "blame");
                push @views_nav,
                        $cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
                                "blame");


@@ -3140,7 +3224,7 @@ sub git_blobdiff {
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,

-                       -content_disposition => 'inline; filename="' . quotemeta($file_name) . '.patch"');
+                       -content_disposition => 'inline; filename="' . "$file_name" . '.patch"');

 
                print "X-Git-Url: " . $cgi->self_url() . "\n\n";
 
 
                print "X-Git-Url: " . $cgi->self_url() . "\n\n";
 


@@ -3243,7 +3327,7 @@ sub git_commitdiff {
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,
                        -type => 'text/plain',
                        -charset => 'utf-8',
                        -expires => $expires,

-                       -content_disposition => 'inline; filename="' . quotemeta($filename) . '"');
+                       -content_disposition => 'inline; filename="' . "$filename" . '"');

                my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                print <<TEXT;
 From: $co{'author'}
                my %ad = parse_date($co{'author_epoch'}, $co{'author_tz'});
                print <<TEXT;
 From: $co{'author'}