Merge remote-tracking branch 'origin/master' into lorelei

* origin/master: (58 commits)
  ds: flatten + reuse @events, epoll_wait style fixes
  ds: simplify EventLoop implementation
  check defined return value for localized slurp errors
  import: check for git->qx errors, clearer return values
  git: qx: avoid extra "local" for scalar context case
  search: remove {mset} option for ->mset method
  search: remove pointless {relevance} setting
  miscsearch: take reopen from Search and use it
  extsearch: unconditionally reopen on access
  extindex: allow using --all without EXTINDEX_DIR
  extindex: add undocumented --no-scan switch
  extindex: enable autoflush on STDOUT/STDERR
  extindex: various --watch signal handling fixes
  extindex: --watch for inotify-based updates
  eml: fix undefined vars on <Perl 5.28
  t/config: test --get-urlmatch for git <2.26
  default to CORE::warn in $SIG{__WARN__} handlers
  inbox: name variable for values loop iterator
  inboxidle: avoid needless syscalls on refresh
  inboxidle: clue users into resolving ENOSPC from inotify
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/PublicInbox/Isearch.pm b/lib/PublicInbox/Isearch.pm
index 8a1f257a..7ca2f9e4 100644
--- a/lib/PublicInbox/Isearch.pm
+++ b/lib/PublicInbox/Isearch.pm
@@ -61,7 +61,7 @@ sub mset_to_artnums {
         my $docids = PublicInbox::Search::mset_to_artnums($self->{es}, $mset);
         my $ibx_id = $self->{-ibx_id} //= _ibx_id($self);
         my $qmarks = join(',', map { '?' } @$docids);
-        if ($opt && ($opt->{mset} // 0) == 2) { # opt->{mset} = 2 was used
+        if ($opt && ($opt->{relevance} // 0) == -1) { # -1 => ENQ_ASCENDING
                 my $range = '';
                 my @r;
                 if (my $r = $opt->{uid_range}) {
@@ -89,7 +89,7 @@ SELECT docid,xnum FROM xref3 WHERE ibx_id = ? AND docid IN ($qmarks)
         }
         if (scalar keys %order) {
                 warn "W: $self->{es}->{topdir} #",
-                        join(', #', sort keys %order),
+                        join(', ', sort { $a <=> $b } keys %order),
                         " not mapped to `$self->{eidx_key}'\n";
                 warn "W: $self->{es}->{topdir} may need to be reindexed\n";
                 @xnums = grep { defined } @xnums;
@@ -113,7 +113,7 @@ sub mset_to_smsg {
         }
         if (scalar keys %order) {
                 warn "W: $ibx->{inboxdir} #",
-                        join(', #', sort keys %order),
+                        join(', ', sort { $a <=> $b } keys %order),
                         " no longer valid\n";
                 warn "W: $self->{es}->{topdir} may need to be reindexed\n";
         }