use Digest::SHA qw(sha256_hex sha1_hex);
our $LIVE; # pid => callback
+our $FGRP_TODO; # objstore -> [ fgrp mirror objects ]
+our $TODO; # reference => [ non-fgrp mirror objects ]
sub keep_going ($) {
$LIVE && (!$_[0]->{lei}->{child_error} ||
my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
qw(update-ref --stdin -z) ];
my $lei = $fgrp->{lei};
- $lei->qerr("# @$cmd");
- my $opt = { 0 => $r, 2 => $lei->{2} };
- my $pid = spawn($cmd, undef, $opt);
+ my $pack = PublicInbox::OnDestroy->new($$, \&pack_dst, $fgrp);
+ start_cmd($fgrp, $cmd, { 0 => $r, 2 => $lei->{2} }, $pack);
close $r or die "close(r): $!";
+ return if $fgrp->{dry_run};
for my $ref (keys %dst) {
my $new = delete $src{$ref};
my $old = $dst{$ref};
upr($lei, $w, 'create', $ref, $oid);
}
close($w) or warn "E: close(update-ref --stdin): $! (need git 1.8.5+)\n";
- my $pack = PublicInbox::OnDestroy->new($$, \&pack_dst, $fgrp);
- $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $cmd, $pack ];
}
sub pack_dst { # packs lightweight satellite repos
sub pack_refs {
my ($self, $git_dir) = @_;
- do_reap($self);
- return if !keep_going($self);
my $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
- $self->{lei}->qerr("# @$cmd");
- return if $self->{dry_run};
- my $opt = { 2 => $self->{lei}->{2} };
- $LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd ];
+ start_cmd($self, $cmd, { 2 => $self->{lei}->{2} });
}
sub fgrpv_done {
my ($fgrpv) = @_;
return if !$LIVE;
- my $pid;
my $first = $fgrpv->[0] // die 'BUG: no fgrpv->[0]';
return if !keep_going($first);
pack_refs($first, $first->{-osdir}); # objstore refs always packed
my $rn = $fgrp->{-remote};
my %opt = ( 2 => $fgrp->{lei}->{2} );
- my $update_ref = $fgrp->{dry_run} ? undef :
- PublicInbox::OnDestroy->new($$, \&fgrp_update, $fgrp);
+ my $update_ref = PublicInbox::OnDestroy->new($$,
+ \&fgrp_update, $fgrp);
my $src = [ 'git', "--git-dir=$fgrp->{-osdir}", 'for-each-ref',
"--format=refs/%(refname:lstrip=3)%00%(objectname)",
"refs/remotes/$rn/" ];
- do_reap($fgrp);
- $fgrp->{lei}->qerr("# @$src >SRC");
- if ($update_ref) {
- open(my $fh, '+>', undef) or die "open(src): $!";
- $pid = spawn($src, undef, { %opt, 1 => $fh });
- $fgrp->{srcfh} = $fh;
- $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $src, $update_ref ]
- }
+ open(my $sfh, '+>', undef) or die "open(src): $!";
+ $fgrp->{srcfh} = $sfh;
+ start_cmd($fgrp, $src, { %opt, 1 => $sfh }, $update_ref);
my $dst = [ 'git', "--git-dir=$fgrp->{cur_dst}", 'for-each-ref',
'--format=%(refname)%00%(objectname)' ];
- do_reap($fgrp);
- $fgrp->{lei}->qerr("# @$dst >DST");
- if ($update_ref) {
- open(my $fh, '+>', undef) or die "open(dst): $!";
- $pid = spawn($dst, undef, { %opt, 1 => $fh });
- $fgrp->{dstfh} = $fh;
- $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $dst, $update_ref ]
- }
+ open(my $dfh, '+>', undef) or die "open(dst): $!";
+ $fgrp->{dstfh} = $dfh;
+ start_cmd($fgrp, $dst, { %opt, 1 => $dfh }, $update_ref);
}
}
sub fgrp_fetch_all {
my ($self) = @_;
- my $todo = delete $self->{fgrp_todo} or return;
+ my $todo = $FGRP_TODO;
+ $FGRP_TODO = \'BUG on further use';
keys(%$todo) or return;
# Rely on the fgrptmp remote groups in the config file rather
qw(--no-tags --multiple));
};
push(@fetch, "-j$j") if $j;
- my $pid;
while (my ($osdir, $fgrpv) = each %$todo) {
my $f = "$osdir/config";
$f, '--unset-all', "remotes.$grp"];
$self->{lei}->qerr("# @$cmd");
if (!$self->{dry_run}) {
- $pid = spawn($cmd, undef, { 2 => $self->{lei}->{2} });
+ my $pid = spawn($cmd, undef, { 2 => $self->{lei}->{2} });
waitpid($pid, 0) // die "waitpid: $!";
die "E: @$cmd: \$?=$?" if ($? && ($? >> 8) != 5);
}
$cmd = [ @git, "--git-dir=$osdir", @fetch, $grp ];
- do_reap($self);
- $self->{lei}->qerr("# @$cmd");
my $end = PublicInbox::OnDestroy->new($$, \&fgrpv_done, $fgrpv);
- return if $self->{dry_run};
- $pid = spawn($cmd, undef, $opt);
- $LIVE->{$pid} = [ \&reap_cmd, $self, $cmd, $end ];
+ start_cmd($self, $cmd, $opt, $end);
}
}
}
sub fp_done {
- my ($self, $go_fetch) = @_;
+ my ($self, $cb, @arg) = @_;
return if !keep_going($self);
my $fh = delete $self->{-show_ref} // die 'BUG: no show-ref output';
seek($fh, SEEK_SET, 0) or die "seek(show_ref): $!";
$self->{-ent} // die 'BUG: no -ent';
my $A = $self->{-ent}->{fingerprint} // die 'BUG: no fingerprint';
my $B = sha1_hex(do { local $/; <$fh> } // die("read(show_ref): $!"));
- return if $A ne $B; # $go_fetch->DESTROY fires
- $go_fetch->cancel;
+ return $cb->($self, @arg) if $A ne $B;
$self->{lei}->qerr("# $self->{-key} up-to-date");
}
-sub cmp_fp_fetch {
- my ($self, $go_fetch) = @_;
- # $go_fetch is either resume_fetch or fgrp_enqueue
- my $new = $self->{-ent}->{fingerprint} // die 'BUG: no fingerprint';
+sub cmp_fp_do {
+ my ($self, $cb, @arg) = @_;
+ # $cb is either resume_fetch or fgrp_enqueue
+ $self->{-ent} // return $cb->($self, @arg);
+ my $new = $self->{-ent}->{fingerprint} // return $cb->($self, @arg);
my $key = $self->{-key} // die 'BUG: no -key';
if (my $cur_ent = $self->{-local_manifest}->{$key}) {
# runs go_fetch->DESTROY run if eq
- return $go_fetch->cancel if $cur_ent->{fingerprint} eq $new;
+ return if $cur_ent->{fingerprint} eq $new;
}
my $dst = $self->{cur_dst} // $self->{dst};
my $cmd = ['git', "--git-dir=$dst", 'show-ref'];
my $opt = { 2 => $self->{lei}->{2} };
open($opt->{1}, '+>', undef) or die "open(tmp): $!";
$self->{-show_ref} = $opt->{1};
- my $done = PublicInbox::OnDestroy->new($$, \&fp_done, $self, $go_fetch);
+ my $done = PublicInbox::OnDestroy->new($$, \&fp_done, $self, $cb, @arg);
start_cmd($self, $cmd, $opt, $done);
}
-sub resume_fetch_maybe {
- my ($self, $uri, $fini) = @_;
- my $go_fetch = PublicInbox::OnDestroy->new($$, \&resume_fetch, @_);
- cmp_fp_fetch($self, $go_fetch) if $self->{-ent} &&
- defined($self->{-ent}->{fingerprint});
-}
-
sub resume_fetch {
my ($self, $uri, $fini) = @_;
return if !keep_going($self);
start_cmd($self, $cmd, $opt, $fini);
}
-sub fgrp_enqueue_maybe {
- my ($self, $fgrp) = @_;
- my $enq = PublicInbox::OnDestroy->new($$, \&fgrp_enqueue, $self, $fgrp);
- cmp_fp_fetch($self, $enq) if $self->{-ent} &&
- defined($self->{-ent}->{fingerprint});
- # $enq->DESTROY calls fgrp_enqueue otherwise
-}
-
sub fgrp_enqueue {
- my ($self, $fgrp) = @_;
- return if !keep_going($self);
- my $opt = { 2 => $self->{lei}->{2} };
+ my ($fgrp, $end) = @_; # $end calls fgrp_fetch_all
+ return if !keep_going($fgrp);
+ my $opt = { 2 => $fgrp->{lei}->{2} };
# --no-tags is required to avoid conflicts
my $u = $fgrp->{-uri} // die 'BUG: no {-uri}';
my $rn = $fgrp->{-remote} // die 'BUG: no {-remote}';
for ("url=$u", "fetch=+refs/*:refs/remotes/$rn/*", 'tagopt=--no-tags') {
my @kv = split(/=/, $_, 2);
$kv[0] = "remote.$rn.$kv[0]";
- $self->{dry_run} ? $self->{lei}->qerr("# @cmd @kv") :
+ $fgrp->{dry_run} ? $fgrp->{lei}->qerr("# @cmd @kv") :
run_die([@cmd, @kv], undef, $opt);
}
- push @{$self->{fgrp_todo}->{$fgrp->{-osdir}}}, $fgrp;
+ push @{$FGRP_TODO->{$fgrp->{-osdir}}}, $fgrp;
}
sub clone_v1 {
- my ($self, $nohang) = @_;
+ my ($self, $end) = @_;
my $lei = $self->{lei};
my $curl = $self->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
my $uri = URI->new($self->{cur_src} // $self->{src});
my $resume = -d $dst;
if (my $fgrp = forkgroup_prep($self, $uri)) {
$fgrp->{-fini} = $fini;
- $resume ? fgrp_enqueue_maybe($self, $fgrp) :
- fgrp_enqueue($self, $fgrp);
+ $resume ? cmp_fp_do($fgrp, \&fgrp_enqueue, $end)
+ : fgrp_enqueue($fgrp, $end);
} elsif ($resume) {
- resume_fetch_maybe($self, $uri, $fini);
+ cmp_fp_do($self, \&resume_fetch, $uri, $fini);
} else { # normal clone
my $cmd = [ @{$self->{-torsocks}},
clone_cmd($lei, my $opt = {}), "$uri", $dst ];
my $d = $self->{-ent} ? $self->{-ent}->{description} : undef;
$self->{'txt.description'} = $d if defined $d;
- (!defined($d) && !$nohang) and
+ (!defined($d) && !$end) and
_get_txt_start($self, 'description', $fini);
- $nohang or do_reap($self, 1); # for non-manifest clone
+ $end or do_reap($self, 1); # for non-manifest clone
}
sub parse_epochs ($$) {
push @{$self->{chg}->{fp_mismatch}}, $self->{-key};
}
+# modifies the to-be-written manifest entry, and sets values from it, too
sub update_ent {
my ($self) = @_;
my $key = $self->{-key} // die 'BUG: no -key';
my $done = PublicInbox::OnDestroy->new($$, \&up_fp_done, $self);
start_cmd($self, $cmd, $opt, $done);
}
+
+ $new = $self->{-ent}->{head};
+ $cur = $self->{-local_manifest}->{$key}->{head} // "\0";
+ if (defined($new) && $new ne $cur) {
+ # n.b. grokmirror writes raw contents to $dst/HEAD w/o locking
+ my $cmd = [ 'git', "--git-dir=$dst" ];
+ if ($new =~ s/\Aref: //) {
+ push @$cmd, qw(symbolic-ref HEAD), $new;
+ } elsif ($new =~ /\A[a-f0-9]{40,}\z/) {
+ push @$cmd, qw(update-ref --no-deref HEAD), $new;
+ } else {
+ undef $cmd;
+ warn "W: $key: {head} => `$new' not understood\n";
+ }
+ start_cmd($self, $cmd, { 2 => $self->{lei}->{2} }) if $cmd;
+ }
+ if (my $symlinks = $self->{-ent}->{symlinks}) {
+ my $top = File::Spec->rel2abs($self->{dst});
+ for my $p (@$symlinks) {
+ my $ln = "$top/$p";
+ $ln =~ tr!/!/!s;
+ my (undef, $dn, $bn) = File::Spec->splitpath($ln);
+ File::Path::mkpath($dn);
+ my $tgt = "$top/$key";
+ $tgt = File::Spec->abs2rel($tgt, $dn);
+ if (lstat($ln)) {
+ if (-l _) {
+ next if readlink($ln) eq $tgt;
+ unlink($ln) or die "unlink($ln): $!";
+ } else {
+ push @{$self->{chg}->{badlink}}, $p;
+ }
+ }
+ symlink($tgt, $ln) or die "symlink($tgt, $ln): $!";
+ }
+ }
$new = $self->{-ent}->{owner} // return;
$cur = $self->{-local_manifest}->{$key}->{owner} // "\0";
return if $cur eq $new;
my $dst = $self->{cur_dst} // $self->{dst};
my $want = parse_epochs($lei->{opt}->{epoch}, $v2_epochs);
my $task = $m ? bless { %$self }, __PACKAGE__ : $self;
- delete $task->{todo}; # $self->{todo} still exists
my (@skip, $desc);
my $fini = PublicInbox::OnDestroy->new($$, \&v2_done, $task);
for my $nr (sort { $a <=> $b } keys %$v2_epochs) {
$etask->{cur_dst} = $edst;
$etask->{-is_epoch} = $fini;
my $ref = $ent->{reference} // '';
- push @{$self->{todo}->{$ref}}, $etask;
+ push @{$TODO->{$ref}}, $etask;
$self->{any_want}->{$key} = 1;
} else { # create a placeholder so users only need to chmod +w
init_placeholder($src, $edst, $ent);
sub clone_all {
my ($self, $m) = @_;
- my $todo = delete $self->{todo};
- my $nodep = delete $todo->{''};
-
- # do not download unwanted deps
- my $any_want = delete $self->{any_want};
- my @unwanted = grep { !$any_want->{$_} } keys %$todo;
- my @nodep = delete(@$todo{@unwanted});
- push(@$nodep, @$_) for @nodep;
-
- # handle no-dependency repos, first
- for (@$nodep) {
- clone_v1($_, 1);
- return if !keep_going($self);
+ my $todo = $TODO;
+ $TODO = \'BUG on further use';
+ my $end = PublicInbox::OnDestroy->new($$, \&fgrp_fetch_all, $self);
+ {
+ my $nodep = delete $todo->{''};
+
+ # do not download unwanted deps
+ my $any_want = delete $self->{any_want};
+ my @unwanted = grep { !$any_want->{$_} } keys %$todo;
+ my @nodep = delete(@$todo{@unwanted});
+ push(@$nodep, @$_) for @nodep;
+
+ # handle no-dependency repos, first
+ for (@$nodep) {
+ clone_v1($_, $end);
+ return if !keep_going($self);
+ }
}
# resolve references, deepest, first:
while (scalar keys %$todo) {
}
my $y = delete $todo->{$x} // next; # already done
for (@$y) {
- clone_v1($_, 1);
+ clone_v1($_, $end);
return if !keep_going($self);
}
last; # restart %$todo iteration
}
}
- do_reap($self, 1); # finish all fingerprint checks
- fgrp_fetch_all($self);
+
+ # $end->DESTROY will call fgrp_fetch_all once all references
+ # in $LIVE are gone, and do_reap will eventually drain $LIVE
+ $end = undef;
do_reap($self, 1);
}
}
my $ft = File::Temp->new(TEMPLATE => '.manifest-XXXX', %opt);
my $cmd = $curl->for_uri($lei, $uri, qw(-f -R -o), $ft->filename);
+ push(@$cmd, '-z', $manifest) if -f $manifest;
my $mf_url = "$uri";
%opt = map { $_ => $lei->{$_} } (0..2);
my $cerr = run_reap($lei, $cmd, \%opt);
return try_scrape($self) if ($cerr >> 8) == 22; # 404 missing
return $lei->child_error($cerr, "@$cmd failed");
}
+
+ # bail out if curl -z/--timecond hit 304 Not Modified, $ft will be empty
+ return $lei->qerr("# $manifest unchanged") if -f $manifest && !-s $ft;
+
my $m = eval { decode_manifest($ft, $ft, $uri) };
if ($@) {
warn $@;
my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m);
return $lei->child_error(1, $multi) if !ref($multi);
my $v2 = delete $multi->{v2};
- local $self->{todo} = {};
- local $self->{fgrp_todo} = {}; # { objstore_dir => [fgrp, ...] }
if ($v2) {
for my $name (sort keys %$v2) {
my $epochs = delete $v2->{$name};
EOM
$task->{cur_src} .= '/';
my $dep = $task->{-ent}->{reference} // '';
- push @{$self->{todo}->{$dep}}, $task; # for clone_all
+ push @{$TODO->{$dep}}, $task; # for clone_all
$self->{any_want}->{$name} = 1;
}
}
EOM
}
dump_manifest($m => $ft) if delete($self->{chg}->{manifest}) || $mis;
+ my $bad = delete $self->{chg}->{badlink};
+ warn(<<EOM, map { ("\t", $_, "\n") } @$bad) if $bad;
+W: The following exist and have not been converted to symlinks
+EOM
ft_rename($ft, $manifest, 0666);
}
$self->{"-$k"} = $v;
}
local $LIVE = {};
+ local $TODO = {};
+ local $FGRP_TODO = {};
my $iv = $lei->{opt}->{'inbox-version'} //
return start_clone_url($self);
return clone_v1($self) if $iv == 1;