our $LIVE; # pid => callback
our $FGRP_TODO; # objstore -> [ fgrp mirror objects ]
our $TODO; # reference => [ non-fgrp mirror objects ]
+our @PUH; # post-update hooks
sub keep_going ($) {
$LIVE && (!$_[0]->{lei}->{child_error} ||
$_[0]->{lei}->{opt}->{'keep-going'});
}
-sub _wq_done_wait { # dwaitpid callback (via wq_eof)
- my ($arg, $pid) = @_;
- my ($mrr, $lei) = @$arg;
+sub _wq_done_wait { # awaitpid cb (via wq_eof / IPC->awaitpid_init)
+ my ($pid, $mrr, $lei) = @_;
if ($?) {
$lei->child_error($?);
} elsif (!$lei->{child_error}) {
my ($k) = ($sw =~ /\A([\w-]+)/);
$opt->{$k} = $lei->{opt}->{$k};
}
- # force synchronous dwaitpid for v2:
+ # force synchronous awaitpid for v2:
local $PublicInbox::DS::in_loop = 0;
my $cfg = PublicInbox::Config->new(undef, $lei->{2});
my $env = PublicInbox::Admin::index_prepare($opt, $cfg);
my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
qw(update-ref --stdin -z) ];
my $lei = $fgrp->{lei};
- my $pack = PublicInbox::OnDestroy->new($$, \&pack_dst, $fgrp);
+ my $pack = PublicInbox::OnDestroy->new($$, \&satellite_done, $fgrp);
start_cmd($fgrp, $cmd, { 0 => $r, 2 => $lei->{2} }, $pack);
close $r or die "close(r): $!";
return if $fgrp->{dry_run};
close($w) or warn "E: close(update-ref --stdin): $! (need git 1.8.5+)\n";
}
-sub pack_dst { # packs lightweight satellite repos
+sub satellite_done {
my ($fgrp) = @_;
pack_refs($fgrp, $fgrp->{cur_dst});
+ run_puh($fgrp);
}
sub pack_refs {
}
sub fp_done {
- my ($self, $cb, @arg) = @_;
+ my ($self, $cmd, $cb, @arg) = @_;
+ if ($?) {
+ $self->{lei}->err("@$cmd failed (\$?=$?) (non-fatal)");
+ $? = 0; # don't let it influence normal exit
+ }
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): $!";
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, $cb, @arg);
- start_cmd($self, $cmd, $opt, $done);
+ do_reap($self);
+ $self->{lei}->qerr("# @$cmd");
+ $LIVE->{spawn($cmd, undef, $opt)} = [ \&fp_done, $self, $cmd,
+ $cb, @arg ];
}
sub resume_fetch {
my $cmd = [ @{$self->{-torsocks}}, @git,
fetch_args($self->{lei}, $opt), $rn ];
push @$cmd, '-P' if $self->{lei}->{prune}; # --prune-tags implied
- start_cmd($self, $cmd, $opt, $fini);
+ my $run_puh = PublicInbox::OnDestroy->new($$, \&run_puh, $self, $fini);
+ ++$self->{chg}->{nr_chg};
+ start_cmd($self, $cmd, $opt, $run_puh);
}
sub fgrp_enqueue {
$fgrp->{dry_run} ? $fgrp->{lei}->qerr("# @cmd @kv") :
run_die([@cmd, @kv], undef, $opt);
}
+ ++$fgrp->{chg}->{nr_chg};
push @{$FGRP_TODO->{$fgrp->{-osdir}}}, $fgrp;
}
"$self->{dst}$ref";
}
}
- start_cmd($self, $cmd, $opt, $fini);
+ ++$self->{chg}->{nr_chg};
+ start_cmd($self, $cmd, $opt, PublicInbox::OnDestroy->new($$,
+ \&run_puh, $self, $fini));
}
if (!$self->{-is_epoch} && $lei->{opt}->{'inbox-config'} =~
/\A(?:always|v1)\z/s) {
ft_rename($ft, "$dn/$bn", 0666);
}
+sub run_next_puh {
+ my ($self) = @_;
+ my $puh = shift @{$self->{-puh_todo}} // return delete($self->{-fini});
+ my $fini = PublicInbox::OnDestroy->new($$, \&run_next_puh, $self);
+ my $cmd = [ @$puh, ($self->{cur_dst} // $self->{dst}) ];
+ my $opt = +{ map { $_ => $self->{lei}->{$_} } (0..2) };
+ start_cmd($self, $cmd, undef, $opt, $fini);
+}
+
+sub run_puh {
+ my ($self, $fini) = @_;
+ $self->{-fini} = $fini;
+ @{$self->{-puh_todo}} = @PUH;
+ run_next_puh($self);
+}
+
# modifies the to-be-written manifest entry, and sets values from it, too
sub update_ent {
my ($self) = @_;
}
}
symlink($tgt, $ln) or die "symlink($tgt, $ln): $!";
+ ++$self->{chg}->{nr_chg};
}
}
if (defined(my $t = $self->{-ent}->{modified})) {
warn "\t", $_, "\n" for @local;
my (undef, $dn, $bn) = File::Spec->splitpath($f);
- atomic_write($dn, $bn, join("\n", @list, ''));
+ $self->{chg}->{nr_chg} += scalar(@remote) + scalar(@local);
+ my $new = join("\n", @list, '');
+ atomic_write($dn, $bn, $new) if $new ne $old;
}
# FIXME: this gets confused by single inbox instance w/ global manifest.js.gz
}
# bail out if curl -z/--timecond hit 304 Not Modified, $ft will be empty
- return $lei->qerr("# $manifest unchanged") if -f $manifest && !-s $ft;
+ if (-f $manifest && !-s $ft) {
+ $lei->child_error(127 << 8) if $lei->{opt}->{'exit-code'};
+ return $lei->qerr("# $manifest unchanged");
+ }
my $m = eval { decode_manifest($ft, $ft, $uri) };
if ($@) {
EOM
dump_project_list($self, $m);
ft_rename($ft, $manifest, 0666);
+ !$self->{chg}->{nr_chg} && $lei->{opt}->{'exit-code'} and
+ $lei->child_error(127 << 8);
}
sub start_clone_url {
$self->{dry_run} = 1 if $lei->{opt}->{'dry-run'};
umask($lei->{client_umask}) if defined $lei->{client_umask};
$self->{-initial_clone} = 1 if !-d $self->{dst};
+ local @PUH;
+ if (defined(my $puh = $lei->{opt}->{'post-update-hook'})) {
+ require Text::ParseWords;
+ @PUH = map { [ Text::ParseWords::shellwords($_) ] } @$puh;
+ }
eval {
my $ic = $lei->{opt}->{'inbox-config'} //= 'always';
$ic =~ /\A(?:v1|v2|always|never)\z/s or die <<"";