treewide: run update-copyrights from gnulib for 2019

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

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 3182410e0a6f0e5037bc41b3b0a8bd040389f072..906001cbbd810d226d8dfb94b4240678ab132938 100755 (executable)
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -1,14 +1,13 @@
 #!/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::MIME;
 use PublicInbox::InboxWritable;
 use PublicInbox::Config;
 use PublicInbox::V2Writable;
-use PublicInbox::Import;
+use PublicInbox::Git;
 use PublicInbox::Spawn qw(spawn);
 use Cwd 'abs_path';
 use File::Copy 'cp'; # preserves permissions:
@@ -20,9 +19,8 @@ my %opts = (
        '--index!' => \$index,
 );
 GetOptions(%opts) or die "bad command-line args\n$usage";
-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 };
@@ -44,7 +42,7 @@ unless ($old) {
        $old = PublicInbox::Inbox->new($old);
 }
 $old = PublicInbox::InboxWritable->new($old);
-if (($old->{version} || 1) >= 2) {
+if ($old->version >= 2) {
        die "Only conversion from v1 inboxes is supported\n";
 }
 my $new = { %$old };
@@ -89,7 +87,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;
@@ -134,11 +131,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;
@@ -147,10 +139,17 @@ $w = $r = undef;
 close $rd or die "close fast-export: $!\n";
 waitpid($pid, 0) or die "waitpid failed: $!\n";
 $? == 0 or die "fast-export failed: $?\n";
-my $mm = $old->mm;
-$mm->{dbh}->sqlite_backup_to_file("$new_dir/msgmap.sqlite3") if $mm;
 $v2w->done;
-if ($index) {
-       $v2w->index_sync;
-       $v2w->done;
+if (my $mm = $old->mm) {
+       $old->cleanup;
+       $mm->{dbh}->sqlite_backup_to_file("$new_dir/msgmap.sqlite3");
+
+       # we want to trigger a reindex, not a from scratch index if
+       # we're reusing the msgmap from an existing v1 installation.
+       $v2w->idx_init;
+       my $epoch0 = PublicInbox::Git->new($v2w->git_init(0));
+       chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head));
+       $v2w->last_epoch_commit(0, $cmt);
 }
+$v2w->index_sync({reindex => 1}) if $index;
+$v2w->done;