init: favor --skip-epoch instead of --skip

Since I intend to add support for --skip-artnum, disambiguating
the long option name makes sense.  We'll support --skip
indefinitely for compatibility.

diff --git a/script/public-inbox-init b/script/public-inbox-init
index 98aea4bf29a8dc80eb18f67f4d166f511881a6c5..39f2a067a20e21446e7561fe5240c3280253f762 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -20,10 +20,11 @@ sub x { system(@_) and die join(' ', @_). " failed: $?\n" }
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 my $version = undef;
 my $indexlevel = undef;
-my $skip;
-my %opts = ( 'V|version=i' => \$version,
-            'L|indexlevel=s' => \$indexlevel,
-            'S|skip=i' => \$skip,
+my $skip_epoch;
+my %opts = (
+       'V|version=i' => \$version,
+       'L|indexlevel=s' => \$indexlevel,
+       'S|skip|skip-epoch=i' => \$skip_epoch,
 );
 GetOptions(%opts) or usage();
 PublicInbox::Admin::indexlevel_ok_or_die($indexlevel) if defined $indexlevel;
@@ -104,8 +105,8 @@ if (-f "$mainrepo/inbox.lock") {
 
 $version = 1 unless defined $version;
 
-if ($version == 1 && defined $skip) {
-       die "--skip is only supported for -V2 repos\n";
+if ($version == 1 && defined $skip_epoch) {
+       die "--skip-epoch is only supported for -V2 repos\n";
 }
 
 my $ibx = PublicInbox::Inbox->new({
@@ -117,7 +118,7 @@ my $ibx = PublicInbox::Inbox->new({
 });
 
 my $creat_opt = {};
-PublicInbox::InboxWritable->new($ibx, $creat_opt)->init_inbox(0, $skip);
+PublicInbox::InboxWritable->new($ibx, $creat_opt)->init_inbox(0, $skip_epoch);
 
 # needed for git prior to v2.1.0
 umask(0077) if defined $perm;

diff --git a/t/init.t b/t/init.t
index e2dd306dfad292271f8c6f50fec410a8d5db57b7..667b09fee902caaa8098afee342627a19ca1704d 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -86,15 +86,15 @@ SKIP: {
        for (1..2) {
                @cmd = (pi_init, '-V2', '-S1', 'skip1', "$tmpdir/skip1",
                           qw(http://example.com/skip1 skip1@example.com));
-               is(system(@cmd), 0, "--skip 1");
+               is(system(@cmd), 0, "--skip-epoch 1");
                my $gits = [ glob("$tmpdir/skip1/git/*.git") ];
                is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK');
        }
 
 
-       @cmd = (pi_init, '-V2', '--skip=2', 'skip2', "$tmpdir/skip2",
+       @cmd = (pi_init, '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2",
                   qw(http://example.com/skip2 skip2@example.com));
-       is(system(@cmd), 0, "--skip 2");
+       is(system(@cmd), 0, "--skip-epoch 2");
        my $gits = [ glob("$tmpdir/skip2/git/*.git") ];
        is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too');
 }