[PATCH 4/5] cli: temporarily remove exclude tag support for 0.12

diff --git a/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1 b/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1
new file mode 100644 (file)
index 0000000..174c51f
--- /dev/null
+++ b/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1
@@ -0,0 +1,128 @@
+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 0A4EA429E4F\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:44 -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 HngYUhcPH4i1 for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Feb 2012 10:11:43 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 244EF429E38\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:43 -0800 (PST)\r
+Received: by werm13 with SMTP id m13so2259352wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:41 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.83.97 as permitted sender) client-ip=10.180.83.97; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.83.97 as permitted\r
+       sender) smtp.mail=markwalters1009@gmail.com;\r
+       dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.83.97])\r
+       by 10.180.83.97 with SMTP id p1mr3064624wiy.19.1330539101996 (num_hops\r
+       = 1); Wed, 29 Feb 2012 10:11:41 -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=gXvvTQoOszPgLEG5Ws2kbqJ7A9hg6wpzZej+xW6lea8=;\r
+       b=GiklfzzpcWQsupQpxzTxntqwBcfO478r7EFt3gnptu3/TYVZcX612IS1TBP+mqz3yK\r
+       NZIc27fVLP6ltahBYw2e75UONR7KtCPGp2q1SSAx8Yep6bdHjn953289xf6TPI+4qWxb\r
+       u2avDrVRJYqgEIQqbYt+1eWottOuvKfEqP2WQ=\r
+Received: by 10.180.83.97 with SMTP id p1mr2462073wiy.19.1330539101954;\r
+       Wed, 29 Feb 2012 10:11:41 -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
+ k6sm21812649wiy.7.2012.02.29.10.11.40 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 29 Feb 2012 10:11:41 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] cli: temporarily remove exclude tag support for 0.12\r
+Date: Wed, 29 Feb 2012 18:13:08 +0000\r
+Message-Id: <1330539189-16593-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330539189-16593-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: Wed, 29 Feb 2012 18:11:44 -0000\r
+\r
+---\r
+ notmuch-count.c  |    8 +-------\r
+ notmuch-search.c |    8 +-------\r
+ 2 files changed, 2 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 63459fb..f86cb40 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -35,9 +35,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+     char *query_str;\r
+     int opt_index;\r
+     int output = OUTPUT_MESSAGES;\r
+-    const char **search_exclude_tags;\r
+-    size_t search_exclude_tags_length;\r
+-    unsigned int i;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',\r
+@@ -78,10 +75,7 @@ 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
++    /* Temporarily remove exclude tag support for 0.12 */\r
+ \r
+     switch (output) {\r
+     case OUTPUT_MESSAGES:\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 92ce38a..96892b3 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -426,9 +426,6 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+     output_t output = OUTPUT_SUMMARY;\r
+     int offset = 0;\r
+     int limit = -1; /* unlimited */\r
+-    const char **search_exclude_tags;\r
+-    size_t search_exclude_tags_length;\r
+-    unsigned int i;\r
+ \r
+     enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
+       format_sel = NOTMUCH_FORMAT_TEXT;\r
+@@ -496,10 +493,7 @@ 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
++    /* Temporarily remove exclude tag support for 0.12 */\r
+ \r
+     switch (output) {\r
+     default:\r
+-- \r
+1.7.2.3\r
+\r