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

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 5688f76be3634029cf96379f8a3b50d2b6c51b402c0a5d3f484c98a617563d69..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";
  
+# 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++";
+# 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
@@ -116,6 +124,10 @@ sub gitweb_check_feature {
                 $feature{$name}{'override'},
                 @{$feature{$name}{'default'}});
         if (!$override) { return @defaults; }
+       if (!defined $sub) {
+               warn "feature $name is not overrideable";
+               return @defaults;
+       }
         return $sub->(@defaults);
  }
  
@@ -1386,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>
-<link rel="stylesheet" type="text/css" href="$stylesheet"/>
  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",
@@ -1405,8 +1426,15 @@ EOF
         }
  
         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";
@@ -1457,8 +1485,15 @@ sub git_footer_html {
                 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>";
  }
  
@@ -2510,11 +2545,9 @@ sub git_blame2 {
  <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 $lineno = $2;
-               my $data = $3;
                 my $print_c8 = 0;
  
                 if (!defined $last_rev) {
@@ -2526,7 +2559,11 @@ HTML
                         $print_c8 = 1;
                 }
                 print "<tr class=\"$rev_color[$current_color]\">\n";
-               print "<td class=\"sha1\">";
+               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));
@@ -2878,9 +2915,12 @@ sub git_snapshot {
                 -content_disposition => 'inline; filename="' . "$filename" . '"',
                 -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