use PublicInbox::Inbox;
use PublicInbox::LeiCurl;
use PublicInbox::OnDestroy;
-use Digest::SHA qw(sha256_hex);
+use Digest::SHA qw(sha256_hex sha1_hex);
our $LIVE; # pid => callback
$ret;
}
-sub start_clone {
+sub start_cmd {
my ($self, $cmd, $opt, $fini) = @_;
do_reap($self);
$self->{lei}->qerr("# @$cmd");
push @cmd, '-q' if $lei->{opt}->{quiet} ||
($lei->{opt}->{jobs} // 1) > 1;
push @cmd, '-v' if $lei->{opt}->{verbose};
+ push(@cmd, '-p') if $lei->{opt}->{prune};
@cmd;
}
sub upr { # feed `git update-ref --stdin -z' verbosely
- 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): $!";
+ my ($lei, $w, $op, @rest) = @_; # ($ref, $oid) = @rest
+ $lei->qerr("# $op @rest") if $lei->{opt}->{verbose};
+ print $w "$op ", join("\0", @rest, '') or die "print(w): $!";
}
sub fgrp_update {
qw(update-ref --stdin -z) ];
my $lei = $fgrp->{lei};
$lei->qerr("# @$cmd");
- my $opt = { 0 => $r, 1 => $lei->{1}, 2 => $lei->{2} };
+ my $opt = { 0 => $r, 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($lei, $w, 'update', $ref, $new) if $new ne $old;
+ $new eq $old or
+ upr($lei, $w, 'update', $ref, $new, $old);
} else {
upr($lei, $w, 'delete', $ref, $old);
}
my $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
$self->{lei}->qerr("# @$cmd");
return if $self->{dry_run};
- my $opt = { 1 => $self->{lei}->{1}, 2 => $self->{lei}->{2} };
+ my $opt = { 2 => $self->{lei}->{2} };
$LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd ];
}
pack_refs($first, $first->{-osdir}); # objstore refs always packed
for my $fgrp (@$fgrpv) {
my $rn = $fgrp->{-remote};
- my %opt = map { $_ => $fgrp->{lei}->{$_} } (0..2);
+ my %opt = ( 2 => $fgrp->{lei}->{2} );
my $update_ref = $fgrp->{dry_run} ? undef :
PublicInbox::OnDestroy->new($$, \&fgrp_update, $fgrp);
$f, '--unset-all', "remotes.$grp"];
$self->{lei}->qerr("# @$cmd");
if (!$self->{dry_run}) {
- $pid = spawn($cmd);
+ $pid = spawn($cmd, undef, { 2 => $self->{lei}->{2} });
waitpid($pid, 0) // die "waitpid: $!";
die "E: @$cmd: \$?=$?" if ($? && ($? >> 8) != 5);
my $os = $self->{-objstore} // return;
my $fg = $self->{-ent}->{forkgroup} // return;
my $dir = "$os/$fg.git";
- my @cmd = ('git', "--git-dir=$dir", 'config');
- my $opt = +{ map { $_ => $self->{lei}->{$_} } (0..2) };
if (!-d $dir && !$self->{dry_run}) {
PublicInbox::Import::init_bare($dir);
+ my @cmd = ('git', "--git-dir=$dir", 'config');
+ my $opt = { 2 => $self->{lei}->{2} };
for ('repack.useDeltaIslands=true',
'pack.island=refs/remotes/([^/]+)/') {
run_die([@cmd, split(/=/, $_, 2)], undef, $opt);
}
my $key = $self->{-key} // die 'BUG: no -key';
my $rn = substr(sha256_hex($key), 0, 16);
- unless ($self->{dry_run}) {
- # --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);
- }
- }
if (!-d $self->{cur_dst} && !$self->{dry_run}) {
my $alt = File::Spec->rel2abs("$dir/objects");
PublicInbox::Import::init_bare($self->{cur_dst});
EOM
close $fh or die "close($f): $!";
}
- bless { %$self, -osdir => $dir, -remote => $rn }, __PACKAGE__;
+ bless {
+ %$self, -osdir => $dir, -remote => $rn, -uri => $uri
+ }, __PACKAGE__;
+}
+
+sub fp_done {
+ my ($self, $go_fetch) = @_;
+ 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;
+ $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';
+ 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;
+ }
+ 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);
+ 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) = @_;
+ my $dst = $self->{cur_dst} // $self->{dst};
+ my @git = ('git', "--git-dir=$dst");
+ my $opt = { 2 => $self->{lei}->{2} };
+ my $rn = 'origin'; # configurable?
+ for ("url=$uri", "fetch=+refs/*:refs/*", 'mirror=true') {
+ my @kv = split(/=/, $_, 2);
+ $kv[0] = "remote.$rn.$kv[0]";
+ next if $self->{dry_run};
+ run_die([@git, 'config', @kv], undef, $opt);
+ }
+ 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);
+}
+
+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) = @_;
+ my $opt = { 2 => $self->{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}';
+ my @cmd = ('git', "--git-dir=$fgrp->{-osdir}", 'config');
+ 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") :
+ run_die([@cmd, @kv], undef, $opt);
+ }
+ push @{$self->{fgrp_todo}->{$fgrp->{-osdir}}}, $fgrp;
}
sub clone_v1 {
$self->{-torsocks} //= $curl->torsocks($lei, $uri) or return;
my $dst = $self->{cur_dst} // $self->{dst};
my $fini = PublicInbox::OnDestroy->new($$, \&v1_done, $self);
+ my $resume = -d $dst;
if (my $fgrp = forkgroup_prep($self, $uri)) {
$fgrp->{-fini} = $fini;
- push @{$self->{fgrp_todo}->{$fgrp->{-osdir}}}, $fgrp;
- } else { # normal fetch
+ $resume ? fgrp_enqueue_maybe($self, $fgrp) :
+ fgrp_enqueue($self, $fgrp);
+ } elsif ($resume) {
+ resume_fetch_maybe($self, $uri, $fini);
+ } else { # normal clone
my $cmd = [ @{$self->{-torsocks}},
clone_cmd($lei, my $opt = {}), "$uri", $dst ];
if (defined($self->{-ent})) {
"$self->{dst}$ref";
}
}
- start_clone($self, $cmd, $opt, $fini);
+ start_cmd($self, $cmd, $opt, $fini);
}
if (!$self->{-is_epoch} && $lei->{opt}->{'inbox-config'} =~
/\A(?:always|v1)\z/s) {
_write_inbox_config($self);
my $dst = $self->{cur_dst} // $self->{dst};
if (defined(my $o = $self->{-ent} ? $self->{-ent}->{owner} : undef)) {
- run_die([qw(git config -f), "$dst/config", 'gitweb.owner', $o]);
+ my $key = $self->{-key} // die 'BUG: no -key';
+ my $cur = $self->{-local_manifest}->{$key}->{owner} // "\0";
+ $cur eq $o or run_die([qw(git config -f),
+ "$dst/config", 'gitweb.owner', $o]);
}
my $o = "$dst/objects";
if (open(my $fh, '<', my $fn = "$o/info/alternates")) {;
$m;
}
+sub load_current_manifest ($) {
+ my ($self) = @_;
+ my $fn = $self->{-manifest} // return;
+ if (open(my $fh, '<', $fn)) {
+ decode_manifest($fh, $fn, $fn);
+ } elsif ($!{ENOENT}) { # non-fatal, we can just do it slowly
+ warn "open($fn): $!\n";
+ undef;
+ } else {
+ die "open($fn): $!\n";
+ }
+}
+
sub multi_inbox ($$$) {
my ($self, $path, $m) = @_;
my $incl = $self->{lei}->{opt}->{include};
last; # restart %$todo iteration
}
}
+ do_reap($self, 1); # finish all fingerprint checks
fgrp_fetch_all($self);
do_reap($self, 1);
}
warn $@;
return try_scrape($self);
}
+ local $self->{-local_manifest} = load_current_manifest($self);
my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m);
return $lei->child_error(1, $multi) if !ref($multi);
my $v2 = delete $multi->{v2};
$ic =~ /\A(?:v1|v2|always|never)\z/s or die <<"";
--inbox-config must be one of `always', `v2', `v1', or `never'
- if (defined(my $os = $lei->{opt}->{objstore})) {
- $os = 'objstore' if $os eq ''; # --objstore w/o args
- $os = "$self->{dst}/$os" if $os !~ m!\A/!;
- $self->{-objstore} = $os;
+ # we support --objstore= and --manifest= with '' (empty string)
+ for my $default (qw(objstore manifest.js.gz)) {
+ my ($k) = (split(/\./, $default))[0];
+ my $v = $lei->{opt}->{$k} // next;
+ $v = $default if $v eq '';
+ $v = "$self->{dst}/$v" if $v !~ m!\A/!;
+ $self->{"-$k"} = $v;
}
local $LIVE;
my $iv = $lei->{opt}->{'inbox-version'} //