From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Cc: Jakub Narebski <jnareb@gmail•com>
Subject: [PATCH 5/7] gitweb: Use parse_rev_list in git_shortlog and git_history
Date: Wed, 6 Sep 2006 15:08:09 +0200 [thread overview]
Message-ID: <11575480921279-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <11575480922634-git-send-email-jnareb@gmail.com>
Use parse_rev_list in git_shortlog and git_history, and modify
git_shortlog_body and git_history_body to accept parse_rev_list
output; in the future we can remove support for older unparsed
revision list from git_shortlog_body and git_history_body.
Other places when we can use parse_rev_list are git_log and git_rss.
Signed-off-by: Jakub Narebski <jnareb@gmail•com>
---
gitweb/gitweb.perl | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 8aeca52..e665d94 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1946,7 +1946,7 @@ sub git_shortlog_body {
my $commit = $revlist->[$i];
#my $ref = defined $refs ? format_ref_marker($refs, $commit) : '';
my $ref = format_ref_marker($refs, $commit);
- my %co = parse_commit($commit);
+ my %co = ref $commit ? %$commit : parse_commit($commit);
if ($alternate) {
print "<tr class=\"dark\">\n";
} else {
@@ -1987,12 +1987,13 @@ sub git_history_body {
print "<table class=\"history\" cellspacing=\"0\">\n";
my $alternate = 0;
for (my $i = $from; $i <= $to; $i++) {
- if ($revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
+ if (ref($revlist->[$i]) ne "HASH" &&
+ $revlist->[$i] !~ m/^([0-9a-fA-F]{40})/) {
next;
}
my $commit = $1;
- my %co = parse_commit($commit);
+ my %co = ref $commit ? %$commit : parse_commit($commit);
if (!%co) {
next;
}
@@ -3179,12 +3180,9 @@ sub git_history {
$ftype = git_get_type($hash);
}
- open my $fd, "-|",
- git_cmd(), "rev-list", $limit, @hist_opts, $hash_base, "--", $file_name
- or die_error(undef, "Open git-rev-list-failed");
- my @revlist = map { chomp; $_ } <$fd>;
- close $fd
- or die_error(undef, "Reading git-rev-list failed");
+ my @revlist = parse_rev_list($limit, @hist_opts, $hash_base, "--", $file_name)
+ or die_error(undef, "Parsing git-rev-list failed");
+
my $paging_nav = '';
if ($page > 0) {
@@ -3387,10 +3385,9 @@ sub git_shortlog {
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 @revlist = parse_rev_list($limit, $hash)
+ or die_error(undef, "Parsing git-rev-list failed");
+
my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page, $#revlist);
my $next_link = '';
--
1.4.2
next prev parent reply other threads:[~2006-09-06 13:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-06 13:04 [PATCH 0/7] gitweb: Trying to improve history view speed Jakub Narebski
2006-09-06 13:08 ` [PATCH 1/7] gitweb: Make pickaxe search a feature Jakub Narebski
2006-09-06 13:08 ` [PATCH 2/7] gitweb: Paginate history output Jakub Narebski
2006-09-06 13:08 ` [PATCH 3/7] gitweb: Use @hist_opts as git-rev-list parameters in git_history Jakub Narebski
2006-09-06 13:08 ` [PATCH 4/7] gitweb: Add parse_rev_list for later use Jakub Narebski
2006-09-06 13:08 ` Jakub Narebski [this message]
2006-09-06 13:08 ` [PATCH 6/7] gitweb: Assume parsed revision list in git_shortlog_body and git_history_body Jakub Narebski
2006-09-06 13:08 ` [PATCH 7/7] gitweb: Set page to 0 if it is not defined, in git_history Jakub Narebski
2006-09-06 20:56 ` [PATCH 8/8] gitweb: Remove --parents from call to git-rev-list in parse_rev_list Jakub Narebski
2006-09-06 21:08 ` Linus Torvalds
2006-09-06 21:18 ` Jakub Narebski
2006-09-06 21:51 ` Junio C Hamano
2006-09-06 21:53 ` Jakub Narebski
2006-09-07 8:39 ` Jakub Narebski
2006-09-07 0:37 ` [PATCH 1/7] gitweb: Make pickaxe search a feature Junio C Hamano
2006-09-07 8:34 ` Jakub Narebski
2006-09-07 9:02 ` Junio C Hamano
2006-09-07 9:07 ` Jakub Narebski
2006-09-06 15:57 ` [PATCH 0/7] gitweb: Trying to improve history view speed Linus Torvalds
2006-09-06 17:06 ` Jakub Narebski
2006-09-06 18:30 ` Linus Torvalds
2006-09-06 18:48 ` Jakub Narebski
2006-09-06 19:04 ` Linus Torvalds
2006-09-06 22:01 ` Junio C Hamano
2006-09-09 8:42 ` Jakub Narebski
2006-09-09 9:10 ` Junio C Hamano
2006-09-09 9:24 ` Jakub Narebski
2006-09-09 9:54 ` Junio C Hamano
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=11575480921279-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/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