treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / AdminEdit.pm

diff --git a/lib/PublicInbox/AdminEdit.pm b/lib/PublicInbox/AdminEdit.pm
index b27c831b3ee30363795be25525dd5387d7e9fa85..25abfd8e7683c1d9df52d42e9bb0dc20c3c7badd 100644 (file)
--- a/lib/PublicInbox/AdminEdit.pm
+++ b/lib/PublicInbox/AdminEdit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # common stuff between -edit, -purge (and maybe -learn in the future)
@@ -25,19 +25,19 @@ 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);
-               my $npart = 0;
-               foreach my $part (<$xdir_ro/*>) {
-                       if (-d $part && $part =~ m!/[0-9]+\z!) {
+               my $nshard = 0;
+               foreach my $shard (<$xdir_ro/*>) {
+                       if (-d $shard && $shard =~ m!/[0-9]+\z!) {
                                my $bytes = 0;
-                               $bytes += -s $_ foreach glob("$part/*");
-                               $npart++ if $bytes;
+                               $bytes += -s $_ foreach glob("$shard/*");
+                               $nshard++ if $bytes;
                        }
                }
-               if ($npart) {
+               if ($nshard) {
                        PublicInbox::Admin::require_or_die('-search');
                } else {
                        # somebody could "rm -r" all the Xapian directories;
@@ -47,4 +47,21 @@ sub check_editable ($) {
        }
 }
 
+# takes the output of V2Writable::purge and V2Writable::replace
+# $rewrites = [ array commits keyed by epoch ]
+sub show_rewrites ($$$) {
+       my ($fh, $ibx, $rewrites) = @_;
+       print $fh "$ibx->{inboxdir}:";
+       if (scalar @$rewrites) {
+               my $epoch = -1;
+               my @out = map {;
+                       ++$epoch;
+                       "$epoch.git: ".(defined($_) ? $_ : '(unchanged)')
+               } @$rewrites;
+               print $fh join("\n\t", '', @out), "\n";
+       } else {
+               print $fh " NONE\n";
+       }
+}
+
 1;