unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/5] config: remove {-cgitrc_unparsed} field
Date: Sat,  8 Oct 2022 08:24:44 +0000	[thread overview]
Message-ID: <20221008082448.9856-2-e@80x24.org> (raw)
In-Reply-To: <20221008082448.9856-1-e@80x24.org>

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'));

  reply	other threads:[~2022-10-08  8:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-08  8:24 [PATCH 0/5] www: some coderepo stuff Eric Wong
2022-10-08  8:24 ` Eric Wong [this message]
2022-10-08  8:24 ` [PATCH 2/5] www_coderepo: wire up snapshots from summary Eric Wong
2022-10-08  8:24 ` [PATCH 3/5] www_coderepo: update blurb on the goal/purpose of this Eric Wong
2022-10-08  8:24 ` [PATCH 4/5] www: cgit: fix fallback to WwwCoderepo on array responses Eric Wong
2022-10-08  8:24 ` [PATCH 5/5] www_coderepo: allow searching one extindex|inbox Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221008082448.9856-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).