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 branch 'jc/web' into next

Browse Source 
* jc/web:
  gitweb: use for-each-ref to show the latest activity across branches
This commit is contained in:
Junio C Hamano
2006-10-15 03:29:32 -07:00
parent d7e8cf40c7 63e02a1be3
commit b01b52f089
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gitweb/gitweb.perl
View File

@@ -1076,6 +1076,24 @@ sub parse_tag {
return %tag
}
sub git_get_last_activity {
my ($path) = @_;
my $fd;
$git_dir = "$projectroot/$path";
open($fd, "-|", git_cmd(), 'for-each-ref',
'--format=%(refname) %(committer)',
'--sort=-committerdate',
'refs/heads') or return;
my $most_recent = <$fd>;
close $fd or return;
if ($most_recent =~ / (\d+) [-+][01]\d\d\d$/) {
my $timestamp = $1;
my $age = time - $timestamp;
return ($age, age_string($age));
}
}
sub parse_commit {
my $commit_id = shift;
my $commit_text = shift;
@@ -2331,16 +2349,11 @@ sub git_project_list {
die_error(undef, "No projects found");
}
foreach my $pr (@list) {
my $head = git_get_head_hash($pr->{'path'});
if (!defined $head) {
my (@aa) = git_get_last_activity($pr->{'path'});
unless (@aa) {
next;
}
$git_dir = "$projectroot/$pr->{'path'}";
my %co = parse_commit($head);
if (!%co) {
next;
}
$pr->{'commit'} = \%co;
($pr->{'age'}, $pr->{'age_string'}) = @aa;
if (!defined $pr->{'descr'}) {
my $descr = git_get_project_description($pr->{'path'}) || "";
$pr->{'descr'} = chop_str($descr, 25, 5);
@@ -2390,7 +2403,7 @@ sub git_project_list {
"</th>\n";
}
if ($order eq "age") {
@projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects;
@projects = sort {$a->{'age'} <=> $b->{'age'}} @projects;
print "<th>Last Change</th>\n";
} else {
print "<th>" .
@@ -2412,8 +2425,8 @@ sub git_project_list {
-class => "list"}, esc_html($pr->{'path'})) . "</td>\n" .
"<td>" . esc_html($pr->{'descr'}) . "</td>\n" .
"<td><i>" . chop_str($pr->{'owner'}, 15) . "</i></td>\n";
print "<td class=\"". age_class($pr->{'commit'}{'age'}) . "\">" .
$pr->{'commit'}{'age_string'} . "</td>\n" .
print "<td class=\"". age_class($pr->{'age'}) . "\">" .
$pr->{'age_string'} . "</td>\n" .
"<td class=\"link\">" .
$cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary")}, "summary") . " | " .
$cgi->a({-href => href(project=>$pr->{'path'}, action=>"shortlog")}, "shortlog") . " | " .