X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-convert;h=acecf3d54ed5db44b5aa585fe4e939a8f52e5aac;hb=b02b2a5d7cb5a811f041febd09d625bdc1af1d8e;hp=9d2d2512a403f99f2d994429d43f166796575e9e;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 9d2d2512..acecf3d5 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -4,11 +4,10 @@
 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,7 +19,6 @@ 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;
 die "$new_dir exists\n" if -d $new_dir;
@@ -30,25 +28,25 @@ $old_dir = abs_path($old_dir);
 my $old;
 if ($config) {
 	$config->each_inbox(sub {
-		$old = $_[0] if abs_path($_[0]->{mainrepo}) eq $old_dir;
+		$old = $_[0] if abs_path($_[0]->{inboxdir}) eq $old_dir;
 	});
 }
 unless ($old) {
 	warn "W: $old_dir not configured in " .
 		PublicInbox::Config::default_file() . "\n";
 	$old = {
-		mainrepo => $old_dir,
+		inboxdir => $old_dir,
 		name => 'ignored',
 		address => [ 'old@example.com' ],
 	};
 	$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 };
-$new->{mainrepo} = abs_path($new_dir);
+$new->{inboxdir} = abs_path($new_dir);
 $new->{version} = 2;
 $new = PublicInbox::InboxWritable->new($new);
 my $v2w;
@@ -62,9 +60,9 @@ sub link_or_copy ($$) {
 }
 
 $old->with_umask(sub {
-	my $old_cfg = "$old->{mainrepo}/config";
+	my $old_cfg = "$old->{inboxdir}/config";
 	local $ENV{GIT_CONFIG} = $old_cfg;
-	my $new_cfg = "$new->{mainrepo}/all.git/config";
+	my $new_cfg = "$new->{inboxdir}/all.git/config";
 	$v2w = PublicInbox::V2Writable->new($new, 1);
 	$v2w->init_inbox($jobs);
 	unlink $new_cfg;
@@ -79,9 +77,9 @@ $old->with_umask(sub {
 			$src->mm_alt->{dbh}->sqlite_backup_to_file($dst);
 		}
 	}
-	my $desc = "$old->{mainrepo}/description";
-	link_or_copy($desc, "$new->{mainrepo}/description") if -e $desc;
-	my $clone = "$old->{mainrepo}/cloneurl";
+	my $desc = "$old->{inboxdir}/description";
+	link_or_copy($desc, "$new->{inboxdir}/description") if -e $desc;
+	my $clone = "$old->{inboxdir}/cloneurl";
 	if (-e $clone) {
 		warn <<"";
 $clone may not be valid after migrating to v2, not copying
@@ -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,19 @@ $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 (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);
+}
 if ($index) {
-	$v2w->index_sync;
+	$v2w->index_sync({reindex => 1});
 	$v2w->done;
 }