about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/InboxWritable.pm4
-rw-r--r--lib/PublicInbox/Xapcmd.pm2
-rwxr-xr-xscript/public-inbox-edit4
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index c73910ac..d8391251 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -257,4 +257,8 @@ sub umask_prepare {
         $self->{umask} = $umask;
 }
 
+sub cleanup ($) {
+        delete @{$_[0]}{qw(over mm git search)};
+}
+
 1;
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index c807bf10..77f0524e 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -234,7 +234,7 @@ sub run {
                         $im->lock_release;
                 }
 
-                delete($ibx->{$_}) for (qw(mm over search)); # cleanup
+                $ibx->cleanup;
                 process_queue(\@q, $cb, $max, $opt);
                 $im->lock_acquire if !$opt->{-coarse_lock};
                 commit_changes($ibx, $im, $tmp, $opt);
diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index b437b3c0..1900b267 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -57,7 +57,7 @@ sub find_mid ($$$) {
                         my $tuple = [ $ibx, $smsg ];
                         push @{$found->{$cid} ||= []}, $tuple
                 }
-                delete @$ibx{qw(over mm git search)}; # cleanup
+                PublicInbox::InboxWritable::cleanup($ibx);
         }
         $found;
 }
@@ -131,7 +131,7 @@ foreach my $to_edit (values %$found) {
         my $edit_fn = $edit_fh->filename;
         my ($ibx, $smsg) = @{$to_edit->[0]};
         my $old_raw = $ibx->msg_by_smsg($smsg);
-        delete @$ibx{qw(over mm git search)}; # cleanup
+        PublicInbox::InboxWritable::cleanup($ibx);
 
         my $tmp = $$old_raw;
         if (!$opt->{raw}) {