about summary refs log tree commit homepage
path: root/script/public-inbox-index
diff options
context:
space:
mode:
authorEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-04-04 21:24:59 +0000
committerEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-04-04 21:54:44 +0000
commit678fb3c2ba03a4a284620c039717c0d94dd6106a (patch)
tree29b213f82977aa3ccf83d0fc80d8b126b583fb45 /script/public-inbox-index
parentb4d127cb83230fe5cee0dcecb573107ad96a7c4c (diff)
downloadpublic-inbox-678fb3c2ba03a4a284620c039717c0d94dd6106a.tar.gz
This is important for people running mirrors via "git fetch",
as they need to be kept up-to-date.  Purging is also now
supported in mirrors.

The short-lived "--regenerate" option is gone and is now
implicitly enabled as a result.  It's still cheap when
article number regeneration is unnecessary, as we track
the range for each git repository.
Diffstat (limited to 'script/public-inbox-index')
-rwxr-xr-xscript/public-inbox-index15
1 files changed, 3 insertions, 12 deletions
diff --git a/script/public-inbox-index b/script/public-inbox-index
index 52d6ba70..73f88ac6 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -23,12 +23,12 @@ if ($@) {
 }
 
 my $reindex;
-my $regen;
+my $prune;
 my $jobs = undef;
 my %opts = (
         '--reindex' => \$reindex,
-        '--regenerate' => \$regen,
         '--jobs|j=i' => \$jobs,
+        '--prune' => \$prune,
 );
 GetOptions(%opts) or die "bad command-line args\n$usage";
 die "--jobs must be positive\n" if defined $jobs && $jobs <= 0;
@@ -115,16 +115,7 @@ sub index_dir {
                                 }
                         }
                 }
-                my $mm = $repo->mm;
-                my (undef, $max) = $mm->minmax if $mm;
-                if (defined($max) && !$reindex && !$regen) {
-                        die
-"v2 inboxes may only use --reindex and/or --regenerate once\n".
-"msgmap.sqlite3 is initialized\n";
-                }
-
-                $v2w->reindex($regen);
-                $v2w->done;
+                $v2w->index_sync({ reindex => $reindex, prune => $prune });
         } else {
                 my $s = PublicInbox::SearchIdx->new($repo, 1);
                 $s->index_sync({ reindex => $reindex });