From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1200D2019D for ; Mon, 28 Nov 2022 05:32:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1669613564; bh=1PTalXeoEwiniP1y8vdgWLEzEWf1vRuqrhXfrZj/430=; h=From:To:Subject:Date:In-Reply-To:References:From; b=RCU11LbkAIv4GTzT68HNRwf0Dxopis7FqTP/WgrKgaTT386alVrlOnlQxeS3qTtnX HtIFYTMTlPtLVa4Li5VUfBsXcJp6hsphyxKUTvE3Cir6jiDT9kaT0fISX3vbXb3QS8 98CUPElj3Mbkfc3ELwGIKd3BO7OfaJwaw1wM6iJM= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 54/95] lei_mirror: drop git <1.8.5 support Date: Mon, 28 Nov 2022 05:31:51 +0000 Message-Id: <20221128053232.291618-55-e@80x24.org> In-Reply-To: <20221128053232.291618-1-e@80x24.org> References: <20221128053232.291618-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Supporting git <1.8.5 via fetch on non-forkgroup repos would make auto-GC dangerous, and I want to support auto-GC instead of relying on the preciousObjects extension. Since git 1.8.5 is 9 years old at this point, and grokmirror (used by the only CentOS 7.x user I know of) already relies on newer git, simplify our code and only fetch into forkgroups. --- lib/PublicInbox/LeiMirror.pm | 41 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index 1138a82d..28fef6f9 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -21,7 +21,6 @@ use PublicInbox::OnDestroy; 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) = @_; @@ -279,15 +278,6 @@ sub fetch_args ($$) { @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 ($lei, $w, $op, $ref, $oid) = @_; $lei->qerr("# $op $ref $oid") if $lei->{opt}->{verbose}; @@ -324,15 +314,9 @@ sub fgrp_update { while (my ($ref, $oid) = each %src) { upr($lei, $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); - } + 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 { @@ -351,8 +335,6 @@ sub fgrp_fetched { 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', @@ -427,11 +409,18 @@ sub forkgroup_prep { 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 < $dir, -remote => $rn }, __PACKAGE__; }