-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# git fast-import-based ssoma-mda MDA replacement
use strict;
use warnings;
use base qw(PublicInbox::Lock);
-use PublicInbox::Spawn qw(spawn);
-use PublicInbox::MID qw(mids mid_mime mid2path);
+use PublicInbox::Spawn qw(spawn popen_rd);
+use PublicInbox::MID qw(mids mid2path);
use PublicInbox::Address;
use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
use PublicInbox::ContentId qw(content_digest);
return ($self->{in}, $self->{out}) if $self->{pid};
- my ($in_r, $in_w, $out_r, $out_w);
- pipe($in_r, $in_w) or die "pipe failed: $!";
+ my ($out_r, $out_w);
pipe($out_r, $out_w) or die "pipe failed: $!";
my $git = $self->{git};
my $git_dir = $git->{git_dir};
my @cmd = ('git', "--git-dir=$git_dir", qw(fast-import
--quiet --done --date-format=raw));
- my $rdr = { 0 => fileno($out_r), 1 => fileno($in_w) };
- my $pid = spawn(\@cmd, undef, $rdr);
- die "spawn fast-import failed: $!" unless defined $pid;
+ my ($in_r, $pid) = popen_rd(\@cmd, undef, { 0 => $out_r });
$out_w->autoflush(1);
$self->{in} = $in_r;
$self->{out} = $out_w;
my $env = { GIT_INDEX_FILE => $index };
run_die([@cmd, qw(read-tree -m -v -i), $self->{ref}], $env);
}
- run_die([@cmd, 'update-server-info'], undef);
- ($self->{path_type} eq '2/38') and eval {
+ run_die([@cmd, 'update-server-info']);
+ my $ibx = $self->{-inbox};
+ ($ibx && $self->{path_type} eq '2/38') and eval {
require PublicInbox::SearchIdx;
- my $ibx = $self->{-inbox} || $git_dir;
my $s = PublicInbox::SearchIdx->new($ibx);
$s->index_sync({ ref => $self->{ref} });
};
- eval { run_die([@cmd, qw(gc --auto)], undef) } if $do_gc;
+ eval { run_die([@cmd, qw(gc --auto)]) } if $do_gc;
}
sub barrier {
}
}
if (defined $email) {
+ # Email::Address::XS may leave quoted '<' in addresses,
+ # which git-fast-import doesn't like
+ $email =~ tr/<>//d;
+
# quiet down wide character warnings with utf8::encode
utf8::encode($email);
} else {
}
my $blob = $self->{mark}++;
- my $str = $mime->as_string;
- my $n = length($str);
+ my $raw_email = $mime->{-public_inbox_raw} // $mime->as_string;
+ my $n = length($raw_email);
$self->{bytes_added} += $n;
print $w "blob\nmark :$blob\ndata ", $n, "\n" or wfail;
- print $w $str, "\n" or wfail;
+ print $w $raw_email, "\n" or wfail;
# v2: we need this for Xapian
if ($self->{want_object_info}) {
my $oid = $self->get_mark(":$blob");
- $self->{last_object} = [ $oid, $n, \$str ];
+ $self->{last_object} = [ $oid, $n, \$raw_email ];
}
my $ref = $self->{ref};
my $commit = $self->{mark}++;
sub run_die ($;$$) {
my ($cmd, $env, $rdr) = @_;
my $pid = spawn($cmd, $env, $rdr);
- defined $pid or die "spawning ".join(' ', @$cmd)." failed: $!";
waitpid($pid, 0) == $pid or die join(' ', @$cmd) .' did not finish';
$? == 0 or die join(' ', @$cmd) . " failed: $?\n";
}
return if $nreplace == 0;
- run_die([@git, qw(-c gc.reflogExpire=now gc --prune=all)]);
+ run_die([@git, qw(-c gc.reflogExpire=now gc --prune=all --quiet)]);
# check that old OIDs are gone
my $err = 0;
version 1.0
-=head1 SYNOPSYS
+=head1 SYNOPSIS
use Email::MIME;
use PublicInbox::Git;