From: Jakub Narebski <jnareb@gmail•com>
To: Giuseppe Bilotta <giuseppe.bilotta@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCHv5 03/12] gitweb: separate heads and remotes lists
Date: Sun, 26 Sep 2010 19:39:11 +0200 [thread overview]
Message-ID: <201009261939.12107.jnareb@gmail.com> (raw)
In-Reply-To: <1285344167-8518-4-git-send-email-giuseppe.bilotta@gmail.com>
On Fri, 24 Sep 2010, Giuseppe Bilotta wrote:
> We specialize the 'heads' action to only display local branches, and
> introduce a 'remotes' action to display the remote branches (only
> available when the remotes_head feature is enabled).
>
> Mirroring this, we also split the heads list in summary view into
> local and remote lists, each linking to the appropriate action.
>
> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail•com>
Nice (and still uncontroversial) solution. FWIW
Acked-by: Jakub Narebski <jnareb@gmail•com>
> @@ -5118,7 +5120,8 @@ sub git_summary {
> # These get_*_list functions return one more to allow us to see if
> # there are more ...
> my @taglist = git_get_tags_list(16);
> - my @headlist = git_get_heads_list(16);
> + my @headlist = git_get_heads_list(16, 'heads');
> + my @remotelist = $remote_heads ? git_get_heads_list(16, 'remotes') : ();
> my @forklist;
> my $check_forks = gitweb_check_feature('forks');
>
> @@ -5196,6 +5199,13 @@ sub git_summary {
> $cgi->a({-href => href(action=>"heads")}, "..."));
> }
>
> + if (@remotelist) {
> + git_print_header_div('remotes');
> + git_heads_body(\@remotelist, $head, 0, 15,
> + $#remotelist <= 15 ? undef :
> + $cgi->a({-href => href(action=>"remotes")}, "..."));
> + }
Nice thing. This meanst that "remotes" section is displayed *only* if
'remote_heads' feature is enabled and we actually have remote-tracking
branches.
> @@ -5503,13 +5513,29 @@ sub git_heads {
> git_print_page_nav('','', $head,undef,$head);
> git_print_header_div('summary', $project);
>
> - my @headslist = git_get_heads_list();
> + my @headslist = git_get_heads_list(undef, 'heads');
It's a pity that we can't simply write "git_get_heads_list('heads');",
but I think it would be serious overengineering for a tiny little gain.
> if (@headslist) {
> git_heads_body(\@headslist, $head);
> }
> git_footer_html();
> }
>
> +sub git_remotes {
> + gitweb_check_feature('remote_heads')
> + or die_error(403, "Remote heads view is disabled");
> +
> + my $head = git_get_head_hash($project);
> + git_header_html();
> + git_print_page_nav('','', $head,undef,$head);
> + git_print_header_div('summary', $project);
> +
> + my @remotelist = git_get_heads_list(undef, 'remotes');
> + if (@remotelist) {
> + git_heads_body(\@remotelist, $head);
> + }
> + git_footer_html();
> +}
Hmmmm... what we have there is a bit of code repetition with git_heads
and git_remotes, but I think is unevitable... besides you would be
extending git_remotes subroutine in subsequent patches. So it doesn't
matter, I think.
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2010-09-26 17:39 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 16:02 [PATCHv5 00/12] gitweb: remote_heads feature Giuseppe Bilotta
2010-09-24 16:02 ` [PATCHv5 01/12] gitweb: introduce " Giuseppe Bilotta
2010-09-26 17:24 ` Jakub Narebski
2010-09-26 19:19 ` Ævar Arnfjörð Bjarmason
2010-09-26 19:47 ` David Ripton
2010-09-27 6:42 ` Giuseppe Bilotta
2010-09-24 16:02 ` [PATCHv5 02/12] gitweb: git_get_heads_list accepts an optional list of refs Giuseppe Bilotta
2010-09-26 17:27 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 03/12] gitweb: separate heads and remotes lists Giuseppe Bilotta
2010-09-26 17:39 ` Jakub Narebski [this message]
2010-09-24 16:02 ` [PATCHv5 04/12] gitweb: nagivation menu for tags, heads and remotes Giuseppe Bilotta
2010-09-26 17:52 ` Jakub Narebski
2010-09-27 6:48 ` Giuseppe Bilotta
2010-09-27 8:30 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 05/12] gitweb: use fullname as hash_base in heads link Giuseppe Bilotta
2010-09-26 17:57 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 06/12] gitweb: allow extra text after action in page header Giuseppe Bilotta
2010-09-26 18:11 ` Jakub Narebski
2010-09-27 6:56 ` Giuseppe Bilotta
2010-09-27 7:42 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 07/12] gitweb: remotes view for a single remote Giuseppe Bilotta
2010-09-26 20:55 ` Jakub Narebski
2010-09-27 7:11 ` Giuseppe Bilotta
2010-09-27 7:53 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 08/12] gitweb: auxiliary function to group data Giuseppe Bilotta
2010-09-26 21:47 ` Jakub Narebski
2010-09-27 7:26 ` Giuseppe Bilotta
2010-09-27 8:12 ` Jakub Narebski
2010-09-27 19:17 ` Giuseppe Bilotta
2010-09-24 16:02 ` [PATCHv5 09/12] gitweb: group styling Giuseppe Bilotta
2010-09-26 22:10 ` Jakub Narebski
2010-09-27 7:27 ` Giuseppe Bilotta
2010-09-24 16:02 ` [PATCHv5 10/12] gitweb: git_repo_url() routine Giuseppe Bilotta
2010-09-26 22:34 ` Jakub Narebski
2010-09-27 7:29 ` Giuseppe Bilotta
2010-09-24 16:02 ` [PATCHv5 11/12] gitweb: use git_repo_url() in summary Giuseppe Bilotta
2010-09-26 22:36 ` Jakub Narebski
2010-09-24 16:02 ` [PATCHv5 12/12] gitweb: gather more remote data Giuseppe Bilotta
2010-09-27 15:47 ` Jakub Narebski
2010-10-23 16:17 ` Giuseppe Bilotta
2010-09-26 18:18 ` [PATCHv5 00/12] gitweb: remote_heads feature Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201009261939.12107.jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=giuseppe.bilotta@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox