143 lines
5.1 KiB
Diff
143 lines
5.1 KiB
Diff
From 8f8bfb38271775770cd1da8fb7cfd1e2d7ef2481 Mon Sep 17 00:00:00 2001
|
|
From: Jakub Narebski <jnareb@gmail.com>
|
|
Date: Wed, 5 Mar 2008 09:31:55 +0100
|
|
Subject: [PATCH 1/2] gitweb: Fix and simplify pickaxe search
|
|
|
|
Instead of using "git-rev-list | git-diff-tree" pipeline for pickaxe
|
|
search, use git-log with appropriate options. Besides reducing number
|
|
of forks by one, this allows to use list form of open, which in turn
|
|
allow to not worry about quoting arguments and to avoid forking shell.
|
|
|
|
The options to git-log were chosen to reduce required changes in
|
|
pickaxe git command output parsing; gitweb still parses returned
|
|
commits one by one.
|
|
|
|
Parsing "pickaxe" output is simplified: git_search now reuses
|
|
parse_difftree_raw_line and writes affected files as they arrive using
|
|
the fact that commit name goes always before [raw] diff.
|
|
|
|
While at it long bug of pickaxe search was fixed, namely that the last
|
|
commit found by pickaxe search was never shown.
|
|
|
|
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
|
|
Note: This patch was backported to 1.5.4.7 by Todd Zullinger
|
|
<tmz@pobox.com>. Any blame for problems should come to me, not the
|
|
upstream authors. :)
|
|
---
|
|
gitweb/gitweb.perl | 83 ++++++++++++++++++++++++++-------------------------
|
|
1 files changed, 42 insertions(+), 41 deletions(-)
|
|
|
|
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
|
|
index 86a6ced..e011393 100755
|
|
--- a/gitweb/gitweb.perl
|
|
+++ b/gitweb/gitweb.perl
|
|
@@ -5199,50 +5199,18 @@ sub git_search {
|
|
print "<table class=\"pickaxe search\">\n";
|
|
my $alternate = 1;
|
|
$/ = "\n";
|
|
- my $git_command = git_cmd_str();
|
|
- my $searchqtext = $searchtext;
|
|
- $searchqtext =~ s/'/'\\''/;
|
|
- open my $fd, "-|", "$git_command rev-list $hash | " .
|
|
- "$git_command diff-tree -r --stdin -S\'$searchqtext\'";
|
|
+ open my $fd, '-|', git_cmd(), '--no-pager', 'log', @diff_opts,
|
|
+ '--pretty=format:%H', '--no-abbrev', '--raw', "-S$searchtext";
|
|
undef %co;
|
|
my @files;
|
|
while (my $line = <$fd>) {
|
|
- if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)\t(.*)$/) {
|
|
- my %set;
|
|
- $set{'file'} = $6;
|
|
- $set{'from_id'} = $3;
|
|
- $set{'to_id'} = $4;
|
|
- $set{'id'} = $set{'to_id'};
|
|
- if ($set{'id'} =~ m/0{40}/) {
|
|
- $set{'id'} = $set{'from_id'};
|
|
- }
|
|
- if ($set{'id'} =~ m/0{40}/) {
|
|
- next;
|
|
- }
|
|
- push @files, \%set;
|
|
- } elsif ($line =~ m/^([0-9a-fA-F]{40})$/){
|
|
+ chomp $line;
|
|
+ next unless $line;
|
|
+
|
|
+ my %set = parse_difftree_raw_line($line);
|
|
+ if (defined $set{'commit'}) {
|
|
+ # finish previous commit
|
|
if (%co) {
|
|
- if ($alternate) {
|
|
- print "<tr class=\"dark\">\n";
|
|
- } else {
|
|
- print "<tr class=\"light\">\n";
|
|
- }
|
|
- $alternate ^= 1;
|
|
- my $author = chop_and_escape_str($co{'author_name'}, 15, 5);
|
|
- print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
|
|
- "<td><i>" . $author . "</i></td>\n" .
|
|
- "<td>" .
|
|
- $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
|
|
- -class => "list subject"},
|
|
- chop_and_escape_str($co{'title'}, 50) . "<br/>");
|
|
- while (my $setref = shift @files) {
|
|
- my %set = %$setref;
|
|
- print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
|
|
- hash=>$set{'id'}, file_name=>$set{'file'}),
|
|
- -class => "list"},
|
|
- "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
|
|
- "<br/>\n";
|
|
- }
|
|
print "</td>\n" .
|
|
"<td class=\"link\">" .
|
|
$cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
|
|
@@ -5251,11 +5219,44 @@ sub git_search {
|
|
print "</td>\n" .
|
|
"</tr>\n";
|
|
}
|
|
- %co = parse_commit($1);
|
|
+
|
|
+ if ($alternate) {
|
|
+ print "<tr class=\"dark\">\n";
|
|
+ } else {
|
|
+ print "<tr class=\"light\">\n";
|
|
+ }
|
|
+ $alternate ^= 1;
|
|
+ %co = parse_commit($set{'commit'});
|
|
+ my $author = chop_and_escape_str($co{'author_name'}, 15, 5);
|
|
+ print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
|
|
+ "<td><i>$author</i></td>\n" .
|
|
+ "<td>" .
|
|
+ $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}),
|
|
+ -class => "list subject"},
|
|
+ chop_and_escape_str($co{'title'}, 50) . "<br/>");
|
|
+ } elsif (defined $set{'to_id'}) {
|
|
+ next if ($set{'to_id'} =~ m/^0{40}$/);
|
|
+
|
|
+ print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
|
|
+ hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
|
|
+ -class => "list"},
|
|
+ "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
|
|
+ "<br/>\n";
|
|
}
|
|
}
|
|
close $fd;
|
|
|
|
+ # finish last commit (warning: repetition!)
|
|
+ if (%co) {
|
|
+ print "</td>\n" .
|
|
+ "<td class=\"link\">" .
|
|
+ $cgi->a({-href => href(action=>"commit", hash=>$co{'id'})}, "commit") .
|
|
+ " | " .
|
|
+ $cgi->a({-href => href(action=>"tree", hash=>$co{'tree'}, hash_base=>$co{'id'})}, "tree");
|
|
+ print "</td>\n" .
|
|
+ "</tr>\n";
|
|
+ }
|
|
+
|
|
print "</table>\n";
|
|
}
|
|
|
|
--
|
|
1.6.1
|
|
|