@cmd;
}
-sub ft_rename ($$$) {
- my ($ft, $dst, $open_mode) = @_;
- my @st = stat($dst);
+sub ft_rename ($$$;$) {
+ my ($ft, $dst, $open_mode, $fh) = @_;
+ my @st = stat($fh // $dst);
my $mode = @st ? ($st[2] & 07777) : ($open_mode & ~umask);
chmod($mode, $ft) or croak "E: chmod($ft): $!";
require File::Copy;
$ft->unlink_on_destroy(0);
}
+sub do_reap ($;$) {
+ my ($self, $jobs) = @_;
+ $jobs //= $self->{-jobs} //= $self->{lei}->{opt}->{jobs} // 1;
+ $jobs = 1 if $jobs < 1;
+ while (keys(%$LIVE) >= $jobs) {
+ my $pid = waitpid(-1, 0) // die "waitpid(-1): $!";
+ if (my $x = delete $LIVE->{$pid}) {
+ my $cb = shift @$x;
+ $cb->(@$x) if $cb;
+ } else {
+ warn "reaped unknown PID=$pid ($?)\n";
+ }
+ }
+}
+
sub _get_txt_start { # non-fatal
my ($self, $endpoint, $fini) = @_;
my $uri = URI->new($self->{cur_src} // $self->{src});
my $opt = { 0 => $lei->{0}, 1 => $lei->{1}, 2 => $lei->{2} };
my $cmd = $self->{curl}->for_uri($lei, $uri, qw(-f --compressed -R -o),
$ft->filename);
- my $jobs = $lei->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
+ do_reap($self);
$lei->qerr("# @$cmd");
return if $self->{dry_run};
$self->{"-get_txt.$endpoint"} = [ $ft, $cmd, $uri ];
sub index_cloned_inbox {
my ($self, $iv) = @_;
my $lei = $self->{lei};
- eval { set_description($self) };
- warn $@ if $@;
# n.b. public-inbox-clone works w/o (SQLite || Xapian)
# lei is useless without Xapian + SQLite
sub start_clone {
my ($self, $cmd, $opt, $fini) = @_;
- my $jobs = $self->{lei}->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
+ do_reap($self);
$self->{lei}->qerr("# @$cmd");
return if $self->{dry_run};
$LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd, $fini ]
sub fgrp_update_old ($) { # for git <1.8.5
my ($fgrp) = @_;
- my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
+ my $cmd = [ @{$fgrp->{-torsocks}}, 'git', "--git-dir=$fgrp->{cur_dst}",
fetch_args($fgrp->{lei}, my $opt = {}) ];
$fgrp->{lei}->qerr("# @$cmd");
+ do_reap($fgrp);
$LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $fgrp, $cmd ];
- my $jobs = $fgrp->{lei}->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
}
sub upr { # feed `git update-ref --stdin -z' verbosely
- my ($fgrp, $w, $op, $ref, $oid) = @_;
- $fgrp->{lei}->qerr("# $op $ref $oid");
+ my ($lei, $w, $op, $ref, $oid) = @_;
+ $lei->qerr("# $op $ref $oid") if $lei->{opt}->{verbose};
print $w "$op $ref\0$oid\0" or die "print(w): $!";
}
pipe(my ($r, $w)) or die "pipe: $!";
my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
qw(update-ref --stdin -z) ];
- $fgrp->{lei}->qerr("# @$cmd");
- my $opt = { 0 => $r, 1 => $fgrp->{lei}->{1}, 2 => $fgrp->{lei}->{2} };
+ my $lei = $fgrp->{lei};
+ $lei->qerr("# @$cmd");
+ my $opt = { 0 => $r, 1 => $lei->{1}, 2 => $lei->{2} };
my $pid = spawn($cmd, undef, $opt);
close $r or die "close(r): $!";
for my $ref (keys %dst) {
my $new = delete $src{$ref};
my $old = $dst{$ref};
if (defined $new) {
- upr($fgrp, $w, 'update', $ref, $new) if $new ne $old;
+ upr($lei, $w, 'update', $ref, $new) if $new ne $old;
} else {
- upr($fgrp, $w, 'delete', $ref, $old);
+ upr($lei, $w, 'delete', $ref, $old);
}
}
while (my ($ref, $oid) = each %src) {
- upr($fgrp, $w, 'create', $ref, $oid);
+ upr($lei, $w, 'create', $ref, $oid);
}
if (close($w)) { # git >= 1.8.5
$LIVE->{$pid} = [ \&reap_cmd, $fgrp, $cmd ];
- my $jobs = $fgrp->{lei}->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
+ do_reap($fgrp);
} else { # git <1.8.5 w/o update-ref --stdin
warn "E: close(update-ref --stdin): $!\n";
$update_ref_stdin = 0;
}
}
+sub pack_refs {
+ my ($self, $git_dir) = @_;
+ do_reap($self);
+ my $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
+ $self->{lei}->qerr("# @$cmd");
+ my $opt = { 1 => $self->{lei}->{1}, 2 => $self->{lei}->{2} };
+ $LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd ];
+}
+
sub fgrp_fetched {
my ($fgrp) = @_;
return if $fgrp->{dry_run} || !$LIVE;
my $rn = $fgrp->{-remote};
my %opt = map { $_ => $fgrp->{lei}->{$_} } (0..2);
- my $cmd = [ 'git', "--git-dir=$fgrp->{-osdir}",
- qw(pack-refs --all --prune) ];
- $fgrp->{lei}->qerr("# @$cmd");
- $LIVE->{spawn($cmd, undef, \%opt)} = [ \&reap_cmd, $fgrp, $cmd ];
- my $jobs = $fgrp->{lei}->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
+ pack_refs($fgrp, $fgrp->{-osdir}); # objstore refs always packed
$update_ref_stdin or return fgrp_update_old($fgrp);
my $src = [ 'git', "--git-dir=$fgrp->{-osdir}", 'for-each-ref',
"--format=refs/%(refname:lstrip=3)%00%(objectname)",
"refs/remotes/$rn/" ];
+ do_reap($fgrp);
open($fgrp->{srcfh}, '+>', undef) or die "open(src): $!";
$fgrp->{lei}->qerr("# @$src >SRC");
my $pid = spawn($src, undef, { %opt, 1 => $fgrp->{srcfh} });
$LIVE->{$pid} = [ \&reap_cmd, $fgrp, $src, $update_ref ];
- reap_live() while keys(%$LIVE) >= $jobs;
my $dst = [ 'git', "--git-dir=$fgrp->{cur_dst}", 'for-each-ref',
'--format=%(refname)%00%(objectname)' ];
+ do_reap($fgrp);
open($fgrp->{dstfh}, '+>', undef) or die "open(dst): $!";
$fgrp->{lei}->qerr("# @$dst >DST");
$pid = spawn($dst, undef, { %opt, 1 => $fgrp->{dstfh} });
$LIVE->{$pid} = [ \&reap_cmd, $fgrp, $dst, $update_ref ];
- reap_live() while keys(%$LIVE) >= $jobs;
}
sub fgrp_fetch {
- my ($fgrp, $pfx, $fini) = @_;
- my $cmd = [ @$pfx, 'git', "--git-dir=$fgrp->{-osdir}",
- fetch_args($fgrp->{lei}, my $opt = {}),
+ my ($fgrp, $fini) = @_;
+ my $cmd = [ @{$fgrp->{-torsocks}}, 'git', "--git-dir=$fgrp->{-osdir}",
+ fetch_args($fgrp->{lei}, my $opt = {}), '--no-tags',
$fgrp->{-remote} ];
$fgrp->{-fini} = $fini;
- my $jobs = $fgrp->{lei}->{opt}->{jobs} // 1;
- reap_live() while keys(%$LIVE) >= $jobs;
+ do_reap($fgrp);
$fgrp->{lei}->qerr("# @$cmd");
return if $fgrp->{dry_run};
my $fgrp_fini = PublicInbox::OnDestroy->new($$, \&fgrp_fetched, $fgrp);
my $key = $self->{-key} // die 'BUG: no -key';
my ($bn) = ($key =~ m{/([a-z0-9_,;=!\+\{\}\|][^/]*)(?:\.git)?\z}i);
my $rn = "$bn-".substr(sha256_hex($key), 0, 16);
- for ("url=$uri", "fetch=+refs/*:refs/remotes/$rn/*") {
+ # --no-tags is required to avoid conflicts
+ for ("url=$uri", "fetch=+refs/*:refs/remotes/$rn/*",
+ 'tagopt=--no-tags') {
my @kv = split(/=/, $_, 2);
$kv[0] = "remote.$rn.$kv[0]";
run_die([@cmd, @kv], undef, $opt);
}
+ $self->{-do_pack_refs} = 1; # likely coderepo
if (!-d $self->{cur_dst}) {
my $alt = File::Spec->rel2abs("$dir/objects");
PublicInbox::Import::init_bare($self->{cur_dst});
my $uri = URI->new($self->{cur_src} // $self->{src});
defined($lei->{opt}->{epoch}) and
die "$uri is a v1 inbox, --epoch is not supported\n";
- my $pfx = $curl->torsocks($lei, $uri) or return;
+ $self->{-torsocks} //= $curl->torsocks($lei, $uri) or return;
my $dst = $self->{cur_dst} // $self->{dst};
my $fini = PublicInbox::OnDestroy->new($$, \&v1_done, $self);
- my $cmd = [ @$pfx, clone_cmd($lei, my $opt = {}), "$uri", $dst ];
+ my $cmd = [ @{$self->{-torsocks}}, clone_cmd($lei, my $opt = {}),
+ "$uri", $dst ];
my $fgrp = forkgroup_prep($self, $uri);
if (!defined($fgrp) && defined($self->{-ent})) {
if (defined(my $ref = $self->{-ent}->{reference})) {
push @$cmd, '--reference', "$self->{dst}$ref";
}
}
- $fgrp ? fgrp_fetch($fgrp, $pfx, $fini) :
+ $fgrp ? fgrp_fetch($fgrp, $fini) :
start_clone($self, $cmd, $opt, $fini);
if (!$self->{-is_epoch} && $lei->{opt}->{'inbox-config'} =~
(!defined($d) && !$nohang) and
_get_txt_start($self, 'description', $fini);
- reap_live() until ($nohang || !keys(%$LIVE)); # for non-manifest clone
+ $nohang or do_reap($self, 1); # for non-manifest clone
}
sub parse_epochs ($$) {
run_die([qw(git config -f), "$dst/config", 'gitweb.owner', $o]);
}
my $o = "$dst/objects";
- if (open(my $fh, '<', "$o/info/alternates")) {
+ if (open(my $fh, '<', my $fn = "$o/info/alternates")) {;
my $base = File::Spec->rel2abs($o);
- chomp(my @l = <$fh>);
+ my @l = <$fh>;
+ my $ft;
for (@l) {
- $_ = File::Spec->abs2rel($_, $base) if m!\A/!;
- $_ .= "\n";
+ next unless m!\A/!;
+ $_ = File::Spec->abs2rel($_, $base);
+ $ft //= File::Temp->new(TEMPLATE => '.XXXX',
+ DIR => "$o/info");
+ }
+ if ($ft) {
+ print $ft @l or die "print($ft): $!";
+ $ft->flush or die "flush($ft): $!";
+ ft_rename($ft, $fn, 0666, $fh);
}
- my $f = File::Temp->new(TEMPLATE => '.XXXX', DIR => "$o/info");
- print $f @l;
- $f->flush or die "flush($f): $!";
- rename($f->filename, "$o/info/alternates") or
- die "rename($f, $o/info/alternates): $!";
- $f->unlink_on_destroy(0);
}
+ pack_refs($self, $dst) if delete $self->{-do_pack_refs};
+ eval { set_description($self) };
+ warn $@ if $@;
return if ($self->{-is_epoch} ||
$self->{lei}->{opt}->{'inbox-config'} ne 'always');
write_makefile($dst, 1);
}
write_makefile($dst, 2);
undef $lck; # unlock
+ eval { set_description($self) };
+ warn $@ if $@;
index_cloned_inbox($self, 2);
}
-sub reap_live {
- my $pid = waitpid(-1, 0) // die "waitpid(-1): $!";
- if (my $x = delete $LIVE->{$pid}) {
- my $cb = shift @$x;
- $cb->(@$x) if $cb;
- } else {
- warn "reaped unknown PID=$pid ($?)\n";
- }
-}
-
sub clone_v2_prep ($$;$) {
my ($self, $v2_epochs, $m) = @_; # $m => manifest.js.gz hashref
my $lei = $self->{lei};
my $curl = $self->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
my $first_uri = (map { $_->[0] } values %$v2_epochs)[0];
- my $pfx = $curl->torsocks($lei, $first_uri) or return;
+ $self->{-torsocks} //= $curl->torsocks($lei, $first_uri) or return;
my $dst = $self->{cur_dst} // $self->{dst};
my $want = parse_epochs($lei->{opt}->{epoch}, $v2_epochs);
my $task = $m ? bless { %$self }, __PACKAGE__ : $self;
last; # restart %$todo iteration
}
}
- reap_live() while keys(%$LIVE);
+ do_reap($self, 1);
}
sub dump_manifest ($$) {
if (defined(my $os = $lei->{opt}->{objstore})) {
$os = 'objstore' if $os eq ''; # --objstore w/o args
- $self->{-objstore} = "$self->{dst}/$os";
+ $os = "$self->{dst}/$os" if $os !~ m!\A/!;
+ $self->{-objstore} = $os;
}
local $LIVE;
my $iv = $lei->{opt}->{'inbox-version'} //