diff options
| author | Eric Wong <e@80x24.org> | 2021-04-22 07:08:22 -0200 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-04-22 17:05:48 -0400 |
| commit | 3a6e13b7f3cf04b9a3dd0fdd3ed4d96a05e31e9f (patch) | |
| tree | 85f3a792eb544639b9fab2bc508a5bd30cb05349 | |
| parent | 21c0a681c3c9bdcdeffc6516db65812c7635cd68 (diff) | |
| download | public-inbox-3a6e13b7f3cf04b9a3dd0fdd3ed4d96a05e31e9f.tar.gz | |
Supporting --no-keywords and --no-flags aliases is harmful if users end up assuming "keywords:" and "flags:" are valid search prefixes (they're not).
| -rw-r--r-- | Documentation/lei-import.pod | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/LEI.pm | 9 | ||||
| -rw-r--r-- | t/lei.t | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/lei-import.pod b/Documentation/lei-import.pod index acc4f776..7d70191d 100644 --- a/Documentation/lei-import.pod +++ b/Documentation/lei-import.pod @@ -40,7 +40,7 @@ C<none>. Default: fcntl,dotlock -=item --no-kw, --no-keywords, --no-flags +=item --no-kw Don't import message keywords (or "flags" in IMAP terminology). diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index d9e644eb..9f49fc03 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -181,7 +181,7 @@ our %CMD = ( # sorted in order of importance/use: qw(exact! all jobs:i indexed), @c_opt ], 'add-watch' => [ 'LOCATION', 'watch for new messages and flag changes', - qw(import! kw|keywords|flags! interval=s recursive|r + qw(import! kw! interval=s recursive|r exclude=s include=s), @c_opt ], 'ls-watch' => [ '[FILTER...]', 'list active watches with numbers and status', qw(format|f=s z), @c_opt ], @@ -193,12 +193,11 @@ our %CMD = ( # sorted in order of importance/use: 'import' => [ 'LOCATION...|--stdin', 'one-time import/update from URL or filesystem', qw(stdin| offset=i recursive|r exclude=s include|I=s - lock=s@ in-format|F=s kw|keywords|flags! verbose|v+ - incremental!), @c_opt ], + lock=s@ in-format|F=s kw! verbose|v+ incremental!), @c_opt ], 'convert' => [ 'LOCATION...|--stdin', 'one-time conversion from URL or filesystem to another format', qw(stdin| in-format|F=s out-format|f=s output|mfolder|o=s - lock=s@ kw|keywords|flags!), @c_opt ], + lock=s@ kw!), @c_opt ], 'p2q' => [ 'FILE|COMMIT_OID|--stdin', "use a patch to generate a query for `lei q --stdin'", qw(stdin| want|w=s@ uri debug), @c_opt ], @@ -350,7 +349,7 @@ my %OPTDESC = ( 'by-mid|mid:s' => [ 'MID', 'match only by Message-ID, ignoring contents' ], -'kw|keywords|flags!' => 'disable/enable importing flags', +'kw!' => 'disable/enable importing keywords (aka "flags")', # xargs, env, use "-0", git(1) uses "-z". We support z|0 everywhere 'z|0' => 'use NUL \\0 instead of newline (CR) to delimit lines', @@ -131,8 +131,7 @@ my $test_completion = sub { } lei_ok(qw(_complete lei import)); %out = map { $_ => 1 } split(/\s+/s, $lei_out); - for my $sw (qw(--flags --no-flags --no-kw --kw --no-keywords - --keywords)) { + for my $sw (qw(--no-kw --kw)) { ok($out{$sw}, "$sw offered as `lei import' completion"); } }; |