From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jakub Narebski <jnareb@gmail.com>,
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Subject: [PATCH 3/7] gitweb: separate heads and remotes lists
Date: Thu, 16 Sep 2010 11:31:01 +0200 [thread overview]
Message-ID: <1284629465-14798-4-git-send-email-giuseppe.bilotta@gmail.com> (raw)
In-Reply-To: <1284629465-14798-1-git-send-email-giuseppe.bilotta@gmail.com>
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>
---
gitweb/gitweb.perl | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 21e83bb..0118739 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -712,6 +712,7 @@ our %actions = (
"log" => \&git_log,
"patch" => \&git_patch,
"patches" => \&git_patches,
+ "remotes" => \&git_remotes,
"rss" => \&git_rss,
"atom" => \&git_atom,
"search" => \&git_search,
@@ -5112,6 +5113,7 @@ sub git_summary {
my %co = parse_commit("HEAD");
my %cd = %co ? parse_date($co{'committer_epoch'}, $co{'committer_tz'}) : ();
my $head = $co{'id'};
+ my $remote_heads = gitweb_check_feature('remote_heads');
my $owner = git_get_project_owner($project);
@@ -5119,7 +5121,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');
@@ -5197,6 +5200,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")}, "..."));
+ }
+
if (@forklist) {
git_print_header_div('forks');
git_project_list_body(\@forklist, 'age', 0, 15,
@@ -5504,13 +5514,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');
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();
+}
+
sub git_blob_plain {
my $type = shift;
my $expires;
--
1.7.3.rc1.230.g8b572
next prev parent reply other threads:[~2010-09-16 9:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 9:30 [PATCH 0/7] gitweb: allheads feature Giuseppe Bilotta
2010-09-16 9:30 ` [PATCH 1/7] gitweb: introduce remote_heads feature Giuseppe Bilotta
2010-09-16 21:41 ` Jakub Narebski
2010-09-17 15:39 ` Giuseppe Bilotta
2010-09-16 9:31 ` [PATCH 2/7] gitweb: git_get_heads_list accepts an optional list of refs Giuseppe Bilotta
2010-09-16 22:14 ` Jakub Narebski
2010-09-17 15:52 ` Giuseppe Bilotta
2010-09-16 9:31 ` Giuseppe Bilotta [this message]
2010-09-16 10:19 ` [PATCH 3/7] gitweb: separate heads and remotes lists Ævar Arnfjörð Bjarmason
2010-09-16 11:35 ` Giuseppe Bilotta
2010-09-16 22:30 ` Jakub Narebski
2010-09-16 22:54 ` Ævar Arnfjörð Bjarmason
2010-09-16 22:46 ` Jakub Narebski
2010-09-16 9:31 ` [PATCH 4/7] gitweb: link heads and remotes view Giuseppe Bilotta
2010-09-16 23:02 ` Jakub Narebski
2010-09-17 16:01 ` Giuseppe Bilotta
2010-09-16 9:31 ` [PATCH 5/7] gitweb: auxiliary functions to group data Giuseppe Bilotta
2010-09-16 10:26 ` Ævar Arnfjörð Bjarmason
2010-09-17 1:24 ` Jakub Narebski
2010-09-17 6:54 ` Giuseppe Bilotta
2010-09-17 16:06 ` Jakub Narebski
2010-09-17 16:41 ` Giuseppe Bilotta
2010-09-17 17:17 ` Jakub Narebski
2010-09-18 7:51 ` Giuseppe Bilotta
2010-09-16 9:31 ` [PATCH 6/7] gitweb: group styling Giuseppe Bilotta
2010-09-17 16:26 ` Jakub Narebski
2010-09-17 16:49 ` Giuseppe Bilotta
2010-09-17 17:22 ` Jakub Narebski
2010-09-16 9:31 ` [PATCH 7/7] gitweb: group remote heads Giuseppe Bilotta
2010-09-16 10:29 ` Ævar Arnfjörð Bjarmason
2010-09-16 11:36 ` Giuseppe Bilotta
2010-09-17 16:54 ` Jakub Narebski
2010-09-17 17:25 ` Jakub Narebski
2010-09-19 5:39 ` Giuseppe Bilotta
2010-09-19 23:02 ` Jakub Narebski
2010-09-20 8:15 ` Giuseppe Bilotta
2010-09-20 8:59 ` Jakub Narebski
2010-09-20 9:38 ` Giuseppe Bilotta
2010-09-22 8:34 ` Jakub Narebski
2010-09-22 9:34 ` Giuseppe Bilotta
2010-09-16 21:26 ` [PATCH 0/7] gitweb: allheads feature Jakub Narebski
2010-09-17 7:24 ` Giuseppe Bilotta
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=1284629465-14798-4-git-send-email-giuseppe.bilotta@gmail.com \
--to=giuseppe.bilotta@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).