kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

show tags in lists 

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
maint
Kay Sievers 19 years ago
parent
94140c7ab0
commit
6a928415e2
1 changed files with 45 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      gitweb.cgi

59
gitweb.cgi
Unescape View File

@ -311,6 +311,10 @@ a.rss_logo {
text-align:center; text-decoration:none; text-align:center; text-decoration:none;
} }
a.rss_logo:hover { background-color:#ee5500; } a.rss_logo:hover { background-color:#ee5500; }
span.tag {
padding:0px 4px; font-size:10px;
background-color:#ffffaa; border:1px solid; border-color:#ffffcc #ffee00 #ffee00 #ffffcc;
}
</style> </style>
</head> </head>
<body> <body>
@ -901,6 +905,20 @@ sub git_project_list {
git_footer_html(); git_footer_html();
} }


sub read_info_ref {
my %refs;
# 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11
# c39ae07f393806ccf406ef966e9a15afc43cc36a refs/tags/v2.6.11^{}
open my $fd, "$projectroot/$project/info/refs" or return;
while (my $line = <$fd>) {
if ($line =~ m/^([0-9a-fA-F]{40})\t.*\/([^\^]+)/) {
$refs{$1} = $2;
}
}
close $fd or return;
return \%refs;
}

sub git_read_refs { sub git_read_refs {
my $ref_dir = shift; my $ref_dir = shift;
my @reflist; my @reflist;
@ -989,6 +1007,7 @@ sub git_summary {
$owner = get_file_owner("$projectroot/$project"); $owner = get_file_owner("$projectroot/$project");
} }


my $refs = read_info_ref();
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n" . print "<div class=\"page_nav\">\n" .
"summary". "summary".
@ -1034,6 +1053,9 @@ sub git_summary {
print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
"<b>" . esc_html($co{'title'}) . "</b>"); "<b>" . esc_html($co{'title'}) . "</b>");
} }
if (defined $refs->{$commit}) {
print " <span class=\"tag\">$refs->{$commit}</span>";
}
print "</td>\n" . print "</td>\n" .
"<td class=\"link\">" . "<td class=\"link\">" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
@ -1556,6 +1578,7 @@ sub git_log {
if (!defined $page) { if (!defined $page) {
$page = 0; $page = 0;
} }
my $refs = read_info_ref();
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n"; print "<div class=\"page_nav\">\n";
print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") . print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@ -1598,13 +1621,17 @@ sub git_log {
} }
for (my $i = ($page * 100); $i <= $#revlist; $i++) { for (my $i = ($page * 100); $i <= $#revlist; $i++) {
my $commit = $revlist[$i]; my $commit = $revlist[$i];
my $ref = "";
if (defined $refs->{$commit}) {
$ref = " <span class=\"tag\">$refs->{$commit}</span>";
}
my %co = git_read_commit($commit); my %co = git_read_commit($commit);
next if !%co; next if !%co;
my %ad = date_str($co{'author_epoch'}); my %ad = date_str($co{'author_epoch'});
print "<div>\n" . print "<div>\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "title"}, $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "title"},
"<span class=\"age\">$co{'age_string'}</span>" . esc_html($co{'title'})) . "\n" . "<span class=\"age\">$co{'age_string'}</span>" . esc_html($co{'title'}) . $ref) . "\n";
"</div>\n"; print "</div>\n";
print "<div class=\"title_text\">\n" . print "<div class=\"title_text\">\n" .
"<div class=\"log_link\">\n" . "<div class=\"log_link\">\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
@ -1981,23 +2008,18 @@ sub git_commitdiff_plain {


# try to figure out the next tag after this commit # try to figure out the next tag after this commit
my $tagname; my $tagname;
my %taghash; my $refs = read_info_ref();
my $tags = git_read_refs("refs/tags");
foreach my $entry (@$tags) {
my %tag = %$entry;
$taghash{$tag{'refid'}} = $tag{'name'};
}
open $fd, "-|", "$gitbin/git-rev-list HEAD"; open $fd, "-|", "$gitbin/git-rev-list HEAD";
while (my $commit = <$fd>) { chomp (my (@commits) = <$fd>);
chomp $commit; close $fd;
if ($taghash{$commit}) { foreach my $commit (@commits) {
$tagname = $taghash{$commit}; if (defined $refs->{$commit}) {
$tagname = $refs->{$commit}
} }
if ($commit eq $hash) { if ($commit eq $hash) {
last; last;
} }
} }
close $fd;


print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\""); print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\"");
my %co = git_read_commit($hash); my %co = git_read_commit($hash);
@ -2041,6 +2063,7 @@ sub git_history {
if (!%co) { if (!%co) {
die_error(undef, "Unknown commit object."); die_error(undef, "Unknown commit object.");
} }
my $refs = read_info_ref();
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n" . print "<div class=\"page_nav\">\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@ -2070,6 +2093,10 @@ sub git_history {
if (!%co) { if (!%co) {
next; next;
} }
my $ref = "";
if (defined $refs->{$commit}) {
$ref = " <span class=\"tag\">$refs->{$commit}</span>";
}
if ($alternate) { if ($alternate) {
print "<tr class=\"dark\">\n"; print "<tr class=\"dark\">\n";
} else { } else {
@ -2079,7 +2106,7 @@ sub git_history {
print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" . print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
"<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" . "<td><i>" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "</i></td>\n" .
"<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, "<b>" . "<td>" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, "<b>" .
esc_html(chop_str($co{'title'}, 50)) . "</b>") . "</td>\n" . esc_html(chop_str($co{'title'}, 50)) . "</b>") . "$ref</td>\n" .
"<td class=\"link\">" . "<td class=\"link\">" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") . " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$commit")}, "commitdiff") .
@ -2254,6 +2281,7 @@ sub git_shortlog {
if (!defined $page) { if (!defined $page) {
$page = 0; $page = 0;
} }
my $refs = read_info_ref();
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n" . print "<div class=\"page_nav\">\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@ -2312,6 +2340,9 @@ sub git_shortlog {
print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"}, print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"), -class => "list"},
"<b>" . esc_html($co{'title_short'}) . "</b>"); "<b>" . esc_html($co{'title_short'}) . "</b>");
} }
if (defined $refs->{$commit}) {
print " <span class=\"tag\">$refs->{$commit}</span>";
}
print "</td>\n" . print "</td>\n" .
"<td class=\"link\">" . "<td class=\"link\">" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") .

Write Preview
Loading…
Cancel
Save