[PATCH] gitweb: Show '...' links in "summary" view only if there are more items
- From
- Robert Fitzsimons <robfitz@273k.net>
- Date
- Dec 19, 2006, 12:08 UTC
- Message-ID
- <20061219120854.GA16429@localhost>
- In-Reply-To
- <200612191214.58474.jnareb@gmail.com>
Show "..." links in "summary" view to shortlog, heads (if there are any), and tags (if there are any) only if there are more items to show than shown already.
This means that "..." link is shown below shortened shortlog if there are more than 16 commits, "..." link below shortened heads list if there are more than 16 heads refs (16 branches), "..." link below shortened tags list if there are more than 16 tags.
Modified patch from Jakub to to apply cleanly to master, also preform the same "..." link logic to the forks list.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Robert Fitzsimons <robfitz@273k.net> ---
> By the way, I have _NOT_ applied Robert Fitzsimons patch, but they > (this patch and Robert patch) should be not in conflict if we remove > last chunk of Robert's patch (this changing --count=17 to --count=15 > in git_summary).
Just removing the last chunk isn't correct, there are two slightly different changes in that chuck. The reduction in the max-count value and a removal of a call to git_get_head_hash.
Here is an updated version of the patch which should apply against master.
Robert
gitweb/gitweb.perl | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 3bee34c..8d409c7 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2918,8 +2918,9 @@ sub git_summary { my $owner = git_get_project_owner($project); my $refs = git_get_references(); - my @taglist = git_get_tags_list(15); - my @headlist = git_get_heads_list(15); + # we need to request one more than 16 (0..15) to check if those 16 are all + my @taglist = git_get_tags_list(16); + my @headlist = git_get_heads_list(16); my @forklist; my ($check_forks) = gitweb_check_feature('forks'); @@ -2955,30 +2956,35 @@ sub git_summary { } } - open my $fd, "-|", git_cmd(), "rev-list", "--max-count=16", + # we need to request one more than 16 (0..15) to check if those 16 are all + open my $fd, "-|", git_cmd(), "rev-list", "--max-count=17", $head, "--" or die_error(undef, "Open git-rev-list failed"); my @revlist = map { chomp; $_ } <$fd>; close $fd; git_print_header_div('shortlog'); git_shortlog_body(\@revlist, 0, 15, $refs, + $#revlist <= 15 ? undef : $cgi->a({-href => href(action=>"shortlog")}, "...")); if (@taglist) { git_print_header_div('tags'); git_tags_body(\@taglist, 0, 15, + $#taglist <= 15 ? undef : $cgi->a({-href => href(action=>"tags")}, "...")); } if (@headlist) { git_print_header_div('heads'); git_heads_body(\@headlist, $head, 0, 15, + $#headlist <= 15 ? undef : $cgi->a({-href => href(action=>"heads")}, "...")); } if (@forklist) { git_print_header_div('forks'); git_project_list_body(\@forklist, undef, 0, 15, + $#forklist <= 15 ? undef : $cgi->a({-href => href(action=>"forks")}, "..."), 'noheader'); }