microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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:
Robert Fitzsimons 2006-12-24 14:31:46 +00:00 коммит произвёл Junio C Hamano
Родитель 719dad28c5
Коммит 5ad66088d1
1 изменённых файлов: 9 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
gitweb/gitweb.perl
Просмотреть файл

@ -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 .= " &sdot; prev"; $paging_nav .= " &sdot; prev";
} }
if ($#revlist >= (100 * ($page+1)-1)) { if ($#commitlist >= 100) {
$paging_nav .= " &sdot; " . $paging_nav .= " &sdot; " .
$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 .= " &sdot; next"; $paging_nav .= " &sdot; 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') {