config: support "inboxdir" in addition to "mainrepo"

"mainrepo" ws a bad name and artifact from the early days when I
intended for there to be a "spamrepo" (now just the
ENV{PI_EMERGENCY} Maildir).  With v2, "mainrepo" can be
especially confusing, since v2 needs at least two git
repositories (epoch + all.git) to function and we shouldn't
confuse users by having them point to a git repository for v2.

Much of our documentation already references "INBOX_DIR" for
command-line arguments, so use "inboxdir" as the
git-config(1)-friendly variant for that.

"mainrepo" remains supported indefinitely for compatibility.
Users may need to revert to old versions, or may be referring
to old documentation and must not be forced to change config
files to account for this change.

So if you're using "mainrepo" today, I do NOT recommend changing
it right away because other bugs can lurk.

Link: https://public-inbox.org/meta/874l0ice8v.fsf@alyssa.is/

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 627bcba9..6a88f62a 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -76,7 +76,7 @@ sub new {
         # $creat may be any true value, or 0/undef.  A hashref is true,
         # and $creat->{nproc} may be set to an integer
         my ($class, $v2ibx, $creat) = @_;
-        my $dir = $v2ibx->{mainrepo} or die "no mainrepo in inbox\n";
+        my $dir = $v2ibx->{inboxdir} or die "no inboxdir in inbox\n";
         unless (-d $dir) {
                 if ($creat) {
                         require File::Path;
@@ -304,7 +304,7 @@ sub idx_init {
                 # Now that all subprocesses are up, we can open the FDs
                 # for SQLite:
                 my $mm = $self->{mm} = PublicInbox::Msgmap->new_file(
-                        "$self->{-inbox}->{mainrepo}/msgmap.sqlite3", 1);
+                        "$self->{-inbox}->{inboxdir}/msgmap.sqlite3", 1);
                 $mm->{dbh}->begin_work;
         });
 }
@@ -315,7 +315,7 @@ sub idx_init {
 sub _replace_oids ($$$) {
         my ($self, $mime, $replace_map) = @_;
         $self->done;
-        my $pfx = "$self->{-inbox}->{mainrepo}/git";
+        my $pfx = "$self->{-inbox}->{inboxdir}/git";
         my $rewrites = []; # epoch => commit
         my $max = $self->{epoch_max};
 
@@ -663,8 +663,8 @@ sub done {
 sub fill_alternates ($$) {
         my ($self, $epoch) = @_;
 
-        my $pfx = "$self->{-inbox}->{mainrepo}/git";
-        my $all = "$self->{-inbox}->{mainrepo}/all.git";
+        my $pfx = "$self->{-inbox}->{inboxdir}/git";
+        my $all = "$self->{-inbox}->{inboxdir}/all.git";
 
         unless (-d $all) {
                 PublicInbox::Import::init_bare($all);
@@ -690,7 +690,7 @@ sub fill_alternates ($$) {
 
 sub git_init {
         my ($self, $epoch) = @_;
-        my $git_dir = "$self->{-inbox}->{mainrepo}/git/$epoch.git";
+        my $git_dir = "$self->{-inbox}->{inboxdir}/git/$epoch.git";
         my @cmd = (qw(git init --bare -q), $git_dir);
         PublicInbox::Import::run_die(\@cmd);
         @cmd = (qw/git config/, "--file=$git_dir/config",
@@ -703,7 +703,7 @@ sub git_init {
 sub git_dir_latest {
         my ($self, $max) = @_;
         $$max = -1;
-        my $pfx = "$self->{-inbox}->{mainrepo}/git";
+        my $pfx = "$self->{-inbox}->{inboxdir}/git";
         return unless -d $pfx;
         my $latest;
         opendir my $dh, $pfx or die "opendir $pfx: $!\n";
@@ -935,7 +935,7 @@ sub update_last_commit ($$$$) {
         last_epoch_commit($self, $i, $cmt);
 }
 
-sub git_dir_n ($$) { "$_[0]->{-inbox}->{mainrepo}/git/$_[1].git" }
+sub git_dir_n ($$) { "$_[0]->{-inbox}->{inboxdir}/git/$_[1].git" }
 
 sub last_commits ($$) {
         my ($self, $epoch_max) = @_;