#!/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::InboxWritable;
use PublicInbox::Config;
+use PublicInbox::Admin;
use PublicInbox::V2Writable;
use PublicInbox::Git;
use PublicInbox::Spawn qw(spawn);
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 };
+my $config = PublicInbox::Config->new;
$old_dir = abs_path($old_dir);
my $old;
if ($config) {
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;
$state = 'commit';
} elsif (/^data ([0-9]+)/) {
my $len = $1;
- $w->print($_) or $im->wfail;
+ print $w $_ or $im->wfail;
while ($len) {
my $n = read($rd, my $tmp, $len) or die "read: $!";
warn "$n != $len\n" if $n != $len;
$len -= $n;
- $w->print($tmp) or $im->wfail;
+ print $w $tmp or $im->wfail;
}
next;
} elsif ($state eq 'commit') {
my ($mark, $path) = ($1, $2);
$D{$path} = $mark;
if ($last && $last ne 'm') {
- $w->print("D $last\n") or $im->wfail;
+ print $w "D $last\n" or $im->wfail;
}
- $w->print("M 100644 :$mark m\n") or $im->wfail;
+ print $w "M 100644 :$mark m\n" or $im->wfail;
$last = 'm';
next;
}
my $mark = delete $D{$1};
defined $mark or die "undeleted path: $1\n";
if ($last && $last ne 'd') {
- $w->print("D $last\n") or $im->wfail;
+ print $w "D $last\n" or $im->wfail;
}
- $w->print("M 100644 :$mark d\n") or $im->wfail;
+ print $w "M 100644 :$mark d\n" or $im->wfail;
$last = 'd';
next;
}
}
last if $_ eq "done\n";
- $w->print($_) or $im->wfail;
+ print $w $_ or $im->wfail;
}
-$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";
+$r = $w = undef; # v2w->done does the actual close and error checking
$v2w->done;
if (my $mm = $old->mm) {
$old->cleanup;