about summary refs log tree commit homepage
path: root/lib/PublicInbox/AdminEdit.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-16 08:59:55 +0000
committerEric Wong <e@80x24.org>2019-10-16 09:00:26 +0000
commit3c39f9c942a6975245fda878e9b957d8d3367662 (patch)
tree10c2ea542787ff08dae59ddd3f13f129ed63dd76 /lib/PublicInbox/AdminEdit.pm
parent28264f7af4d9f4fab951f0613a0b08b6e98af7d3 (diff)
downloadpublic-inbox-3c39f9c942a6975245fda878e9b957d8d3367662.tar.gz
"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/
Diffstat (limited to 'lib/PublicInbox/AdminEdit.pm')
-rw-r--r--lib/PublicInbox/AdminEdit.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/PublicInbox/AdminEdit.pm b/lib/PublicInbox/AdminEdit.pm
index 2e2a8629..d4a92266 100644
--- a/lib/PublicInbox/AdminEdit.pm
+++ b/lib/PublicInbox/AdminEdit.pm
@@ -25,7 +25,7 @@ sub check_editable ($) {
                 # it's possible for a Xapian directory to exist,
                 # but Search::Xapian to go missing/broken.
                 # Make sure it's purged in that case:
-                $ibx->over or die "no over.sqlite3 in $ibx->{mainrepo}\n";
+                $ibx->over or die "no over.sqlite3 in $ibx->{inboxdir}\n";
 
                 # $ibx->{search} is populated by $ibx->over call
                 my $xdir_ro = $ibx->{search}->xdir(1);
@@ -51,7 +51,7 @@ sub check_editable ($) {
 # $rewrites = [ array commits keyed by epoch ]
 sub show_rewrites ($$$) {
         my ($fh, $ibx, $rewrites) = @_;
-        print $fh "$ibx->{mainrepo}:";
+        print $fh "$ibx->{inboxdir}:";
         if (scalar @$rewrites) {
                 my $epoch = -1;
                 my @out = map {;