* [PATCH 3/3] www: respect coderepo.*.url during cgit init
2021-10-23 20:19 6% [PATCH 0/3] www: coderepo-related cleanups + fixes Eric Wong
@ 2021-10-23 20:19 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-10-23 20:19 UTC (permalink / raw)
To: meta
This is necessary for showing "found $OID in $CODEREPO_URL"
in solver-generated pages ($INBOX_URL/$OID/s/).
---
lib/PublicInbox/Cgit.pm | 5 +----
lib/PublicInbox/Config.pm | 7 +++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index 8ad07be2..cc729aa2 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -63,15 +63,12 @@ sub new {
pi_cfg => $pi_cfg,
}, $class;
- # fill in -code_repos mapped to inboxes
- $pi_cfg->each_inbox($pi_cfg->can('repo_objs'));
-
# some cgit repos may not be mapped to inboxes, so ensure those exist:
my $code_repos = $pi_cfg->{-code_repos};
foreach my $k (keys %$pi_cfg) {
$k =~ /\Acoderepo\.(.+)\.dir\z/ or next;
my $dir = $pi_cfg->{$k};
- $code_repos->{$1} ||= PublicInbox::Git->new($dir);
+ $code_repos->{$1} ||= $pi_cfg->fill_code_repo($1);
}
while (my ($nick, $repo) = each %$code_repos) {
$self->{"\0$nick"} = $repo;
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index f2e5d5f0..41117ac5 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -323,9 +323,8 @@ sub parse_cgitrc {
cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
}
-# parse a code repo
-# Only git is supported at the moment, but SVN and Hg are possibilities
-sub _fill_code_repo {
+# parse a code repo, only git is supported at the moment
+sub fill_code_repo {
my ($self, $nick) = @_;
my $pfx = "coderepo.$nick";
my $dir = $self->{"$pfx.dir"} // do { # aka "GIT_DIR"
@@ -392,7 +391,7 @@ sub repo_objs {
next;
}
my $repo = $code_repos->{$nick} //=
- _fill_code_repo($self, $nick);
+ fill_code_repo($self, $nick);
push @repo_objs, $repo if $repo;
}
if (scalar @repo_objs) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] www: coderepo-related cleanups + fixes
@ 2021-10-23 20:19 6% Eric Wong
2021-10-23 20:19 7% ` [PATCH 3/3] www: respect coderepo.*.url during cgit init Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-10-23 20:19 UTC (permalink / raw)
To: meta
Eric Wong (3):
git: simplify local_nick, avoid "foo.git.git"
config: remove *_url_format support for cgit
www: respect coderepo.*.url during cgit init
lib/PublicInbox/Cgit.pm | 5 +----
lib/PublicInbox/Config.pm | 27 +++++----------------------
lib/PublicInbox/Git.pm | 9 ++-------
t/git.t | 8 +++++++-
4 files changed, 15 insertions(+), 34 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-10-23 20:19 6% [PATCH 0/3] www: coderepo-related cleanups + fixes Eric Wong
2021-10-23 20:19 7% ` [PATCH 3/3] www: respect coderepo.*.url during cgit init Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).