diff options
author | Robert Fitzsimons <robfitz@273k.net> | 2006-12-24 14:31:45 +0000 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-25 10:40:43 -0800 |
commit | 719dad28c599dc2e2917c3cb0e44152fd92bf133 (patch) | |
tree | e92e7cb4cf57cec679c1613e3aaa7081f4bb0732 | |
parent | 190d7fdcf325bb444fa806f09ebbb403a4ae4ee6 (diff) | |
download | git-719dad28c599dc2e2917c3cb0e44152fd92bf133.tar.gz git-719dad28c599dc2e2917c3cb0e44152fd92bf133.tar.xz |
gitweb: Change log action to use parse_commits.
Also add missing next link to bottom of page.
Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-x | gitweb/gitweb.perl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 5f1ace98a..42b744925 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3645,28 +3645,25 @@ sub git_log { } my $refs = git_get_references(); - my $limit = sprintf("--max-count=%i", (100 * ($page+1))); - open my $fd, "-|", git_cmd(), "rev-list", $limit, $hash, "--" - or die_error(undef, "Open git-rev-list failed"); - my @revlist = map { chomp; $_ } <$fd>; - close $fd; + my @commitlist = parse_commits($hash, 101, (100 * $page)); - my $paging_nav = format_paging_nav('log', $hash, $head, $page, $#revlist); + my $paging_nav = format_paging_nav('log', $hash, $head, $page, (100 * ($page+1))); git_header_html(); git_print_page_nav('log','', $hash,undef,undef, $paging_nav); - if (!@revlist) { + if (!@commitlist) { my %co = parse_commit($hash); git_print_header_div('summary', $project); print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n"; } - for (my $i = ($page * 100); $i <= $#revlist; $i++) { - my $commit = $revlist[$i]; - my $ref = format_ref_marker($refs, $commit); - my %co = parse_commit($commit); + my $to = ($#commitlist >= 99) ? (99) : ($#commitlist); + for (my $i = 0; $i <= $to; $i++) { + my %co = %{$commitlist[$i]}; next if !%co; + my $commit = $co{'id'}; + my $ref = format_ref_marker($refs, $commit); my %ad = parse_date($co{'author_epoch'}); git_print_header_div('commit', "<span class=\"age\">$co{'age_string'}</span>" . @@ -3688,6 +3685,12 @@ sub git_log { git_print_log($co{'comment'}, -final_empty_line=> 1); print "</div>\n"; } + if ($#commitlist >= 100) { + print "<div class=\"page_nav\">\n"; + print $cgi->a({-href => href(action=>"log", hash=>$hash, page=>$page+1), + -accesskey => "n", -title => "Alt-n"}, "next"); + print "</div>\n"; + } git_footer_html(); } |