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} ||
sub pack_dst { # packs lightweight satellite repos
my ($fgrp) = @_;
pack_refs($fgrp, $fgrp->{cur_dst});
- delete($fgrp->{-fini}) // die 'BUG: no {-fini}'; # call v1_done
}
sub pack_refs {
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
}
sub fgrp_enqueue {
- my ($fgrp) = @_;
+ 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
$fgrp->{dry_run} ? $fgrp->{lei}->qerr("# @cmd @kv") :
run_die([@cmd, @kv], undef, $opt);
}
- $fgrp->{fgrp_todo} // die 'BUG: no fgrp_todo';
- push @{$fgrp->{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 ? cmp_fp_do($fgrp, \&fgrp_enqueue) : fgrp_enqueue($fgrp)
+ $resume ? cmp_fp_do($fgrp, \&fgrp_enqueue, $end)
+ : fgrp_enqueue($fgrp, $end);
} elsif ($resume) {
cmp_fp_do($self, \&resume_fetch, $uri, $fini);
} else { # normal clone
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 $todo = $TODO;
+ $TODO = \'BUG on further use';
+ my $end = PublicInbox::OnDestroy->new($$, \&fgrp_fetch_all, $self);
{
my $nodep = delete $todo->{''};
# handle no-dependency repos, first
for (@$nodep) {
- clone_v1($_, 1);
+ clone_v1($_, $end);
return if !keep_going($self);
}
}
}
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;