Editing and purging are similar operations involving history
rewrites, so there'll be common options and code between them.
examples/varnish-4.vcl
lib/PublicInbox/Address.pm
lib/PublicInbox/Admin.pm
examples/varnish-4.vcl
lib/PublicInbox/Address.pm
lib/PublicInbox/Admin.pm
+lib/PublicInbox/AdminEdit.pm
lib/PublicInbox/AltId.pm
lib/PublicInbox/Cgit.pm
lib/PublicInbox/Config.pm
lib/PublicInbox/AltId.pm
lib/PublicInbox/Cgit.pm
lib/PublicInbox/Config.pm
--- /dev/null
+# Copyright (C) 2019 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)
+package PublicInbox::AdminEdit;
+use strict;
+use warnings;
+use PublicInbox::Admin;
+our @OPT = qw(all force|f verbose|v!);
+
+1;
use strict;
use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
use strict;
use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::Admin qw(resolve_repo_dir);
+use PublicInbox::AdminEdit;
PublicInbox::Admin::check_require('-index');
require PublicInbox::Filter::Base;
require PublicInbox::Config;
PublicInbox::Admin::check_require('-index');
require PublicInbox::Filter::Base;
require PublicInbox::Config;
my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
my $config = eval { PublicInbox::Config->new };
my $cfgfile = PublicInbox::Config::default_file();
my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
my $config = eval { PublicInbox::Config->new };
my $cfgfile = PublicInbox::Config::default_file();
-my ($all, $force);
-my $verbose = 1;
-my %opts = (
- 'all' => \$all,
- 'force|f' => \$force,
- 'verbose|v!' => \$verbose,
-);
-GetOptions(%opts) or die "bad command-line args\n", $usage, "\n";
+my $opt = { verbose => 1 };
+GetOptions($opt, @PublicInbox::AdminEdit::OPT) or
+ die "bad command-line args\n$usage\n";
# TODO: clean this up and share code with -index via ::Admin
my %dir2ibx; # ( path => Inbox object )
my @inboxes;
$config and $config->each_inbox(sub {
my ($ibx) = @_;
# TODO: clean this up and share code with -index via ::Admin
my %dir2ibx; # ( path => Inbox object )
my @inboxes;
$config and $config->each_inbox(sub {
my ($ibx) = @_;
- push @inboxes, $ibx if $all && $ibx->{version} != 1;
+ push @inboxes, $ibx if $opt->{all} && $ibx->{version} != 1;
$dir2ibx{$ibx->{mainrepo}} = $ibx;
});
$dir2ibx{$ibx->{mainrepo}} = $ibx;
});
$config or die "--all specified, but $cfgfile not readable\n";
@ARGV and die "--all specified, but directories specified\n";
} else {
$config or die "--all specified, but $cfgfile not readable\n";
@ARGV and die "--all specified, but directories specified\n";
} else {
foreach my $dir (@dirs) {
my $v;
foreach my $dir (@dirs) {
my $v;
- my $dir = resolve_repo_dir($dir, \$v);
+ my $dir = PublicInbox::Admin::resolve_repo_dir($dir, \$v);
if ($v == 1) {
push @err, $dir;
next;
if ($v == 1) {
push @err, $dir;
next;
- if ($verbose) { # should we consider this machine-parseable?
+ if ($opt->{verbose}) { # should we consider this machine-parseable?
print "$ibx->{mainrepo}:";
if (scalar @$commits) {
print join("\n\t", '', @$commits), "\n";
print "$ibx->{mainrepo}:";
if (scalar @$commits) {
print join("\n\t", '', @$commits), "\n";
-exit(0) if ($force || $n_purged);
+exit(0) if ($opt->{force} || $n_purged);
-warn "Not found\n" if $verbose;
+warn "Not found\n" if $opt->{verbose};