X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-convert;h=e13c13f44153ed1f29082a10f80317c229574422;hb=d7fda3f4b9d4c9e6d01c818f09905d6827fa693f;hp=3182410e0a6f0e5037bc41b3b0a8bd040389f072;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 3182410e..e13c13f4 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -1,14 +1,14 @@
#!/usr/bin/perl -w
-# Copyright (C) 2018-2019 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
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::Admin;
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 +20,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,9 +43,17 @@ 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";
}
+
+$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;
@@ -89,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;
@@ -134,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;
@@ -147,10 +148,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;