gitweb: Change parse_commits signature to allow for multiple options

Change order of parameters in parse_commits() to have $filename
before @args (extra options), to allow for multiple extra options,
for example both '--grep=<pattern>' and '--fixed-strings'.

Change all callers to follow new calling convention.

Originally by Petr Baudis, in http://repo.or.cz/git/gitweb.git:

    b98f0a7c gitweb: Clearly distinguish regexp / exact match searches

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jakub Narebski 2008-02-26 13:22:06 +01:00 коммит произвёл Junio C Hamano
Родитель dc1c0fffd3
Коммит 311e552e76
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -2079,7 +2079,7 @@ sub parse_commit {
} }
sub parse_commits { sub parse_commits {
my ($commit_id, $maxcount, $skip, $arg, $filename) = @_; my ($commit_id, $maxcount, $skip, $filename, @args) = @_;
my @cos; my @cos;
$maxcount ||= 1; $maxcount ||= 1;
@ -2089,7 +2089,7 @@ sub parse_commits {
open my $fd, "-|", git_cmd(), "rev-list", open my $fd, "-|", git_cmd(), "rev-list",
"--header", "--header",
($arg ? ($arg) : ()), @args,
("--max-count=" . $maxcount), ("--max-count=" . $maxcount),
("--skip=" . $skip), ("--skip=" . $skip),
@extra_options, @extra_options,
@ -5172,7 +5172,7 @@ sub git_history {
$ftype = git_get_type($hash); $ftype = git_get_type($hash);
} }
my @commitlist = parse_commits($hash_base, 101, (100 * $page), "--full-history", $file_name); my @commitlist = parse_commits($hash_base, 101, (100 * $page), $file_name, "--full-history");
my $paging_nav = ''; my $paging_nav = '';
if ($page > 0) { if ($page > 0) {
@ -5255,7 +5255,7 @@ sub git_search {
$greptype = "--committer="; $greptype = "--committer=";
} }
$greptype .= $search_regexp; $greptype .= $search_regexp;
my @commitlist = parse_commits($hash, 101, (100 * $page), $greptype); my @commitlist = parse_commits($hash, 101, (100 * $page), undef, $greptype);
my $paging_nav = ''; my $paging_nav = '';
if ($page > 0) { if ($page > 0) {
@ -5507,7 +5507,7 @@ sub git_feed {
# log/feed of current (HEAD) branch, log of given branch, history of file/directory # log/feed of current (HEAD) branch, log of given branch, history of file/directory
my $head = $hash || 'HEAD'; my $head = $hash || 'HEAD';
my @commitlist = parse_commits($head, 150, 0, undef, $file_name); my @commitlist = parse_commits($head, 150, 0, $file_name);
my %latest_commit; my %latest_commit;
my %latest_date; my %latest_date;