From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] inboxwritable: drop git_dir_n sub
Date: Wed, 16 Dec 2020 23:19:05 +0000 [thread overview]
Message-ID: <20201216231906.6356-5-e@80x24.org> (raw)
In-Reply-To: <20201216231906.6356-1-e@80x24.org>
There's only one caller, unlikely to be any more, and
should be harmless to open code.
---
lib/PublicInbox/InboxWritable.pm | 3 ---
lib/PublicInbox/V2Writable.pm | 3 ++-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 48d2267f..c0e88f3d 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -300,9 +300,6 @@ sub warn_ignore_cb {
}
}
-# v2+ only
-sub git_dir_n { "$_[0]->{inboxdir}/git/$_[1].git" }
-
# v2+ only, XXX: maybe we can just rely on ->max_git_epoch and remove
sub git_dir_latest {
my ($self, $max) = @_;
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 7b8b5abf..3e3b275f 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1091,8 +1091,9 @@ sub sync_prepare ($$) {
if ($sync->{max_size} = $sync->{-opt}->{max_size}) {
$sync->{index_oid} = $self->can('index_oid');
}
+ my $git_pfx = "$sync->{ibx}->{inboxdir}/git";
for (my $i = $sync->{epoch_max}; $i >= 0; $i--) {
- my $git_dir = $sync->{ibx}->git_dir_n($i);
+ my $git_dir = "$git_pfx/$i.git";
-d $git_dir or next; # missing epochs are fine
my $git = PublicInbox::Git->new($git_dir);
my $unit = { git => $git, epoch => $i };
next prev parent reply other threads:[~2020-12-16 23:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 23:19 [PATCH 0/5] various indexing cleanups and quieting Eric Wong
2020-12-16 23:19 ` [PATCH 1/5] inboxwritable: warn_ignore: "Bad UTF7 data escape" Eric Wong
2020-12-16 23:19 ` [PATCH 2/5] index: ignore some warnings, set {current_info} for v1 Eric Wong
2020-12-16 23:19 ` [PATCH 3/5] inbox: simplify v2 epoch counting Eric Wong
2020-12-16 23:19 ` Eric Wong [this message]
2020-12-16 23:19 ` [PATCH 5/5] extsearchidx: no need to make InboxWritable 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=20201216231906.6356-5-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.
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).