sub new { bless {}, __PACKAGE__ }
-sub fetch_cmd ($$) {
+sub fetch_args ($$) {
my ($lei, $opt) = @_;
- my @cmd = qw(git);
+ my @cmd; # (git --git-dir=...) to be added by caller
$opt->{$_} = $lei->{$_} for (0..2);
# we support "-c $key=$val" for arbitrary git config options
# e.g.: git -c http.proxy=socks5h://127.0.0.1:9050
sub do_manifest ($$$) {
my ($lei, $dir, $ibx_uri) = @_;
my $muri = URI->new("$ibx_uri/manifest.js.gz");
- my $ft = File::Temp->new(TEMPLATE => 'manifest-XXXX',
- UNLINK => 1, DIR => $dir);
+ my $ft = File::Temp->new(TEMPLATE => 'm-XXXX',
+ UNLINK => 1, DIR => $dir, SUFFIX => '.tmp');
my $fn = $ft->filename;
- my @opt = (qw(-R -o), $fn);
my $mf = "$dir/manifest.js.gz";
my $m0; # current manifest.js.gz contents
if (open my $fh, '<', $mf) {
};
$lei->err($@) if $@;
}
- my $curl_cmd = $lei->{curl}->for_uri($lei, $muri, @opt);
- my $opt = {};
+ my ($bn) = ($fn =~ m!/([^/]+)\z!);
+ my $curl_cmd = $lei->{curl}->for_uri($lei, $muri, qw(-R -o), $bn);
+ my $opt = { -C => $dir };
$opt->{$_} = $lei->{$_} for (0..2);
my $cerr = PublicInbox::LeiMirror::run_reap($lei, $curl_cmd, $opt);
if ($cerr) {
my $t1 = $cur->{modified} // next;
delete($mdiff->{$k}) if $f0 eq $f1 && $t0 == $t1;
}
- return unless keys %$mdiff;
+ unless (keys %$mdiff) {
+ $lei->child_error(127 << 8) if $lei->{opt}->{'exit-code'};
+ return;
+ }
my (undef, $v1_path, @v2_epochs) =
PublicInbox::LeiMirror::deduce_epochs($mdiff, $ibx_uri->path);
[ 200, $v1_path, \@v2_epochs, $muri, $ft, $mf ];
}
-sub do_fetch {
+sub get_fingerprint2 {
+ my ($git_dir) = @_;
+ require Digest::SHA;
+ my $rd = popen_rd([qw(git show-ref)], undef, { -C => $git_dir });
+ Digest::SHA::sha256(do { local $/; <$rd> });
+}
+
+sub do_fetch { # main entry point
my ($cls, $lei, $cd) = @_;
my $ibx_ver;
$lei->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
my $dir = PublicInbox::Admin::resolve_inboxdir($cd, \$ibx_ver);
- my ($ibx_uri, @git_dir, @epochs, $mg, @new_epoch);
+ my ($ibx_uri, @git_dir, @epochs, $mg, @new_epoch, $skip);
if ($ibx_ver == 1) {
my $url = remote_url($lei, $dir) //
die "E: $dir missing remote.origin.url\n";
my ($git_url, $epoch);
for my $nr (@epochs) { # try newest epoch, first
my $edir = "$dir/git/$nr.git";
+ unless (-d $edir && -w _) { # must be writable dir
+ $skip->{$nr} = 1;
+ next;
+ }
if (defined(my $url = remote_url($lei, $edir))) {
$git_url = $url;
$epoch = $nr;
warn "W: $edir missing remote.origin.url\n";
}
}
+ @epochs = grep { !$skip->{$_} } @epochs if $skip;
+ $skip //= {}; # makes code below easier
$git_url or die "Unable to determine git URL\n";
my $inbox_url = $git_url;
$inbox_url =~ s!/git/$epoch(?:\.git)?/?\z!! or
EOM
$ibx_uri = URI->new($inbox_url);
}
+ PublicInbox::LeiMirror::write_makefile($dir, $ibx_ver);
$lei->qerr("# inbox URL: $ibx_uri/");
my $res = do_manifest($lei, $dir, $ibx_uri) or return;
my ($code, $v1_path, $v2_epochs, $muri, $ft, $mf) = @$res;
# any pre-manifest.js.gz instances running? Just fetch all
# existing ones and unconditionally try cloning the next
$v2_epochs = [ map { "$dir/git/$_.git" } @epochs ];
- push @$v2_epochs, "$dir/git/".($epochs[-1] + 1) if @epochs;
+ if (@epochs) {
+ my $n = $epochs[-1] + 1;
+ push @$v2_epochs, "$dir/git/$n.git" if !$skip->{$n};
+ }
} else {
$code == 200 or die "BUG unexpected code $code\n";
}
defined($v1_path) and warn <<EOM;
E: got v1 `$v1_path' when expecting v2 epoch(s) in <$muri>, WTF?
EOM
- @git_dir = map { "$dir/git/$_.git" } sort { $a <=> $b }
- map { my ($nr) = (m!/([0-9]+)\.git\z!g) } @$v2_epochs;
+ @git_dir = map { "$dir/git/$_.git" } sort { $a <=> $b } map {
+ my ($nr) = (m!/([0-9]+)\.git\z!g);
+ $skip->{$nr} ? () : $nr;
+ } @$v2_epochs;
} else {
$git_dir[0] = $dir;
}
# n.b. this expects all epochs are from the same host
my $torsocks = $lei->{curl}->torsocks($lei, $muri);
+ my $fp2 = $lei->{opt}->{'exit-code'} ? [] : undef;
+ my $xit = 127;
for my $d (@git_dir) {
my $cmd;
my $opt = {}; # for spawn
if (-d $d) {
- $opt->{-C} = $d;
- $cmd = [ @$torsocks, fetch_cmd($lei, $opt) ];
+ $fp2->[0] = get_fingerprint2($d) if $fp2;
+ $cmd = [ @$torsocks, 'git', "--git-dir=$d",
+ fetch_args($lei, $opt) ];
} else {
my $e_uri = $ibx_uri->clone;
my ($epath) = ($d =~ m!(/git/[0-9]+\.git)\z!);
PublicInbox::LeiMirror::clone_cmd($lei, $opt),
$$e_uri, $d];
push @new_epoch, substr($epath, 5, -4) + 0;
+ $xit = 0;
}
my $cerr = PublicInbox::LeiMirror::run_reap($lei, $cmd, $opt);
# do not bail on clone failure if we didn't have a manifest
$lei->child_error($cerr, "@$cmd failed");
return;
}
+ if ($fp2 && $xit) {
+ $fp2->[1] = get_fingerprint2($d);
+ $xit = 0 if $fp2->[0] ne $fp2->[1];
+ }
}
for my $i (@new_epoch) { $mg->epoch_cfg_set($i) }
if ($ft) {
rename($fn, $mf) or die "E: rename($fn, $mf): $!\n";
$ft->unlink_on_destroy(0);
}
+ $lei->child_error($xit << 8) if $fp2 && $xit;
}
1;