import: cleanup git cat-file processes when ->done

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

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 56ac44f51db82c715fb8230c098848c89a96710d..2742be79fe1d47b4d0ef79c76ab95660a7e18d11 100755 (executable)
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -45,7 +45,6 @@ if (($old->{version} || 1) >= 2) {
        die "Only conversion from v1 inboxes is supported\n";
 }
 my $new = { %$old };
-delete $new->{altid}; # TODO: support altid for v2
 $new->{mainrepo} = abs_path($new_dir);
 $new->{version} = 2;
 $new = PublicInbox::InboxWritable->new($new);
@@ -61,6 +60,16 @@ $old->with_umask(sub {
                        "--file=$new->{mainrepo}/all.git/config",
                        'core.sharedRepository', $sr]);
        }
+       if (my $alt = $new->{altid}) {
+               require PublicInbox::AltId;
+               foreach my $i (0..$#$alt) {
+                       my $src = PublicInbox::AltId->new($old, $alt->[$i], 0);
+                       $src->mm_alt or next;
+                       my $dst = PublicInbox::AltId->new($new, $alt->[$i], 1);
+                       $dst = $dst->{filename};
+                       $src->mm_alt->{dbh}->sqlite_backup_to_file($dst);
+               }
+       }
 });
 my $state = '';
 my ($prev, $from);
@@ -125,6 +134,6 @@ my $mm = $old->mm;
 $mm->{dbh}->sqlite_backup_to_file("$new_dir/msgmap.sqlite3") if $mm;
 $v2w->done;
 if ($index) {
-       $v2w->reindex;
+       $v2w->index_sync;
        $v2w->done;
 }