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

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

[Eric Wong]

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.
---
 lib/PublicInbox/LeiQuery.pm |  7 +++++--
 t/lei-externals.t           | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 4 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;
 			}
 		}
 	}
diff --git a/t/lei-externals.t b/t/lei-externals.t
index 1695ff0b..1d2a9a16 100644
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -127,8 +127,10 @@ test_lei(sub {
 	lei_ok qw(_complete lei forget-external), \'complete for externals';
 	my %comp = map { $_ => 1 } split(/\s+/, $lei_out);
 	ok($comp{'https://example.com/ibx/'}, 'forget external completion');
+	my @dirs;
 	$cfg->each_inbox(sub {
 		my ($ibx) = @_;
+		push @dirs, $ibx->{inboxdir};
 		ok($comp{$ibx->{inboxdir}}, "local $ibx->{name} completion");
 	});
 	for my $u (qw(h http https https: https:/ https:// https://e
@@ -157,7 +159,8 @@ test_lei(sub {
 	lei_ok('ls-external');
 	unlike($lei_out, qr!https://example\.com/ibx/!s,
 		'removed canonical URL');
-SKIP: {
+
+	# do some queries
 	ok(!lei(qw(q s:prefix -o maildir:/dev/null)), 'bad maildir');
 	like($lei_err, qr!/dev/null exists and is not a directory!,
 		'error shown');
@@ -249,6 +252,15 @@ SKIP: {
 	is($? >> 8, 1, 'proper exit code');
 	like($lei_err, qr/no local or remote.+? to search/, 'no inbox');
 
+	for my $no (['--no-local'], ['--no-external'],
+			[qw(--no-local --no-external)]) {
+		lei_ok(qw(q mid:testmessage@example.com), @$no,
+			'-I', $dirs[0], \"-I and @$no combine");
+		$res = json_utf8->decode($lei_out);
+		is($res->[0]->{'m'}, 'testmessage@example.com',
+			"-I \$DIR got results regardless of @$no");
+	}
+
 	{
 		opendir my $dh, '.' or BAIL_OUT "opendir(.) $!";
 		my $od = PublicInbox::OnDestroy->new($$, sub {
@@ -278,6 +290,5 @@ SKIP: {
 		$url = $e{$k} if $url eq '1';
 		$test_external_remote->($url, $k);
 	}
-	}; # /SKIP
 }); # test_lei
 done_testing;