* [PATCH 1/5] config: remove {-cgitrc_unparsed} field
@ 2022-10-08 8:24 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-10-08 8:24 UTC (permalink / raw)
To: meta
This field has been unneeded since commit 6890430df808
(cgit: fix fallout from lazy coderepo loading, 2021-03-18)
---
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/WwwCoderepo.pm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 42bd9438..5cdf182e 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -46,7 +46,6 @@ sub new {
$self->{-no_obfuscate} = {};
$self->{-limiters} = {};
$self->{-code_repos} = {}; # nick => PublicInbox::Git object
- $self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'};
if (my $no = delete $self->{'publicinbox.noobfuscate'}) {
$no = _array($no);
@@ -277,6 +276,7 @@ sub scan_projects_coderepo ($$$) {
sub parse_cgitrc {
my ($self, $cgitrc, $nesting) = @_;
+ $cgitrc //= $self->{'publicinbox.cgitrc'};
if ($nesting == 0) {
# defaults:
my %s = map { $_ => 1 } qw(/cgit.css /cgit.png
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 6c119b28..d491bba2 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -23,9 +23,9 @@ sub prepare_coderepos {
my $pi_cfg = $self->{pi_cfg};
# TODO: support gitweb and other repository viewers?
- if (defined(my $cgitrc = $pi_cfg->{-cgitrc_unparsed})) {
- $pi_cfg->parse_cgitrc($cgitrc, 0);
- }
+ defined($pi_cfg->{'publicinbox.cgitrc'}) and
+ $pi_cfg->parse_cgitrc(undef, 0);
+
my $code_repos = $pi_cfg->{-code_repos};
for my $k (grep(/\Acoderepo\.(?:.+)\.dir\z/, keys %$pi_cfg)) {
$k = substr($k, length('coderepo.'), -length('.dir'));
^ permalink raw reply related [relevance 6%]
* [PATCH] cgit: fix fallout from lazy coderepo loading
@ 2021-03-18 23:27 7% Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-18 23:27 UTC (permalink / raw)
To: meta
We can't completely instantiate our cgit wrapper without knowing
knowing cgit locations for serving static content.
Fixes: a5968dc059f655a ("config: lazy-load coderepos, support extindex")
---
lib/PublicInbox/Cgit.pm | 8 ++++++--
lib/PublicInbox/Config.pm | 4 ----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index f38e8b6b..8ad07be2 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -53,14 +53,18 @@ sub locate_cgit ($) {
sub new {
my ($class, $pi_cfg) = @_;
my ($cgit_bin, $cgit_data) = locate_cgit($pi_cfg);
-
+ # TODO: support gitweb and other repository viewers?
+ if (defined(my $cgitrc = $pi_cfg->{-cgitrc_unparsed})) {
+ $pi_cfg->parse_cgitrc($cgitrc, 0);
+ }
my $self = bless {
cmd => [ $cgit_bin ],
cgit_data => $cgit_data,
pi_cfg => $pi_cfg,
}, $class;
- $pi_cfg->fill_all; # fill in -code_repos mapped to inboxes
+ # 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};
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 1037c884..228de4ff 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -323,10 +323,6 @@ sub _fill_code_repo {
my ($self, $nick) = @_;
my $pfx = "coderepo.$nick";
- # TODO: support gitweb and other repository viewers?
- if (defined(my $cgitrc = delete $self->{-cgitrc_unparsed})) {
- parse_cgitrc($self, $cgitrc, 0);
- }
my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR"
unless (defined $dir) {
warn "$pfx.dir unset\n";
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-03-18 23:27 7% [PATCH] cgit: fix fallout from lazy coderepo loading Eric Wong
2022-10-08 8:24 [PATCH 0/5] www: some coderepo stuff Eric Wong
2022-10-08 8:24 6% ` [PATCH 1/5] config: remove {-cgitrc_unparsed} field 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).