v2writable: reduce barriers

[public-inbox.git] / lib / PublicInbox / Import.pm

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index b2aae9a7a800c8dbc0d738a8ef63eeea6e2f104d..9e8900f3e6f86d2ce50576039654e75cad104120 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -95,19 +95,13 @@ sub _check_path ($$$$) {
        $info =~ /\Amissing / ? undef : $info;
 }
 
-sub check_remove_v1 {
-       my ($r, $w, $tip, $path, $mime) = @_;
-
-       my $info = _check_path($r, $w, $tip, $path) or return ('MISSING',undef);
-       $info =~ m!\A100644 blob ([a-f0-9]{40})\t!s or die "not blob: $info";
-       my $blob = $1;
-
-       print $w "cat-blob $blob\n" or wfail;
+sub _cat_blob ($$$) {
+       my ($r, $w, $oid) = @_;
+       print $w "cat-blob $oid\n" or wfail;
        local $/ = "\n";
-       $info = <$r>;
+       my $info = <$r>;
        defined $info or die "EOF from fast-import / cat-blob: $!";
-       $info =~ /\A[a-f0-9]{40} blob (\d+)\n\z/ or
-                               die "unexpected cat-blob response: $info";
+       $info =~ /\A[a-f0-9]{40} blob (\d+)\n\z/ or return;
        my $left = $1;
        my $offset = 0;
        my $buf = '';
@@ -122,7 +116,23 @@ sub check_remove_v1 {
        $n = read($r, my $lf, 1);
        defined($n) or die "read final byte of cat-blob failed: $!";
        die "bad read on final byte: <$lf>" if $lf ne "\n";
-       my $cur = PublicInbox::MIME->new(\$buf);
+       \$buf;
+}
+
+sub cat_blob {
+       my ($self, $oid) = @_;
+       my ($r, $w) = $self->gfi_start;
+       _cat_blob($r, $w, $oid);
+}
+
+sub check_remove_v1 {
+       my ($r, $w, $tip, $path, $mime) = @_;
+
+       my $info = _check_path($r, $w, $tip, $path) or return ('MISSING',undef);
+       $info =~ m!\A100644 blob ([a-f0-9]{40})\t!s or die "not blob: $info";
+       my $oid = $1;
+       my $msg = _cat_blob($r, $w, $oid) or die "BUG: cat-blob $1 failed";
+       my $cur = PublicInbox::MIME->new($msg);
        my $cur_s = $cur->header('Subject');
        $cur_s = '' unless defined $cur_s;
        my $cur_m = $mime->header('Subject');
@@ -192,6 +202,7 @@ sub get_mark {
        my ($r, $w) = $self->gfi_start;
        print $w "get-mark $mark\n" or wfail;
        defined(my $oid = <$r>) or die "get-mark failed, need git 2.6.0+\n";
+       chomp($oid);
        $oid;
 }
 
@@ -379,7 +390,7 @@ sub add {
 
        # v2: we need this for Xapian
        if ($self->{want_object_info}) {
-               chomp(my $oid = $self->get_mark(":$blob"));
+               my $oid = $self->get_mark(":$blob");
                $self->{last_object} = [ $oid, $n, \$str ];
        }
        my $ref = $self->{ref};
@@ -476,6 +487,7 @@ sub purge_oids {
        my @buf;
        my $npurge = 0;
        my @oids;
+       my ($done, $mark);
        my $tree = $self->{-tree};
        while (<$rd>) {
                if (/^reset (?:.+)/) {
@@ -506,14 +518,20 @@ sub purge_oids {
                        my $path = $1;
                        push @buf, $_ if $tree->{$path};
                } elsif ($_ eq "\n") {
-                       my $out = join('', @buf);
-                       $out =~ s/^/# /sgm;
-                       warn "purge rewriting\n", $out, "\n";
-                       clean_purge_buffer(\@oids, \@buf);
-                       $out = join('', @buf);
+                       if (@oids) {
+                               my $out = join('', @buf);
+                               $out =~ s/^/# /sgm;
+                               warn "purge rewriting\n", $out, "\n";
+                               clean_purge_buffer(\@oids, \@buf);
+                               $npurge++;
+                       }
                        $w->print(@buf, "\n") or wfail;
                        @buf = ();
-                       $npurge++;
+               } elsif ($_ eq "done\n") {
+                       $done = 1;
+               } elsif (/^mark :(\d+)$/) {
+                       push @buf, $_;
+                       $mark = $1;
                } else {
                        push @buf, $_;
                }
@@ -521,7 +539,9 @@ sub purge_oids {
        if (@buf) {
                $w->print(@buf) or wfail;
        }
-       $w = $r = undef;
+       die 'done\n not seen from fast-export' unless $done;
+       chomp(my $cmt = $self->get_mark(":$mark")) if $npurge;
+       $self->{nchg} = 0; # prevent _update_git_info until update-ref:
        $self->done;
        my @git = ('git', "--git-dir=$git->{git_dir}");
 
@@ -540,7 +560,9 @@ sub purge_oids {
                        $err++;
                }
        }
+       _update_git_info($self, 0);
        die "Failed to purge $err object(s)\n" if $err;
+       $cmt;
 }
 
 1;