[PATCH 1/7] cli: add --do-not-exclude option to count and search.

diff --git a/ea/295db4b00da0dd6fe5041210120bbbeab91946 b/ea/295db4b00da0dd6fe5041210120bbbeab91946
new file mode 100644 (file)
index 0000000..ed253df
--- /dev/null
+++ b/ea/295db4b00da0dd6fe5041210120bbbeab91946
@@ -0,0 +1,145 @@
+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 05ED5429E3B\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 10:39:00 -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 WZFb8ycrVYMO for <notmuch@notmuchmail.org>;\r
+       Sun, 29 Jan 2012 10:38:59 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 55AD8429E34\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 10:38:59 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so2994807wib.26\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 10:38:58 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=KsZXXT7EjxGdSzl8HWtbXifUefQMewX0coatYYVLTD8=;\r
+       b=cwZANVYY3e9qlICQrA5msvLxbmu6xTFYLoAZ8Rrl9uhxyG+YsrbkPScK7XS5Nc5ilq\r
+       MtYbRInIWXACyxNLvVIvFfhscq8d+MBlnzXOgfszZt6KMIW2ATkc/cebBXMVZWJpkyy9\r
+       zlusEhq4CR7rEG3wTLvU8lC53kwuVpoz9WiZA=\r
+Received: by 10.180.93.194 with SMTP id cw2mr6022968wib.0.1327862338007;\r
+       Sun, 29 Jan 2012 10:38:58 -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
+ x7sm180589wif.10.2012.01.29.10.38.56  (version=TLSv1/SSLv3 cipher=OTHER);     Sun,\r
+ 29 Jan 2012 10:38:57 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@MIT.EDU\r
+Subject: [PATCH 1/7] cli: add --do-not-exclude option to count and search.\r
+Date: Sun, 29 Jan 2012 18:39:48 +0000\r
+Message-Id: <1327862394-14334-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <8762fu4aqt.fsf@qmul.ac.uk>\r
+References: <8762fu4aqt.fsf@qmul.ac.uk>\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: Sun, 29 Jan 2012 18:39:00 -0000\r
+\r
+This option turns off the exclusion so all matching messages are\r
+returned. We do not need to add this to show as notmuch-show does not\r
+(yet) exclude.\r
+---\r
+ notmuch-count.c  |   12 ++++++++----\r
+ notmuch-search.c |   12 ++++++++----\r
+ 2 files changed, 16 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 63459fb..c88975e 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -37,6 +37,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+     int output = OUTPUT_MESSAGES;\r
+     const char **search_exclude_tags;\r
+     size_t search_exclude_tags_length;\r
++    notmuch_bool_t do_not_exclude = FALSE;\r
+     unsigned int i;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+@@ -44,6 +45,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,  &do_not_exclude, "do-not-exclude", 'd', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -78,10 +80,12 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+     }\r
+ \r
+-    search_exclude_tags = notmuch_config_get_search_exclude_tags\r
+-      (config, &search_exclude_tags_length);\r
+-    for (i = 0; i < search_exclude_tags_length; i++)\r
+-      notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
++    if (!do_not_exclude) {\r
++      search_exclude_tags = notmuch_config_get_search_exclude_tags\r
++          (config, &search_exclude_tags_length);\r
++      for (i = 0; i < search_exclude_tags_length; i++)\r
++          notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
++    }\r
+ \r
+     switch (output) {\r
+     case OUTPUT_MESSAGES:\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index d504051..084dd05 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -425,6 +425,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+     int limit = -1; /* unlimited */\r
+     const char **search_exclude_tags;\r
+     size_t search_exclude_tags_length;\r
++    notmuch_bool_t do_not_exclude = FALSE;\r
+     unsigned int i;\r
+ \r
+     enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
+@@ -446,6 +447,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+                                 { "files", OUTPUT_FILES },\r
+                                 { "tags", OUTPUT_TAGS },\r
+                                 { 0, 0 } } },\r
++        { NOTMUCH_OPT_BOOLEAN,  &do_not_exclude, "do-not-exclude", 'd', 0 },\r
+       { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },\r
+       { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0  },\r
+       { 0, 0, 0, 0, 0 }\r
+@@ -493,10 +495,12 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ \r
+     notmuch_query_set_sort (query, sort);\r
+ \r
+-    search_exclude_tags = notmuch_config_get_search_exclude_tags\r
+-      (config, &search_exclude_tags_length);\r
+-    for (i = 0; i < search_exclude_tags_length; i++)\r
+-      notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
++    if (!do_not_exclude) {\r
++      search_exclude_tags = notmuch_config_get_search_exclude_tags\r
++          (config, &search_exclude_tags_length);\r
++      for (i = 0; i < search_exclude_tags_length; i++)\r
++          notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
++    }\r
+ \r
+     switch (output) {\r
+     default:\r
+-- \r
+1.7.2.3\r
+\r