Move the option --no-exclude to the --exclude= scheme. Since there is
no way to flag messages only true and false are implemented. Note
that, for consistency with other commands, this is implemented as a
keyword option rather than a boolean option.
+.BR \-\-exclude=(true|false)
-Do not exclude the messages matching search.exclude_tags in the config file.
+Specify whether to omit messages matching search.tag_exclude from the
+count (the default) or not.
+/* The following is to allow future options to be added more easily */
+enum {
+ EXCLUDE_TRUE,
+ EXCLUDE_FALSE,
+};
+
int
notmuch_count_command (void *ctx, int argc, char *argv[])
{
int
notmuch_count_command (void *ctx, int argc, char *argv[])
{
char *query_str;
int opt_index;
int output = OUTPUT_MESSAGES;
char *query_str;
int opt_index;
int output = OUTPUT_MESSAGES;
- notmuch_bool_t no_exclude = FALSE;
+ int exclude = EXCLUDE_TRUE;
unsigned int i;
notmuch_opt_desc_t options[] = {
unsigned int i;
notmuch_opt_desc_t options[] = {
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES },
{ 0, 0 } } },
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES },
{ 0, 0 } } },
- { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 },
+ { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
+ (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
+ { "false", EXCLUDE_FALSE },
+ { 0, 0 } } },
+ if (exclude == EXCLUDE_TRUE) {
const char **search_exclude_tags;
size_t search_exclude_tags_length;
const char **search_exclude_tags;
size_t search_exclude_tags_length;
notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
}
notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
}
- notmuch_query_set_omit_excluded_messages (query, TRUE);
-
switch (output) {
case OUTPUT_MESSAGES:
printf ("%u\n", notmuch_query_count_messages (query));
switch (output) {
case OUTPUT_MESSAGES:
printf ("%u\n", notmuch_query_count_messages (query));
"1" \
"`notmuch count subject:deleted and tag:deleted`"
"1" \
"`notmuch count subject:deleted and tag:deleted`"
-test_begin_subtest "count \"deleted\" messages, with --no-exclude"
+test_begin_subtest "count \"deleted\" messages, --exclude=false"
test_expect_equal \
"3" \
test_expect_equal \
"3" \
- "`notmuch count --no-exclude subject:deleted`"
+ "`notmuch count --exclude=false subject:deleted`"