run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 04d2f83209851989f402b7161da3b7bb494b2e53..85f56acbae18e30eed54a52e342cb4a4885fa355 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Represents a public-inbox (which may have multiple mailing addresses)
@@ -87,7 +87,7 @@ sub _set_limiter ($$$) {
                my $mkey = $pfx.'max';
                my $val = $self->{$mkey} or return;
                my $lim;
-               if ($val =~ /\A\d+\z/) {
+               if ($val =~ /\A[0-9]+\z/) {
                        require PublicInbox::Qspawn;
                        $lim = PublicInbox::Qspawn::Limiter->new($val);
                } elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
@@ -125,11 +125,11 @@ sub new {
        bless $opts, $class;
 }
 
-sub git_part {
-       my ($self, $part) = @_;
+sub git_epoch {
+       my ($self, $epoch) = @_;
        ($self->{version} || 1) == 2 or return;
-       $self->{"$part.git"} ||= eval {
-               my $git_dir = "$self->{mainrepo}/git/$part.git";
+       $self->{"$epoch.git"} ||= eval {
+               my $git_dir = "$self->{mainrepo}/git/$epoch.git";
                my $g = PublicInbox::Git->new($git_dir);
                $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
                # no cleanup needed, we never cat-file off this, only clone
@@ -149,27 +149,27 @@ sub git {
        };
 }
 
-sub max_git_part {
+sub max_git_epoch {
        my ($self) = @_;
        my $v = $self->{version};
        return unless defined($v) && $v == 2;
-       my $part = $self->{-max_git_part};
+       my $cur = $self->{-max_git_epoch};
        my $changed = git($self)->alternates_changed;
-       if (!defined($part) || $changed) {
+       if (!defined($cur) || $changed) {
                $self->git->cleanup if $changed;
                my $gits = "$self->{mainrepo}/git";
                if (opendir my $dh, $gits) {
                        my $max = -1;
                        while (defined(my $git_dir = readdir($dh))) {
-                               $git_dir =~ m!\A(\d+)\.git\z! or next;
+                               $git_dir =~ m!\A([0-9]+)\.git\z! or next;
                                $max = $1 if $1 > $max;
                        }
-                       $part = $self->{-max_git_part} = $max if $max >= 0;
+                       $cur = $self->{-max_git_epoch} = $max if $max >= 0;
                } else {
                        warn "opendir $gits failed: $!\n";
                }
        }
-       $part;
+       $cur;
 }
 
 sub mm {
@@ -191,7 +191,7 @@ sub search ($;$) {
        my $srch = $self->{search} ||= eval {
                _cleanup_later($self);
                require PublicInbox::Search;
-               PublicInbox::Search->new($self, $self->{altid});
+               PublicInbox::Search->new($self);
        };
        ($over_only || eval { $srch->xdb }) ? $srch : undef;
 }