X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-convert;h=56a810eb054ffc1ea41585eab1052dabb0b7bc12;hb=227a1d886672767e37cc86a3432952c14eb8a143;hp=2979a0c80b06ac365885c707fae7112a4bd1435f;hpb=866837def71b9d70198f51e634e6141f75f0df3e;p=public-inbox.git
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 2979a0c8..56a810eb 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -1,14 +1,12 @@
#!/usr/bin/perl -w
-# Copyright (C) 2018 all contributors
+# Copyright (C) 2018-2019 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::V2Writable;
-use PublicInbox::Import;
use PublicInbox::Spawn qw(spawn);
use Cwd 'abs_path';
use File::Copy 'cp'; # preserves permissions:
@@ -20,33 +18,34 @@ 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;
die "$old_dir not a directory\n" unless -d $old_dir;
-my $config = PublicInbox::Config->new;
+my $config = eval { PublicInbox::Config->new };
$old_dir = abs_path($old_dir);
my $old;
-$config->each_inbox(sub {
- $old = $_[0] if abs_path($_[0]->{mainrepo}) eq $old_dir;
-});
+if ($config) {
+ $config->each_inbox(sub {
+ $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;
@@ -60,9 +59,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;
@@ -77,9 +76,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
@@ -101,7 +100,7 @@ while (<$rd>) {
$state = 'blob';
} elsif (/^commit /) {
$state = 'commit';
- } elsif (/^data (\d+)/) {
+ } elsif (/^data ([0-9]+)/) {
my $len = $1;
$w->print($_) or $im->wfail;
while ($len) {
@@ -112,7 +111,7 @@ while (<$rd>) {
}
next;
} elsif ($state eq 'commit') {
- if (m{^M 100644 :(\d+) (${h}{2}/${h}{38})}o) {
+ if (m{^M 100644 :([0-9]+) (${h}{2}/${h}{38})}o) {
my ($mark, $path) = ($1, $2);
$D{$path} = $mark;
if ($last && $last ne 'm') {
@@ -132,7 +131,7 @@ while (<$rd>) {
$last = 'd';
next;
}
- if (m{^from (:\d+)}) {
+ if (m{^from (:[0-9]+)}) {
$prev = $from;
$from = $1;
# no next