use Digest::SHA qw(sha256_hex);
our $LIVE; # pid => callback
-my $update_ref_stdin = $ENV{GIT_CAN_UPDATE_REF_STDIN} // 1;
sub _wq_done_wait { # dwaitpid callback (via wq_eof)
my ($arg, $pid) = @_;
@cmd;
}
-sub ft_rename ($$$) {
- my ($ft, $dst, $open_mode) = @_;
- my @st = stat($dst);
+sub ft_rename ($$$;$) {
+ my ($ft, $dst, $open_mode, $fh) = @_;
+ my @st = stat($fh // $dst);
my $mode = @st ? ($st[2] & 07777) : ($open_mode & ~umask);
chmod($mode, $ft) or croak "E: chmod($ft): $!";
require File::Copy;
sub index_cloned_inbox {
my ($self, $iv) = @_;
my $lei = $self->{lei};
- eval { set_description($self) };
- warn $@ if $@;
# n.b. public-inbox-clone works w/o (SQLite || Xapian)
# lei is useless without Xapian + SQLite
@cmd;
}
-sub fgrp_update_old ($) { # for git <1.8.5
- my ($fgrp) = @_;
- my $cmd = [ @{$fgrp->{-torsocks}}, 'git', "--git-dir=$fgrp->{cur_dst}",
- fetch_args($fgrp->{lei}, my $opt = {}) ];
- $fgrp->{lei}->qerr("# @$cmd");
- do_reap($fgrp);
- $LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $fgrp, $cmd ];
-}
-
sub upr { # feed `git update-ref --stdin -z' verbosely
- my ($fgrp, $w, $op, $ref, $oid) = @_;
- $fgrp->{lei}->qerr("# $op $ref $oid");
+ 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): $!";
}
pipe(my ($r, $w)) or die "pipe: $!";
my $cmd = [ 'git', "--git-dir=$fgrp->{cur_dst}",
qw(update-ref --stdin -z) ];
- $fgrp->{lei}->qerr("# @$cmd");
- my $opt = { 0 => $r, 1 => $fgrp->{lei}->{1}, 2 => $fgrp->{lei}->{2} };
+ my $lei = $fgrp->{lei};
+ $lei->qerr("# @$cmd");
+ my $opt = { 0 => $r, 1 => $lei->{1}, 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($fgrp, $w, 'update', $ref, $new) if $new ne $old;
+ upr($lei, $w, 'update', $ref, $new) if $new ne $old;
} else {
- upr($fgrp, $w, 'delete', $ref, $old);
+ upr($lei, $w, 'delete', $ref, $old);
}
}
while (my ($ref, $oid) = each %src) {
- upr($fgrp, $w, 'create', $ref, $oid);
- }
- if (close($w)) { # git >= 1.8.5
- $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $cmd ];
- do_reap($fgrp);
- } else { # git <1.8.5 w/o update-ref --stdin
- warn "E: close(update-ref --stdin): $!\n";
- $update_ref_stdin = 0;
- waitpid($pid, 0) // die "waitpid(update-ref --stdin): $!";
- fgrp_update_old($fgrp);
+ upr($lei, $w, 'create', $ref, $oid);
}
+ close($w) or warn "E: close(update-ref --stdin): $! (need git 1.8.5+)\n";
+ $LIVE->{$pid} = [ \&reap_cmd, $fgrp, $cmd ];
+ do_reap($fgrp);
}
sub pack_refs {
my %opt = map { $_ => $fgrp->{lei}->{$_} } (0..2);
pack_refs($fgrp, $fgrp->{-osdir}); # objstore refs always packed
- $update_ref_stdin or return fgrp_update_old($fgrp);
-
my $update_ref = PublicInbox::OnDestroy->new($$, \&fgrp_update, $fgrp);
my $src = [ 'git', "--git-dir=$fgrp->{-osdir}", 'for-each-ref',
sub fgrp_fetch {
my ($fgrp, $fini) = @_;
my $cmd = [ @{$fgrp->{-torsocks}}, 'git', "--git-dir=$fgrp->{-osdir}",
- fetch_args($fgrp->{lei}, my $opt = {}),
+ fetch_args($fgrp->{lei}, my $opt = {}), '--no-tags',
$fgrp->{-remote} ];
$fgrp->{-fini} = $fini;
do_reap($fgrp);
my $dir = "$os/$fg.git";
my @cmd = ('git', "--git-dir=$dir", 'config');
my $opt = +{ map { $_ => $self->{lei}->{$_} } (0..2) };
- if (!-d $dir) {
+ if (!-d $dir && !$self->{dry_run}) {
PublicInbox::Import::init_bare($dir);
for ('repack.useDeltaIslands=true',
'pack.island=refs/remotes/([^/]+)/') {
}
}
my $key = $self->{-key} // die 'BUG: no -key';
- my ($bn) = ($key =~ m{/([a-z0-9_,;=!\+\{\}\|][^/]*)(?:\.git)?\z}i);
- my $rn = "$bn-".substr(sha256_hex($key), 0, 16);
- for ("url=$uri", "fetch=+refs/*:refs/remotes/$rn/*") {
- my @kv = split(/=/, $_, 2);
- $kv[0] = "remote.$rn.$kv[0]";
- run_die([@cmd, @kv], undef, $opt);
+ my $rn = $key;
+ $rn =~ s!\A[\./]+!!s;
+ $rn =~ s/\.*?(?:\.git)?\.*?\z//s;
+ $rn =~ s![\@\{\}/:\?\[\]\^~\s\f[:cntrl:]\*]!_!isg;
+ $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);
+ }
}
$self->{-do_pack_refs} = 1; # likely coderepo
- if (!-d $self->{cur_dst}) {
+ if (!-d $self->{cur_dst} && !$self->{dry_run}) {
my $alt = File::Spec->rel2abs("$dir/objects");
PublicInbox::Import::init_bare($self->{cur_dst});
my $o = "$self->{cur_dst}/objects";
say $fh $l or die "say($f): $!";
}
close $fh or die "close($f): $!";
- @cmd = ('git', "--git-dir=$self->{cur_dst}",
- qw(remote add --mirror=fetch origin), "$uri");
- my $pid = spawn(\@cmd, undef, $opt);
- waitpid($pid, 0) // die "waitpid(@cmd): $!";
- die "E: @cmd: \$?=$?" if ($? && ($? >> 8) != 3);
+ $f = "$self->{cur_dst}/config";
+ open $fh, '+>>', $f or die "open:($f): $!";
+ print $fh <<EOM or die "print($f): $!";
+; rely on the "$rn" remote in the
+; $fg fork group for fetches
+; only uncomment the following iff you detach from fork groups
+; [remote "origin"]
+; url = $uri
+; fetch = +refs/*:refs/*
+; mirror = true
+EOM
+ close $fh or die "close($f): $!";
}
bless { %$self, -osdir => $dir, -remote => $rn }, __PACKAGE__;
}
run_die([qw(git config -f), "$dst/config", 'gitweb.owner', $o]);
}
my $o = "$dst/objects";
- if (open(my $fh, '<', "$o/info/alternates")) {
+ if (open(my $fh, '<', my $fn = "$o/info/alternates")) {;
my $base = File::Spec->rel2abs($o);
- chomp(my @l = <$fh>);
+ my @l = <$fh>;
+ my $ft;
for (@l) {
- $_ = File::Spec->abs2rel($_, $base) if m!\A/!;
- $_ .= "\n";
+ next unless m!\A/!;
+ $_ = File::Spec->abs2rel($_, $base);
+ $ft //= File::Temp->new(TEMPLATE => '.XXXX',
+ DIR => "$o/info");
+ }
+ if ($ft) {
+ print $ft @l or die "print($ft): $!";
+ $ft->flush or die "flush($ft): $!";
+ ft_rename($ft, $fn, 0666, $fh);
}
- my $f = File::Temp->new(TEMPLATE => '.XXXX', DIR => "$o/info");
- print $f @l;
- $f->flush or die "flush($f): $!";
- rename($f->filename, "$o/info/alternates") or
- die "rename($f, $o/info/alternates): $!";
- $f->unlink_on_destroy(0);
}
pack_refs($self, $dst) if delete $self->{-do_pack_refs};
+ eval { set_description($self) };
+ warn $@ if $@;
return if ($self->{-is_epoch} ||
$self->{lei}->{opt}->{'inbox-config'} ne 'always');
write_makefile($dst, 1);
}
write_makefile($dst, 2);
undef $lck; # unlock
+ eval { set_description($self) };
+ warn $@ if $@;
index_cloned_inbox($self, 2);
}