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-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 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 ADF881FA13 for ; Thu, 31 Dec 2020 13:51:54 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 03/36] revert "lei_store: use per-machine refname as git HEAD" Date: Thu, 31 Dec 2020 13:51:21 +0000 Message-Id: <20201231135154.6070-4-e@80x24.org> In-Reply-To: <20201231135154.6070-1-e@80x24.org> References: <20201231135154.6070-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: In retrospect, per-machine HEADs was a bad idea because users of removable storage would be thrown off when moving storage between different machines. This is only a partial revert, the Import::init_bare change to support alternate head names still exists because we may use it for other reasons. --- lib/PublicInbox/LeiStore.pm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index a17c7bab..f8383d5e 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -60,24 +60,6 @@ sub git_ident ($) { ('lei user', 'x@example.com') } -# We will support users combining storage across multiple machines -# somehow. Use per-machine refnames to make it easy-to-identify -# where a message came from -sub host_head () { - state $h = do { - my $x = PublicInbox::ExtSearchIdx::host_ident; - # Similar rules found in git.git/remote.c::valid_remote_nick - # and git.git/refs.c::check_refname_component - $x =~ s!(?:\.lock|/)+\z!!gs; # must not end with ".lock" or "/" - $x =~ tr/././s; # no dot-dot, collapse them - $x =~ s/@\{/\@-/gs; - $x =~ s/\A\./-/s; - # no "*", ":", "?", "[", "\", "^", "~", SP, TAB; "]" is OK - $x =~ tr^a-zA-Z0-9!"#$%&'()+,\-.;<=>@]_`{|}^-^c; - $x - }; -} - sub importer { my ($self) = @_; my $max; @@ -96,7 +78,7 @@ sub importer { while (1) { my $latest = "$pfx/$max.git"; my $old = -e $latest; - PublicInbox::Import::init_bare($latest, host_head); + PublicInbox::Import::init_bare($latest); my $git = PublicInbox::Git->new($latest); $git->qx(qw(config core.sharedRepository 0600)) if !$old; my $packed_bytes = $git->packed_bytes; @@ -110,7 +92,6 @@ sub importer { $im->{bytes_added} = int($packed_bytes / $self->packing_factor); $im->{lock_path} = undef; $im->{path_type} = 'v2'; - $im->{'ref'} = host_head; return $im; } }