drop needless `eval {}' around Config->new

[public-inbox.git] / script / public-inbox-convert

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 8ac111a26cd98add4a0baa59b6b81ae94105b399..4c220b364bf30417c0fd745b663887b3adcc7f4a 100755 (executable)
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -1,11 +1,12 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <http://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 use PublicInbox::InboxWritable;
 use PublicInbox::Config;
+use PublicInbox::Admin;
 use PublicInbox::V2Writable;
 use PublicInbox::Git;
 use PublicInbox::Spawn qw(spawn);
@@ -19,11 +20,11 @@ my %opts = (
        '--index!' => \$index,
 );
 GetOptions(%opts) or die "bad command-line args\n$usage";
-my $old_dir = shift or die $usage;
-my $new_dir = shift or die $usage;
+my $old_dir = shift(@ARGV) or die $usage;
+my $new_dir = shift(@ARGV) or die $usage;
 die "$new_dir exists\n" if -d $new_dir;
 die "$old_dir not a directory\n" unless -d $old_dir;
-my $config = eval { PublicInbox::Config->new };
+my $config = PublicInbox::Config->new;
 $old_dir = abs_path($old_dir);
 my $old;
 if ($config) {
@@ -45,6 +46,14 @@ $old = PublicInbox::InboxWritable->new($old);
 if ($old->version >= 2) {
        die "Only conversion from v1 inboxes is supported\n";
 }
+
+$old->{indexlevel} //= PublicInbox::Admin::detect_indexlevel($old);
+if ($index) {
+       my $mods = {};
+       PublicInbox::Admin::scan_ibx_modules($mods, $old);
+       PublicInbox::Admin::require_or_die(keys %$mods);
+}
+
 my $new = { %$old };
 $new->{inboxdir} = abs_path($new_dir);
 $new->{version} = 2;
@@ -87,7 +96,6 @@ $clone may not be valid after migrating to v2, not copying
        }
 });
 my $state = '';
-my ($prev, $from);
 my $head = $old->{ref_head} || 'HEAD';
 my ($rd, $pid) = $old->git->popen(qw(fast-export --use-done-feature), $head);
 $v2w->idx_init;
@@ -132,11 +140,6 @@ while (<$rd>) {
                        $last = 'd';
                        next;
                }
-               if (m{^from (:[0-9]+)}) {
-                       $prev = $from;
-                       $from = $1;
-                       # no next
-               }
        }
        last if $_ eq "done\n";
        $w->print($_) or $im->wfail;
@@ -157,7 +160,5 @@ if (my $mm = $old->mm) {
        chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head));
        $v2w->last_epoch_commit(0, $cmt);
 }
-if ($index) {
-       $v2w->index_sync({reindex => 1});
-       $v2w->done;
-}
+$v2w->index_sync({reindex => 1}) if $index;
+$v2w->done;