From 8bd03fd16e6825013afcc364d511a889993135c4 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 15 Mar 2012 18:42:02 +0000 Subject: [PATCH] [PATCH 2/5] cli: move count to the new --exclude=(true|false|flag) naming scheme. --- de/ebc89c6074dee87dcc9df3ee056511e2cb1dbf | 165 ++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 de/ebc89c6074dee87dcc9df3ee056511e2cb1dbf diff --git a/de/ebc89c6074dee87dcc9df3ee056511e2cb1dbf b/de/ebc89c6074dee87dcc9df3ee056511e2cb1dbf new file mode 100644 index 000000000..9153cde03 --- /dev/null +++ b/de/ebc89c6074dee87dcc9df3ee056511e2cb1dbf @@ -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 53D29431FAE + for ; Thu, 15 Mar 2012 11:42:19 -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 gR2Y4+h+pg8d for ; + Thu, 15 Mar 2012 11:42:17 -0700 (PDT) +Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com + [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 376D2431FD9 + for ; Thu, 15 Mar 2012 11:42:15 -0700 (PDT) +Received: by wibhn6 with SMTP id hn6so3844513wib.2 + for ; Thu, 15 Mar 2012 11:42:14 -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=SucZmu96ju3u3RJTCQuUddOVVmItNMCvybI0YGQHork=; + b=qupk2mCm4832ZZNrKYY3J2TT0mPtKb1ozXv79VjjU5KAMzXFGSDFVquYs9Ani+ANQb + I5v9qmQzKKTZtDa7VVnGswkCEeWvmmm8Vou/KVbaf8al2It1BeBTWB3U0qoK8IBS/TCP + ylMDgzjcxCnzGLp57evYGrlmvhrOdkdM1SuUpJ2+55th6VKoThT86/PLZ7kPQvsTHMHb + lnzInDK6EBMXX/k30Ep3yYJVOh0pBICnX4Xyg2/FylO8KBhg383k0JD+5LyobXCmmLw9 + KgBq+ZXvUqj9PT09gq52TO7r0QMxjINjChZy0f9qaM5awZL0M+qS++2vZ5w2F540Rq/F + 6EPg== +Received: by 10.180.89.9 with SMTP id bk9mr3333447wib.11.1331836933970; + Thu, 15 Mar 2012 11:42:13 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + be4sm11392195wib.8.2012.03.15.11.42.12 (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 15 Mar 2012 11:42:13 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/5] cli: move count to the new --exclude=(true|false|flag) + naming scheme. +Date: Thu, 15 Mar 2012 18:42:02 +0000 +Message-Id: <1331836925-31437-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com> +References: <1331836925-31437-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: Thu, 15 Mar 2012 18:42:19 -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 805a8ae..b169f93 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