mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
gitweb: Change header search action to use parse_commits.
Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
719dad28c5
commit
5ad66088d1
1 changed files with 9 additions and 14 deletions
|
@ -2910,18 +2910,18 @@ sub git_heads_body {
|
||||||
}
|
}
|
||||||
|
|
||||||
sub git_search_grep_body {
|
sub git_search_grep_body {
|
||||||
my ($greplist, $from, $to, $extra) = @_;
|
my ($commitlist, $from, $to, $extra) = @_;
|
||||||
$from = 0 unless defined $from;
|
$from = 0 unless defined $from;
|
||||||
$to = $#{$greplist} if (!defined $to || $#{$greplist} < $to);
|
$to = $#{$commitlist} if (!defined $to || $#{$commitlist} < $to);
|
||||||
|
|
||||||
print "<table class=\"grep\" cellspacing=\"0\">\n";
|
print "<table class=\"grep\" cellspacing=\"0\">\n";
|
||||||
my $alternate = 1;
|
my $alternate = 1;
|
||||||
for (my $i = $from; $i <= $to; $i++) {
|
for (my $i = $from; $i <= $to; $i++) {
|
||||||
my $commit = $greplist->[$i];
|
my %co = %{$commitlist->[$i]};
|
||||||
my %co = parse_commit($commit);
|
|
||||||
if (!%co) {
|
if (!%co) {
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
my $commit = $co{'id'};
|
||||||
if ($alternate) {
|
if ($alternate) {
|
||||||
print "<tr class=\"dark\">\n";
|
print "<tr class=\"dark\">\n";
|
||||||
} else {
|
} else {
|
||||||
|
@ -4307,13 +4307,8 @@ sub git_search {
|
||||||
} elsif ($searchtype eq 'committer') {
|
} elsif ($searchtype eq 'committer') {
|
||||||
$greptype = "--committer=";
|
$greptype = "--committer=";
|
||||||
}
|
}
|
||||||
open my $fd, "-|", git_cmd(), "rev-list",
|
$greptype .= $searchtext;
|
||||||
("--max-count=" . (100 * ($page+1))),
|
my @commitlist = parse_commits($hash, 101, (100 * $page), $greptype);
|
||||||
($greptype . $searchtext),
|
|
||||||
$hash, "--"
|
|
||||||
or next;
|
|
||||||
my @revlist = map { chomp; $_ } <$fd>;
|
|
||||||
close $fd;
|
|
||||||
|
|
||||||
my $paging_nav = '';
|
my $paging_nav = '';
|
||||||
if ($page > 0) {
|
if ($page > 0) {
|
||||||
|
@ -4330,7 +4325,7 @@ sub git_search {
|
||||||
$paging_nav .= "first";
|
$paging_nav .= "first";
|
||||||
$paging_nav .= " ⋅ prev";
|
$paging_nav .= " ⋅ prev";
|
||||||
}
|
}
|
||||||
if ($#revlist >= (100 * ($page+1)-1)) {
|
if ($#commitlist >= 100) {
|
||||||
$paging_nav .= " ⋅ " .
|
$paging_nav .= " ⋅ " .
|
||||||
$cgi->a({-href => href(action=>"search", hash=>$hash,
|
$cgi->a({-href => href(action=>"search", hash=>$hash,
|
||||||
searchtext=>$searchtext, searchtype=>$searchtype,
|
searchtext=>$searchtext, searchtype=>$searchtype,
|
||||||
|
@ -4340,7 +4335,7 @@ sub git_search {
|
||||||
$paging_nav .= " ⋅ next";
|
$paging_nav .= " ⋅ next";
|
||||||
}
|
}
|
||||||
my $next_link = '';
|
my $next_link = '';
|
||||||
if ($#revlist >= (100 * ($page+1)-1)) {
|
if ($#commitlist >= 100) {
|
||||||
$next_link =
|
$next_link =
|
||||||
$cgi->a({-href => href(action=>"search", hash=>$hash,
|
$cgi->a({-href => href(action=>"search", hash=>$hash,
|
||||||
searchtext=>$searchtext, searchtype=>$searchtype,
|
searchtext=>$searchtext, searchtype=>$searchtype,
|
||||||
|
@ -4350,7 +4345,7 @@ sub git_search {
|
||||||
|
|
||||||
git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
|
git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
|
||||||
git_print_header_div('commit', esc_html($co{'title'}), $hash);
|
git_print_header_div('commit', esc_html($co{'title'}), $hash);
|
||||||
git_search_grep_body(\@revlist, ($page * 100), $#revlist, $next_link);
|
git_search_grep_body(\@commitlist, 0, 99, $next_link);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($searchtype eq 'pickaxe') {
|
if ($searchtype eq 'pickaxe') {
|
||||||
|
|
Loading…
Reference in a new issue