Continuing the work by Eric Biederman in commit
a118d58a402bd31b
("Import.pm: When purging replace a purged file with a zero length file"),
we can use a generic OID replacement mechanism to implement
purge.
-sub purge_oids {
- my ($self, $purge) = @_;
- my $tmp = "refs/heads/purge-".((keys %$purge)[0]);
+sub replace_oids {
+ my ($self, $replace) = @_; # oid => raw string
+ my $tmp = "refs/heads/replace-".((keys %$replace)[0]);
my $old = $self->{'ref'};
my $git = $self->{git};
my @export = (qw(fast-export --no-data --use-done-feature), $old);
my $rd = $git->popen(@export);
my ($r, $w) = $self->gfi_start;
my @buf;
my $old = $self->{'ref'};
my $git = $self->{git};
my @export = (qw(fast-export --no-data --use-done-feature), $old);
my $rd = $git->popen(@export);
my ($r, $w) = $self->gfi_start;
my @buf;
my @oids;
my ($done, $mark);
my $tree = $self->{-tree};
my @oids;
my ($done, $mark);
my $tree = $self->{-tree};
} elsif (/^M 100644 ([a-f0-9]+) (\w+)/) {
my ($oid, $path) = ($1, $2);
$tree->{$path} = 1;
} elsif (/^M 100644 ([a-f0-9]+) (\w+)/) {
my ($oid, $path) = ($1, $2);
$tree->{$path} = 1;
+ my $sref = $replace->{$oid};
+ if (defined $sref) {
- my $cmd = "M 100644 inline $path\ndata 0\n\n";
- push @buf, $cmd;
+ my $n = length($$sref);
+ push @buf, "M 100644 inline $path\ndata $n\n";
+ push @buf, $$sref; # hope CoW works...
+ push @buf, "\n";
} else {
push @buf, $_;
}
} else {
push @buf, $_;
}
$out =~ s/^/# /sgm;
warn "purge rewriting\n", $out, "\n";
clean_purge_buffer(\@oids, \@buf);
$out =~ s/^/# /sgm;
warn "purge rewriting\n", $out, "\n";
clean_purge_buffer(\@oids, \@buf);
}
$w->print(@buf, "\n") or wfail;
@buf = ();
}
$w->print(@buf, "\n") or wfail;
@buf = ();
$w->print(@buf) or wfail;
}
die 'done\n not seen from fast-export' unless $done;
$w->print(@buf) or wfail;
}
die 'done\n not seen from fast-export' unless $done;
- chomp(my $cmt = $self->get_mark(":$mark")) if $npurge;
+ chomp(my $cmt = $self->get_mark(":$mark")) if $nreplace;
$self->{nchg} = 0; # prevent _update_git_info until update-ref:
$self->done;
my @git = ('git', "--git-dir=$git->{git_dir}");
$self->{nchg} = 0; # prevent _update_git_info until update-ref:
$self->done;
my @git = ('git', "--git-dir=$git->{git_dir}");
- run_die([@git, qw(update-ref), $old, $tmp]) if $npurge;
+ run_die([@git, qw(update-ref), $old, $tmp]) if $nreplace;
run_die([@git, qw(update-ref -d), $tmp]);
run_die([@git, qw(update-ref -d), $tmp]);
- return if $npurge == 0;
+ 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)]);
+
+ # check that old OIDs are gone
- foreach my $oid (keys %$purge) {
+ foreach my $oid (keys %$replace) {
my @info = $git->check($oid);
if (@info) {
my @info = $git->check($oid);
if (@info) {
- warn "$oid not purged\n";
+ warn "$oid not replaced\n";
$err++;
}
}
_update_git_info($self, 0);
$err++;
}
}
_update_git_info($self, 0);
- die "Failed to purge $err object(s)\n" if $err;
+ die "Failed to replace $err object(s)\n" if $err;
- my ($self, $purge) = @_; # $purge = { $object_id => 1, ... }
+ my ($self, $purge) = @_; # $purge = { $object_id => \'', ... }
$self->done;
my $pfx = "$self->{-inbox}->{mainrepo}/git";
my $purges = [];
$self->done;
my $pfx = "$self->{-inbox}->{mainrepo}/git";
my $purges = [];
-d $git_dir or next;
my $git = PublicInbox::Git->new($git_dir);
my $im = $self->import_init($git, 0, 1);
-d $git_dir or next;
my $git = PublicInbox::Git->new($git_dir);
my $im = $self->import_init($git, 0, 1);
- $purges->[$i] = $im->purge_oids($purge);
+ $purges->[$i] = $im->replace_oids($purge);
$removed = $smsg;
my $oid = $smsg->{blob};
if ($purge) {
$removed = $smsg;
my $oid = $smsg->{blob};
if ($purge) {
} else {
($mark, undef) = $im->remove($orig, $cmt_msg);
}
} else {
($mark, undef) = $im->remove($orig, $cmt_msg);
}