lei_mirror: preserve permissions of existing alternates file

[public-inbox.git] / lib / PublicInbox / LeiMirror.pm

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 2f96058a949c2d140ad1db595d047ede6aa5ec42..829740bc456ae7403ed70f857d71a0852a46eba0 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -113,9 +113,9 @@ sub clone_cmd {
        @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;
@@ -218,8 +218,6 @@ sub set_description ($) {
 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
@@ -336,16 +334,21 @@ sub fgrp_update {
        }
 }
 
+sub pack_refs {
+       my ($self, $git_dir) = @_;
+       do_reap($self);
+       my $cmd = [ 'git', "--git-dir=$git_dir", qw(pack-refs --all --prune) ];
+       $self->{lei}->qerr("# @$cmd");
+       my $opt = { 1 => $self->{lei}->{1}, 2 => $self->{lei}->{2} };
+       $LIVE->{spawn($cmd, undef, $opt)} = [ \&reap_cmd, $self, $cmd ];
+}
+
 sub fgrp_fetched {
        my ($fgrp) = @_;
        return if $fgrp->{dry_run} || !$LIVE;
        my $rn = $fgrp->{-remote};
        my %opt = map { $_ => $fgrp->{lei}->{$_} } (0..2);
-       my $cmd = [ 'git', "--git-dir=$fgrp->{-osdir}",
-                       qw(pack-refs --all --prune) ];
-       do_reap($fgrp);
-       $fgrp->{lei}->qerr("# @$cmd");
-       $LIVE->{spawn($cmd, undef, \%opt)} = [ \&reap_cmd, $fgrp, $cmd ];
+       pack_refs($fgrp, $fgrp->{-osdir}); # objstore refs always packed
 
        $update_ref_stdin or return fgrp_update_old($fgrp);
 
@@ -372,7 +375,7 @@ sub fgrp_fetched {
 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);
@@ -402,11 +405,14 @@ sub forkgroup_prep {
        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/*") {
+       # --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}) {
                my $alt = File::Spec->rel2abs("$dir/objects");
                PublicInbox::Import::init_bare($self->{cur_dst});
@@ -559,20 +565,25 @@ sub v1_done { # called via OnDestroy
                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);
@@ -597,6 +608,8 @@ sub v2_done { # called via OnDestroy
        }
        write_makefile($dst, 2);
        undef $lck; # unlock
+       eval { set_description($self) };
+       warn $@ if $@;
        index_cloned_inbox($self, 2);
 }