diff options
author | Eric Wong <e@80x24.org> | 2019-03-08 01:21:22 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-04-04 09:13:58 +0000 |
commit | 5af881d954a4ab14e08dd806dd4de1e9f26bfd12 (patch) | |
tree | 12e5a0286b841065671a7b3cd0fcfd4db80625fe /lib/PublicInbox/SolverGit.pm | |
parent | 721368cd04bfbd03c0d9173fff633ae34f16409a (diff) | |
download | public-inbox-5af881d954a4ab14e08dd806dd4de1e9f26bfd12.tar.gz |
We can save admins the trouble of declaring [coderepo "..."] sections in the public-inbox config by parsing the cgitrc directly. Macro expansion (e.g. $HTTP_HOST) expansion is not supported, yet; but may be in the future.
Diffstat (limited to 'lib/PublicInbox/SolverGit.pm')
-rw-r--r-- | lib/PublicInbox/SolverGit.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index cd0f94a1..3841c567 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -85,7 +85,8 @@ sub solve_existing ($$) { # push @ambiguous, [ $git, @oids ]; dbg($self, "`$oid_b' ambiguous in " . - join("\n\t", $git->pub_urls) . "\n" . + join("\n\t", $git->pub_urls($self->{psgi_env})) + . "\n" . join('', map { "$_ blob\n" } @oids)); } scalar(@ambiguous) ? \@ambiguous : undef; @@ -483,7 +484,7 @@ sub resolve_patch ($$) { if (my $existing = solve_existing($self, $want)) { my ($found_git, undef, $type, undef) = @$existing; dbg($self, "found $cur_want in " . - join("\n", $found_git->pub_urls)); + join("\n", $found_git->pub_urls($self->{psgi_env}))); if ($cur_want eq $self->{oid_want} || $type ne 'blob') { eval { delete($self->{user_cb})->($existing) }; |