$self->{lei}->child_error($cerr, "@$cmd failed (\$?=$cerr)") if $cerr;
}
+sub up_fp_done {
+ my ($self) = @_;
+ return if !keep_going($self);
+ my $fh = delete $self->{-show_ref_up} // 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 eq $B;
+ $self->{-ent}->{fingerprint} = $B;
+ push @{$self->{chg}->{fp_mismatch}}, $self->{-key};
+}
+
+sub update_ent {
+ my ($self) = @_;
+ my $key = $self->{-key} // die 'BUG: no -key';
+ my $new = $self->{-ent}->{fingerprint};
+ my $cur = $self->{-local_manifest}->{$key}->{fingerprint} // "\0";
+ my $dst = $self->{cur_dst} // $self->{dst};
+ if (defined($new) && $new ne $cur) {
+ 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_up} = $opt->{1};
+ my $done = PublicInbox::OnDestroy->new($$, \&up_fp_done, $self);
+ start_cmd($self, $cmd, $opt, $done);
+ }
+ $new = $self->{-ent}->{owner} // return;
+ $cur = $self->{-local_manifest}->{$key}->{owner} // "\0";
+ return if $cur eq $new;
+ my $cmd = [ qw(git config -f), "$dst/config", 'gitweb.owner', $new ];
+ start_cmd($self, $cmd, { 2 => $self->{lei}->{2} });
+}
+
sub v1_done { # called via OnDestroy
my ($self) = @_;
return if $self->{dry_run} || !keep_going($self);
_write_inbox_config($self);
my $dst = $self->{cur_dst} // $self->{dst};
- if (defined(my $o = $self->{-ent} ? $self->{-ent}->{owner} : undef)) {
- 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]);
- }
+ update_ent($self) if $self->{-ent};
my $o = "$dst/objects";
if (open(my $fh, '<', my $fn = "$o/info/alternates")) {;
my $base = File::Spec->rel2abs($o);
}
}
# filter out the epochs we skipped
- $self->{-culled_manifest} = 1 if $m && delete(@$m{@skip});
+ $self->{chg}->{manifest} = 1 if $m && delete(@$m{@skip});
(!$self->{dry_run} && !-d $dst) and File::Path::mkpath($dst);
if (open(my $fh, '<', $fn)) {
decode_manifest($fh, $fn, $fn);
} elsif ($!{ENOENT}) { # non-fatal, we can just do it slowly
- warn "open($fn): $!\n" if -d $self->{dst};
+ warn "open($fn): $!\n" if !$self->{-initial_clone};
undef;
} else {
die "open($fn): $!\n";
$self->{lei}->glob2re($_) // qr/\A\Q$_\E/
} @$incl).'\\z)';
my @gone = delete @$v2{grep(!/$re/, keys %$v2)};
- delete @$m{map { @$_ } @gone} and $self->{-culled_manifest} = 1;
- delete @$m{grep(!/$re/, @v1)} and $self->{-culled_manifest} = 1;
+ delete @$m{map { @$_ } @gone} and $self->{chg}->{manifest} = 1;
+ delete @$m{grep(!/$re/, @v1)} and $self->{chg}->{manifest} = 1;
@v1 = grep(/$re/, @v1);
}
if (defined $excl) {
$self->{lei}->glob2re($_) // qr/\A\Q$_\E/
} @$excl).'\\z)';
my @gone = delete @$v2{grep(/$re/, keys %$v2)};
- delete @$m{map { @$_ } @gone} and $self->{-culled_manifest} = 1;
- delete @$m{grep(/$re/, @v1)} and $self->{-culled_manifest} = 1;
+ delete @$m{map { @$_ } @gone} and $self->{chg}->{manifest} = 1;
+ delete @$m{grep(/$re/, @v1)} and $self->{chg}->{manifest} = 1;
@v1 = grep(!/$re/, @v1);
}
my $ret; # { v1 => [ ... ], v2 => { "/$inbox_name" => [ epochs ] }}
my $path = $uri->path;
chop($path) eq '/' or die "BUG: $uri not canonicalized";
$uri->path($path . '/manifest.js.gz');
- my $ft = File::Temp->new(TEMPLATE => '.manifest-XXXX',
- UNLINK => 1, TMPDIR => 1, SUFFIX => '.tmp');
+ my $manifest = $self->{-manifest} // "$self->{dst}/manifest.js.gz";
+ my %opt = (UNLINK => 1, SUFFIX => '.tmp', TMPDIR => 1);
+ if (!$self->{dry_run} && $manifest =~ m!\A(.+?)/[^/]+\z! and -d $1) {
+ $opt{DIR} = $1; # allows fast rename(2) w/o EXDEV
+ delete $opt{TMPDIR};
+ }
+ my $ft = File::Temp->new(TEMPLATE => '.manifest-XXXX', %opt);
my $cmd = $curl->for_uri($lei, $uri, qw(-f -R -o), $ft->filename);
- my %opt = map { $_ => $lei->{$_} } (0..2);
+ my $mf_url = "$uri";
+ %opt = map { $_ => $lei->{$_} } (0..2);
my $cerr = run_reap($lei, $cmd, \%opt);
if ($cerr) {
return try_scrape($self) if ($cerr >> 8) == 22; # 404 missing
warn $@;
return try_scrape($self);
}
+ local $self->{chg} = {};
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);
return if $self->{dry_run} || !keep_going($self);
# set by clone_v2_prep/-I/--exclude
- dump_manifest($m => $ft) if delete $self->{-culled_manifest};
- ft_rename($ft, "$self->{dst}/manifest.js.gz", 0666);
+ my $mis = delete $self->{chg}->{fp_mismatch};
+ if ($mis) {
+ my $t = (stat($ft))[9];
+ require POSIX;
+ $t = POSIX::strftime('%Y-%m-%d %k:%M:%S %z', localtime($t));
+ warn <<EOM;
+W: Fingerprints for the following repositories do not match
+W: $mf_url @ $t:
+W: These repositories may have updated since $t:
+EOM
+ warn "\t", $_, "\n" for @$mis;
+ warn <<EOM if !$self->{lei}->{opt}->{prune};
+W: The above fingerprints may never match without --prune
+EOM
+ }
+ dump_manifest($m => $ft) if delete($self->{chg}->{manifest}) || $mis;
+ ft_rename($ft, $manifest, 0666);
open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait
}
my $lei = $self->{lei};
$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};
eval {
my $ic = $lei->{opt}->{'inbox-config'} //= 'always';
$ic =~ /\A(?:v1|v2|always|never)\z/s or die <<"";