convert: copy description and git config from v1 repo

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

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index e6fb4f5f3cb11868e9ad72092bfc5bcce7faa0ec..2979a0c80b06ac365885c707fae7112a4bd1435f 100755 (executable)
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -5,11 +5,13 @@ use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 use PublicInbox::MIME;
-use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
 use PublicInbox::Config;
 use PublicInbox::V2Writable;
+use PublicInbox::Import;
 use PublicInbox::Spawn qw(spawn);
 use Cwd 'abs_path';
+use File::Copy 'cp'; # preserves permissions:
 my $usage = "Usage: public-inbox-convert OLD NEW\n";
 my $jobs;
 my $index = 1;
@@ -39,16 +41,51 @@ unless ($old) {
        };
        $old = PublicInbox::Inbox->new($old);
 }
+$old = PublicInbox::InboxWritable->new($old);
 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} = $new_dir;
+$new->{mainrepo} = abs_path($new_dir);
 $new->{version} = 2;
-$new = PublicInbox::Inbox->new($new);
-my $v2w = PublicInbox::V2Writable->new($new, 1);
-$v2w->init_inbox($jobs);
+$new = PublicInbox::InboxWritable->new($new);
+my $v2w;
+$old->umask_prepare;
+
+sub link_or_copy ($$) {
+       my ($src, $dst) = @_;
+       link($src, $dst) and return;
+       $!{EXDEV} or warn "link $src, $dst failed: $!, trying cp\n";
+       cp($src, $dst) or die "cp $src, $dst failed: $!\n";
+}
+
+$old->with_umask(sub {
+       my $old_cfg = "$old->{mainrepo}/config";
+       local $ENV{GIT_CONFIG} = $old_cfg;
+       my $new_cfg = "$new->{mainrepo}/all.git/config";
+       $v2w = PublicInbox::V2Writable->new($new, 1);
+       $v2w->init_inbox($jobs);
+       unlink $new_cfg;
+       link_or_copy($old_cfg, $new_cfg);
+       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 $desc = "$old->{mainrepo}/description";
+       link_or_copy($desc, "$new->{mainrepo}/description") if -e $desc;
+       my $clone = "$old->{mainrepo}/cloneurl";
+       if (-e $clone) {
+               warn <<"";
+$clone may not be valid after migrating to v2, not copying
+
+       }
+});
 my $state = '';
 my ($prev, $from);
 my $head = $old->{ref_head} || 'HEAD';
@@ -58,6 +95,7 @@ my $im = $v2w->importer;
 my ($r, $w) = $im->gfi_start;
 my $h = '[0-9a-f]';
 my %D;
+my $last;
 while (<$rd>) {
        if ($_ eq "blob\n") {
                $state = 'blob';
@@ -77,13 +115,21 @@ while (<$rd>) {
                if (m{^M 100644 :(\d+) (${h}{2}/${h}{38})}o) {
                        my ($mark, $path) = ($1, $2);
                        $D{$path} = $mark;
+                       if ($last && $last ne 'm') {
+                               $w->print("D $last\n") or $im->wfail;
+                       }
                        $w->print("M 100644 :$mark m\n") or $im->wfail;
+                       $last = 'm';
                        next;
                }
                if (m{^D (${h}{2}/${h}{38})}o) {
                        my $mark = delete $D{$1};
                        defined $mark or die "undeleted path: $1\n";
-                       $w->print("M 100644 :$mark _/D\n") or $im->wfail;
+                       if ($last && $last ne 'd') {
+                               $w->print("D $last\n") or $im->wfail;
+                       }
+                       $w->print("M 100644 :$mark d\n") or $im->wfail;
+                       $last = 'd';
                        next;
                }
                if (m{^from (:\d+)}) {
@@ -103,6 +149,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;
 }