global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 10:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge early parts of branch 'jc/blame'

Browse Source 
Conflicts:

	gitweb/gitweb.perl
This commit is contained in:
Junio C Hamano
2006-10-05 15:10:15 -07:00
parent 866f3fc014 eb93b72406
commit ff3fb059fc
7 changed files with 137 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gitweb/gitweb.css
View File

@@ -173,6 +173,12 @@ table.blame {
border-collapse: collapse;
}
table.blame td {
padding: 0px 5px;
font-size: 12px;
vertical-align: top;
}
th {
padding: 2px 5px;
font-size: 12px;

21
gitweb/gitweb.perl
View File

@@ -59,6 +59,9 @@ our $logo = "++GITWEB_LOGO++";
# URI of GIT favicon, assumed to be image/png type
our $favicon = "++GITWEB_FAVICON++";
our $githelp_url = "http://git.or.cz/";
our $githelp_label = "git homepage";
# source of projects list
our $projects_list = "++GITWEB_LIST++";
@@ -1435,7 +1438,9 @@ EOF
}
print "<div class=\"page_header\">\n" .
"<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
"<a href=\"" . esc_html($githelp_url) .
"\" title=\"" . esc_html($githelp_label) .
"\">" .
"<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
"</a>\n";
print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
@@ -2915,9 +2920,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
@@ -3014,11 +3022,6 @@ sub git_commit {
$cgi->a({-href => href(action=>"blame", hash_parent=>$parent, file_name=>$file_name)},
"blame");
}
if (defined $co{'parent'}) {
push @views_nav,
$cgi->a({-href => href(action=>"shortlog", hash=>$hash)}, "shortlog"),
$cgi->a({-href => href(action=>"log", hash=>$hash)}, "log");
}
git_header_html(undef, $expires);
git_print_page_nav('commit', defined $co{'parent'} ? '' : 'commitdiff',
$hash, $co{'tree'}, $hash,