From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 60DC31FA17 for ; Wed, 16 Dec 2020 23:19:07 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/5] inboxwritable: drop git_dir_n sub Date: Wed, 16 Dec 2020 23:19:05 +0000 Message-Id: <20201216231906.6356-5-e@80x24.org> In-Reply-To: <20201216231906.6356-1-e@80x24.org> References: <20201216231906.6356-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 };