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: [PATCHv7 02/11] gitweb: introduce remote_heads feature
Date: Thu, 11 Nov 2010 13:26:09 +0100 [thread overview]
Message-ID: <1289478378-15604-3-git-send-email-giuseppe.bilotta@gmail.com> (raw)
In-Reply-To: <1289478378-15604-1-git-send-email-giuseppe.bilotta@gmail.com>
With this feature enabled, remote heads are retrieved (and displayed)
when getting (and displaying) the heads list. Typical usage would be for
local repository browsing, e.g. by using git-instaweb (or even a more
permanent gitweb setup), to check the repository status and the relation
between tracking branches and the originating remotes.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
---
gitweb/gitweb.perl | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 77693ab..e1787c2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -493,6 +493,18 @@ our %feature = (
'sub' => sub { feature_bool('highlight', @_) },
'override' => 0,
'default' => [0]},
+
+ # Enable displaying of remote heads in the heads list
+
+ # To enable system wide have in $GITWEB_CONFIG
+ # $feature{'remote_heads'}{'default'} = [1];
+ # To have project specific config enable override in $GITWEB_CONFIG
+ # $feature{'remote_heads'}{'override'} = 1;
+ # and in project config gitweb.remote_heads = 0|1;
+ 'remote_heads' => {
+ 'sub' => sub { feature_bool('remote_heads', @_) },
+ 'override' => 0,
+ 'default' => [0]},
);
sub gitweb_get_feature {
@@ -3160,10 +3172,12 @@ sub git_get_heads_list {
my $limit = shift;
my @headslist;
+ my $remote_heads = gitweb_check_feature('remote_heads');
+
open my $fd, '-|', git_cmd(), 'for-each-ref',
($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
'--format=%(objectname) %(refname) %(subject)%00%(committer)',
- 'refs/heads'
+ 'refs/heads', ($remote_heads ? 'refs/remotes' : ())
or return;
while (my $line = <$fd>) {
my %ref_item;
@@ -3174,7 +3188,7 @@ sub git_get_heads_list {
my ($committer, $epoch, $tz) =
($committerinfo =~ /^(.*) ([0-9]+) (.*)$/);
$ref_item{'fullname'} = $name;
- $name =~ s!^refs/heads/!!;
+ $name =~ s!^refs/(?:head|remote)s/!!;
$ref_item{'name'} = $name;
$ref_item{'id'} = $hash;
--
1.7.3.68.g6ec8
next prev parent reply other threads:[~2010-11-11 12:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-11 12:26 [PATCHv7 00/11] gitweb: remote_heads feature Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 01/11] gitweb: use fullname as hash_base in heads link Giuseppe Bilotta
2010-11-11 12:26 ` Giuseppe Bilotta [this message]
2010-11-11 12:26 ` [PATCHv7 03/11] gitweb: git_get_heads_list accepts an optional list of refs Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 04/11] gitweb: separate heads and remotes lists Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 05/11] gitweb: nagivation menu for tags, heads and remotes Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 06/11] gitweb: allow action specialization in page header Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 07/11] gitweb: remotes view for a single remote Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 08/11] gitweb: refactor repository URL printing Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 09/11] gitweb: provide a routine to display (sub)sections Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 10/11] gitweb: group remote heads by remote Giuseppe Bilotta
2010-11-11 19:25 ` Jakub Narebski
2010-11-12 8:13 ` [PATCHv7bis " Giuseppe Bilotta
2010-11-11 12:26 ` [PATCHv7 11/11] git instaweb: enable remote_heads Giuseppe Bilotta
2010-11-11 19:29 ` [PATCHv7 00/11] gitweb: remote_heads feature Jakub Narebski
2010-11-12 8:05 ` 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=1289478378-15604-3-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).