lei q: -I/--include overrides --no-(external|local|remote)

Assume that anybody using -I/--include for external locations
will want to override --no-$FOO if they're explicitly including
a location.

With some effort, we could make it order-dependent (e.g.
"-I $LOCATION --no-$FOO" and "--no-$FOO -I $LOCATION"
behave differently).  However that's not straightforward
when using Getopt::Long to parse command-line options into
a hashref.

I'm also not sure if order-dependent switches are a desirable
UI/UX quality.

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 623b92cd..532668ae 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -64,9 +64,12 @@ sub lei_q {
                         $lxs->prepare_external($_) for @loc;
                 }
         } else {
+                my (@ilocals, @iremotes);
                 for my $loc (@{$opt->{include} // []}) {
                         my @loc = $self->get_externals($loc) or return;
                         $lxs->prepare_external($_) for @loc;
+                        @ilocals = @{$lxs->{locals} // []};
+                        @iremotes = @{$lxs->{remotes} // []};
                 }
                 # --external is enabled by default, but allow --no-external
                 if ($opt->{external} //= 1) {
@@ -78,9 +81,9 @@ sub lei_q {
                         my $ne = $self->externals_each(\&prep_ext, $lxs, \%x);
                         $opt->{remote} //= !($lxs->locals - $opt->{'local'});
                         if ($opt->{'local'}) {
-                                delete($lxs->{remotes}) if !$opt->{remote};
+                                $lxs->{remotes} = \@iremotes if !$opt->{remote};
                         } else {
-                                delete($lxs->{locals});
+                                $lxs->{locals} = \@ilocals;
                         }
                 }
         }