Skip to content

Commit

Permalink
gitweb: Change parse_commits signature to allow for multiple options
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Narebski authored and Junio C Hamano committed Feb 27, 2008
1 parent dc1c0ff commit 311e552
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,7 @@ sub parse_commit {
}

sub parse_commits {
my ($commit_id, $maxcount, $skip, $arg, $filename) = @_;
my ($commit_id, $maxcount, $skip, $filename, @args) = @_;
my @cos;

$maxcount ||= 1;
Expand All @@ -2089,7 +2089,7 @@ sub parse_commits {

open my $fd, "-|", git_cmd(), "rev-list",
"--header",
($arg ? ($arg) : ()),
@args,
("--max-count=" . $maxcount),
("--skip=" . $skip),
@extra_options,
Expand Down Expand Up @@ -5172,7 +5172,7 @@ sub git_history {
$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 = '';
if ($page > 0) {
Expand Down Expand Up @@ -5255,7 +5255,7 @@ sub git_search {
$greptype = "--committer=";
}
$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 = '';
if ($page > 0) {
Expand Down Expand Up @@ -5507,7 +5507,7 @@ sub git_feed {

# log/feed of current (HEAD) branch, log of given branch, history of file/directory
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_date;
Expand Down

0 comments on commit 311e552

Please sign in to comment.