From 845feadaf3fe275111b7d3a66f4a95a171659915 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 6 Apr 2012 13:49:07 +0100 Subject: [PATCH] [PATCH v3 2/6] cli: move count to the new --exclude=(true|false|flag) naming scheme. --- 8b/692045c41bf30a6a3d30ca1d3bc20fa264c51a | 165 ++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 8b/692045c41bf30a6a3d30ca1d3bc20fa264c51a diff --git a/8b/692045c41bf30a6a3d30ca1d3bc20fa264c51a b/8b/692045c41bf30a6a3d30ca1d3bc20fa264c51a new file mode 100644 index 000000000..d730bb7c3 --- /dev/null +++ b/8b/692045c41bf30a6a3d30ca1d3bc20fa264c51a @@ -0,0 +1,165 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1EB3B429E29 + for ; Fri, 6 Apr 2012 05:49:24 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nnzT1aCQwuEX for ; + Fri, 6 Apr 2012 05:49:21 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id DB3A9431FD6 + for ; Fri, 6 Apr 2012 05:49:17 -0700 (PDT) +Received: by werm13 with SMTP id m13so1667174wer.26 + for ; Fri, 06 Apr 2012 05:49:16 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=yq8Vk74zuiGLhnHZbw3u4pLV1o6O6YCaUEmj30DXz3o=; + b=gIj2UGIzaZdqM9c7urW0fSRXMhX1n8mMPwQ04+UZDZWKKGJrsHY/8LILQm2bG9NK8d + gTvZ8D7Dyi/8t6m3Dvwxw9t+Ck0ezyomhG56rZ0IRGwBwcpdigQDkcHv+wnE/hfLBZ0f + WKFXize6fBg7uOKd6yzPBPjkGtCn/73EWAdy+AA3kSSKADzZSZF9WPFzriqKs9Xn4d7F + /10VNYCH3SvzSeDjnR9i4gLDGu7QPhPSHLeSnJ86JFcXOdBdF2VzNq8Wcm78q2aV4jCp + V3hgGZijTYYLaAcvwqqbq+u8+nsVnqCPALd6ev475M6KsB8H2Vmhtukbb5GAeZOzs4HA + DRwg== +Received: by 10.180.85.70 with SMTP id f6mr19775492wiz.5.1333716556639; + Fri, 06 Apr 2012 05:49:16 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fn2sm10217723wib.0.2012.04.06.05.49.15 (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 06 Apr 2012 05:49:16 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 2/6] cli: move count to the new --exclude=(true|false|flag) + naming scheme. +Date: Fri, 6 Apr 2012 13:49:07 +0100 +Message-Id: <1333716551-29153-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com> +References: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 06 Apr 2012 12:49:24 -0000 + +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. +--- + man/man1/notmuch-count.1 | 5 +++-- + notmuch-count.c | 17 ++++++++++++----- + test/count | 4 ++-- + 3 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 +index 35ecc53..d6cbf07 100644 +--- a/man/man1/notmuch-count.1 ++++ b/man/man1/notmuch-count.1 +@@ -41,9 +41,10 @@ Output the number of matching threads. + + .RS 4 + .TP 4 +-.BR \-\-no\-exclude ++.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. + .RE + .RE + .RE +diff --git a/notmuch-count.c b/notmuch-count.c +index 46b76ae..b76690c 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -26,6 +26,12 @@ enum { + OUTPUT_MESSAGES, + }; + ++/* 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[]) + { +@@ -35,7 +41,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + 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[] = { +@@ -43,7 +49,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + (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 } } }, + { 0, 0, 0, 0, 0 } + }; + +@@ -78,7 +87,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + return 1; + } + +- if (!no_exclude) { ++ if (exclude == EXCLUDE_TRUE) { + const char **search_exclude_tags; + size_t search_exclude_tags_length; + +@@ -88,8 +97,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + 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)); +diff --git a/test/count b/test/count +index b97fc06..fd387e5 100755 +--- a/test/count ++++ b/test/count +@@ -53,9 +53,9 @@ test_expect_equal \ + "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" \ +- "`notmuch count --no-exclude subject:deleted`" ++ "`notmuch count --exclude=false subject:deleted`" + + test_done +-- +1.7.9.1 + -- 2.26.2