lei_store: use per-machine refname as git HEAD

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

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 553adbc8f84d4cdf4b79935330098ddce0d28203..a17c7bab423d26c90055a54fe6b0fa0731707bdc 100644 (file)
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -60,6 +60,24 @@ 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;
@@ -78,8 +96,8 @@ sub importer {
        while (1) {
                my $latest = "$pfx/$max.git";
                my $old = -e $latest;
+               PublicInbox::Import::init_bare($latest, host_head);
                my $git = PublicInbox::Git->new($latest);
-               PublicInbox::Import::init_bare({ git => $git });
                $git->qx(qw(config core.sharedRepository 0600)) if !$old;
                my $packed_bytes = $git->packed_bytes;
                my $unpacked_bytes = $packed_bytes / $self->packing_factor;
@@ -92,6 +110,7 @@ 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;
        }
 }