[PATCH 2/5] cli: move count to the new --with-excluded naming scheme.

diff --git a/bc/ca723199f62b1300b44a3e0f2c647801c3c9cd b/bc/ca723199f62b1300b44a3e0f2c647801c3c9cd
new file mode 100644 (file)
index 0000000..3b503ff
--- /dev/null
+++ b/bc/ca723199f62b1300b44a3e0f2c647801c3c9cd
@@ -0,0 +1,151 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 56F0B431FC0\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:07 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id O5F1Nx+G3iCl for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Mar 2012 05:04:05 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ DE01F431FDE   for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:02 -0800\r
+ (PST)\r
+Received: by wgbds10 with SMTP id ds10so171103wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 03 Mar 2012 05:04:01 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=O6C+JZcOtaI4lvW+H4RgTr4s5UDAihljkrOYOPC37YI=;\r
+       b=PaHsbNmB+djeBNiTzhxyi4V1Ti7gW0wdK3uuF3dlzY7HWvs7LCfrXpnFzoy3bh91H2\r
+       cauM5u7BLiK3vel/b8aDXycdCs0Q8ojBq0HJs/FIUz3py86F5DT0FQt9gEiEqtBBnDzS\r
+       7967qSjhkTH0ZQeFZWjdN0rh5I8tXePsGxUAtHX85VmhbYMJ0Fwvv25McVyjJIehndyL\r
+       k9TVusxFFVULnf/iT0TILIvRohxYVwV3XqbbLFwAeTaSqycxQ1N04OLLQ4Ofa8apWanN\r
+       01K0cM8aSlYOVJVfIZnbNz8gYRWu/3QUgIe7ZdRSu1mZQL0tDyRXRr7EC7vT93EkJ/Pe\r
+       qKyA==\r
+Received: by 10.180.78.233 with SMTP id e9mr3097892wix.0.1330779841596;\r
+       Sat, 03 Mar 2012 05:04:01 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ fl2sm27089105wib.4.2012.03.03.05.04.00        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 03 Mar 2012 05:04:00 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] cli: move count to the new --with-excluded naming scheme.\r
+Date: Sat,  3 Mar 2012 13:05:15 +0000\r
+Message-Id: <1330779918-28024-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 03 Mar 2012 13:04:07 -0000\r
+\r
+Rename the option --no-exclude to --with-excluded. Note that this\r
+could be implemented by setting\r
+notmuch_query_set_with_excluded_messages but it is simpler not to set\r
+the exclude tags in the first place (the two methods give identical\r
+output).\r
+---\r
+ man/man1/notmuch-count.1 |    4 ++--\r
+ notmuch-count.c          |   11 ++++++-----\r
+ test/count               |    4 ++--\r
+ 3 files changed, 10 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1\r
+index 805a8ae..5903074 100644\r
+--- a/man/man1/notmuch-count.1\r
++++ b/man/man1/notmuch-count.1\r
+@@ -41,9 +41,9 @@ Output the number of matching threads.\r
+ \r
+ .RS 4\r
+ .TP 4\r
+-.BR \-\-no\-exclude\r
++.BR \-\-with\-excluded\r
+ \r
+-Do not exclude the messages matching search.exclude_tags in the config file.\r
++Include messages which match search.exclude_tags in the count.\r
+ .RE\r
+ .RE\r
+ .RE\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 46b76ae..b87cdca 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -35,7 +35,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+     char *query_str;\r
+     int opt_index;\r
+     int output = OUTPUT_MESSAGES;\r
+-    notmuch_bool_t no_exclude = FALSE;\r
++    notmuch_bool_t with_excluded = FALSE;\r
+     unsigned int i;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+@@ -43,7 +43,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+         (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },\r
+                                 { "messages", OUTPUT_MESSAGES },\r
+                                 { 0, 0 } } },\r
+-      { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &with_excluded, "with-excluded", 'd', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -78,7 +78,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+     }\r
+ \r
+-    if (!no_exclude) {\r
++    /* If we have --with-excluded we could use\r
++     * notmuch_query_set_with_excluded, but it is simpler not to set\r
++     * the exclude tags in the first place */\r
++    if (!with_excluded) {\r
+       const char **search_exclude_tags;\r
+       size_t search_exclude_tags_length;\r
+ \r
+@@ -88,8 +91,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+           notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
+     }\r
+ \r
+-    notmuch_query_set_omit_excluded_messages (query, TRUE);\r
+-\r
+     switch (output) {\r
+     case OUTPUT_MESSAGES:\r
+       printf ("%u\n", notmuch_query_count_messages (query));\r
+diff --git a/test/count b/test/count\r
+index 976fff1..f74413b 100755\r
+--- a/test/count\r
++++ b/test/count\r
+@@ -53,9 +53,9 @@ test_expect_equal \\r
+     "1" \\r
+     "`notmuch count subject:deleted and tag:deleted`"\r
+ \r
+-test_begin_subtest "count \"deleted\" messages, with --no-exclude"\r
++test_begin_subtest "count \"deleted\" messages, with --with-excluded"\r
+ test_expect_equal \\r
+     "3" \\r
+-    "`notmuch count --no-exclude subject:deleted`"\r
++    "`notmuch count --with-excluded subject:deleted`"\r
+ \r
+ test_done\r
+-- \r
+1.7.2.3\r
+\r