lei: replace --thread with --threads

Nobody is expected to use long options, but for consistency
with mairix(1), we'll use the pluralized option throughout
(including existing PublicInbox::{Search,SearchView}).

Link: https://public-inbox.org/meta/20210206090119.GA14519@dcvr/

7 files changed, 21 insertions, 21 deletions

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 818f2cfb..31e6b4a8 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -109,14 +109,14 @@ sub index_opt {
 # command => [ positional_args, 1-line description, Getopt::Long option spec ]
 our %CMD = ( # sorted in order of importance/use:
 'q' => [ '--stdin|SEARCH_TERMS...', 'search for messages matching terms', qw(
-        save-as=s output|mfolder|o=s format|f=s dedupe|d=s thread|t augment|a
+        save-as=s output|mfolder|o=s format|f=s dedupe|d=s threads|t augment|a
         sort|s=s reverse|r offset=i remote! local! external! pretty
         include|I=s@ exclude=s@ only=s@ jobs|j=s globoff|g stdin|
         mua=s no-torsocks torsocks=s verbose|v+ quiet|q),
         PublicInbox::LeiQuery::curl_opt(), opt_dash('limit|n=i', '[0-9]+') ],
 
 'show' => [ 'MID|OID', 'show a given object (Message-ID or object ID)',
-        qw(type=s solve! format|f=s dedupe|d=s thread|t remote local!),
+        qw(type=s solve! format|f=s dedupe|d=s threads|t remote local!),
         pass_through('git show') ],
 
 'add-external' => [ 'LOCATION',
@@ -135,9 +135,9 @@ our %CMD = ( # sorted in order of importance/use:
 'rm-query' => [ 'QUERY_NAME', 'remove a saved search' ],
 'mv-query' => [ qw(OLD_NAME NEW_NAME), 'rename a saved search' ],
 
-'plonk' => [ '--thread|--from=IDENT',
-        'exclude mail matching From: or thread from non-Message-ID searches',
-        qw(stdin| thread|t from|f=s mid=s oid=s) ],
+'plonk' => [ '--threads|--from=IDENT',
+        'exclude mail matching From: or threads from non-Message-ID searches',
+        qw(stdin| threads|t from|f=s mid=s oid=s) ],
 'mark' => [ 'MESSAGE_FLAGS...',
         'set/unset keywords on message(s) from stdin',
         qw(stdin| oid=s exact by-mid|mid:s) ],
@@ -224,9 +224,9 @@ my %OPTDESC = (
 
 'dedupe|d=s' => ['STRATEGY|content|oid|mid|none',
                 'deduplication strategy'],
-'show        thread|t' => 'display entire thread a message belongs to',
-'q        thread|t' =>
-        'return all messages in the same thread as the actual match(es)',
+'show        threads|t' => 'display entire thread a message belongs to',
+'q        threads|t' =>
+        'return all messages in the same threads as the actual match(es)',
 'augment|a' => 'augment --output destination instead of clobbering',
 
 'output|mfolder|o=s' => [ 'MFOLDER',
diff --git a/lib/PublicInbox/LeiHelp.pm b/lib/PublicInbox/LeiHelp.pm
index e62298f7..a654e1c2 100644
--- a/lib/PublicInbox/LeiHelp.pm
+++ b/lib/PublicInbox/LeiHelp.pm
@@ -40,7 +40,7 @@ sub call {
                         @vals = (' [', undef, ']');
                 } elsif ($x =~ s/=.+//) { # required arg: $x = "type=s"
                         @vals = (' ', undef);
-                } # else: no args $x = 'thread|t'
+                } # else: no args $x = 'threads|t'
 
                 # we support underscore options from public-inbox-* commands;
                 # but they've never been documented and will likely go away.
@@ -48,7 +48,7 @@ sub call {
                 for (grep { !/_/ && !$NOHELP{$_} } split(/\|/, $x)) {
                         length($_) > 1 ? push(@l, "--$_") : push(@s, "-$_");
                 }
-                if (!scalar(@vals)) { # no args 'thread|t'
+                if (!scalar(@vals)) { # no args 'threads|t'
                 } elsif ($arg_vals =~ s/\A([A-Z_]+)\b//) { # "NAME"
                         $vals[1] = $1;
                 } else {
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 0346498f..9a6fa718 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -81,7 +81,7 @@ sub lei_q {
         $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
         PublicInbox::LeiOverview->new($self) or return;
 
-        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
+        my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
         $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
         $mset_opt{limit} //= 10000;
         if (defined(my $sort = $opt->{'sort'})) {
@@ -96,7 +96,7 @@ sub lei_q {
                 }
         }
         # descending docid order
-        $mset_opt{relevance} //= -2 if $opt->{thread};
+        $mset_opt{relevance} //= -2 if $opt->{threads};
         $self->{mset_opt} = \%mset_opt;
 
         if ($opt->{stdin}) {
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 1024b020..2794140a 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -118,7 +118,7 @@ sub mset_progress {
         }
 }
 
-sub query_thread_mset { # for --thread
+sub query_thread_mset { # for --threads
         my ($self, $ibxish) = @_;
         local $0 = "$0 query_thread_mset";
         my $lei = $self->{lei};
@@ -151,7 +151,7 @@ sub query_thread_mset { # for --thread
         $lei->{ovv}->ovv_atexit_child($lei);
 }
 
-sub query_mset { # non-parallel for non-"--thread" users
+sub query_mset { # non-parallel for non-"--threads" users
         my ($self) = @_;
         local $0 = "$0 query_mset";
         my $lei = $self->{lei};
@@ -204,7 +204,7 @@ sub query_remote_mboxrd {
         my $lei = $self->{lei};
         my ($opt, $env) = @$lei{qw(opt env)};
         my @qform = (q => $lei->{mset_opt}->{qstr}, x => 'm');
-        push(@qform, t => 1) if $opt->{thread};
+        push(@qform, t => 1) if $opt->{threads};
         my $verbose = $opt->{verbose};
         my ($reap_tail, $reap_curl);
         my $cerr = File::Temp->new(TEMPLATE => 'curl.err-XXXX', TMPDIR => 1);
@@ -326,7 +326,7 @@ my $MAX_PER_HOST = 4;
 
 sub concurrency {
         my ($self, $opt) = @_;
-        my $nl = $opt->{thread} ? locals($self) : 1;
+        my $nl = $opt->{threads} ? locals($self) : 1;
         my $nr = remotes($self);
         $nr = $MAX_PER_HOST if $nr > $MAX_PER_HOST;
         $nl + $nr;
@@ -337,7 +337,7 @@ sub start_query { # always runs in main (lei-daemon) process
         if (my $l2m = $lei->{l2m}) {
                 $lei->start_mua if $l2m->lock_free;
         }
-        if ($lei->{opt}->{thread}) {
+        if ($lei->{opt}->{threads}) {
                 for my $ibxish (locals($self)) {
                         $self->wq_io_do('query_thread_mset', [], $ibxish);
                 }
@@ -393,7 +393,7 @@ sub do_query {
                 # 1031: F_SETPIPE_SZ
                 fcntl($lei->{startq}, 1031, 4096) if $^O eq 'linux';
         }
-        if (!$lei->{opt}->{thread} && locals($self)) { # for query_mset
+        if (!$lei->{opt}->{threads} && locals($self)) { # for query_mset
                 # lei->{git_tmp} is set for wq_wait_old so we don't
                 # delete until all lei2mail + lei_xsearch workers are reaped
                 $lei->{git_tmp} = $self->{git_tmp} = git_tmp($self);
diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 964147fa..1fca356b 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -236,7 +236,7 @@ sub mbox_all {
                 return PublicInbox::WWW::need($ctx, 'Overview');
 
         my $qopts = $ctx->{qopts} = { relevance => -1 }; # ORDER BY docid ASC
-        $qopts->{thread} = 1 if $q->{t};
+        $qopts->{threads} = 1 if $q->{t};
         my $mset = $srch->mset($q_string, $qopts);
         $qopts->{offset} = $mset->size or
                         return [404, [qw(Content-Type text/plain)],
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 7c6a16be..dbae3bc5 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -336,7 +336,7 @@ sub _enquire_once { # retry_reopen callback
         }
 
         # `mairix -t / --threads' or JMAP collapseThreads
-        if ($opts->{thread} && has_threadid($self)) {
+        if ($opts->{threads} && has_threadid($self)) {
                 $enquire->set_collapse_key(THREADID);
         }
         $enquire->get_mset($opts->{offset} || 0, $opts->{limit} || 50);
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index d50d3cf6..08c77f35 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -48,7 +48,7 @@ sub sres_top_html {
                 limit => $q->{l},
                 offset => $o,
                 relevance => $q->{r},
-                thread => $q->{t},
+                threads => $q->{t},
                 asc => $asc,
         };
         my ($mset, $total, $err, $html);