[PATCH v2 2/8] cli: add --exclude=all option to notmuch-search.c

diff --git a/88/1f9018a9be6b9c38040c3f9a11028f37bd23b8 b/88/1f9018a9be6b9c38040c3f9a11028f37bd23b8
new file mode 100644 (file)
index 0000000..831b140
--- /dev/null
+++ b/88/1f9018a9be6b9c38040c3f9a11028f37bd23b8
@@ -0,0 +1,111 @@
+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 0039D431FD5\r
+       for <notmuch@notmuchmail.org>; Sat, 11 May 2013 12:50:28 -0700 (PDT)\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 P1Tq12kgE2C1 for <notmuch@notmuchmail.org>;\r
+       Sat, 11 May 2013 12:50:23 -0700 (PDT)\r
+Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com\r
+ [74.125.82.44])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 21A75431FBC   for <notmuch@notmuchmail.org>; Sat, 11 May 2013 12:50:21 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f44.google.com with SMTP id z12so4950818wgg.11\r
+       for <notmuch@notmuchmail.org>; Sat, 11 May 2013 12:50:20 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=22JM8A7ircSZ6EsHek91NkeZwzH8cR7weUfz92K7r44=;\r
+       b=k55nM2RPssUBTTujqAlW2DN5dL2VaYXNSF57Ya+o7Domp/YxpKmGyaufigocXoYrJ2\r
+       wNwq3yy7FR9eflsfgSCZJ/buxtFPDKumczVQ37gH2ZkJZSGvS0IIM//no6LIsYnh2C4C\r
+       wZhydmXlWzHjQC8m5taeegHKHJ8xdRCIokbf9+ZbCrSl4G6Qs9nEo6x2JyRkXsihPm1B\r
+       xZ9ZTX8o656ga8+zqdUmRwivv4IvHiaIfHtyf1HB49zZQUwK1a9qTMSFiDzhk9zW8TE1\r
+       ZaX8qUn6U+udDVdrL2OMsN++52AnYpSV/JA2485pUCDEZARQQkyFi7uBnfqw5PpE+04K\r
+       oNeg==\r
+X-Received: by 10.180.88.231 with SMTP id bj7mr10360757wib.5.1368301820090;\r
+       Sat, 11 May 2013 12:50:20 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id q13sm6183188wie.8.2013.05.11.12.50.19\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 11 May 2013 12:50:19 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/8] cli: add --exclude=all option to notmuch-search.c\r
+Date: Sat, 11 May 2013 20:50:03 +0100\r
+Message-Id: <1368301809-12532-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1368301809-12532-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1368301809-12532-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, 11 May 2013 19:50:29 -0000\r
+\r
+Add a --exclude=all option to notmuch search.\r
+---\r
+ notmuch-search.c |    8 ++++++--\r
+ 1 files changed, 6 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index e658639..4323201 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -287,6 +287,7 @@ enum {\r
+     EXCLUDE_TRUE,\r
+     EXCLUDE_FALSE,\r
+     EXCLUDE_FLAG,\r
++    EXCLUDE_ALL\r
+ };\r
+ \r
+ int\r
+@@ -334,6 +335,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+           (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+                                   { "false", EXCLUDE_FALSE },\r
+                                   { "flag", EXCLUDE_FLAG },\r
++                                  { "all", EXCLUDE_ALL },\r
+                                   { 0, 0 } } },\r
+       { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },\r
+       { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0  },\r
+@@ -400,7 +402,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+       exclude = EXCLUDE_FALSE;\r
+     }\r
+ \r
+-    if (exclude == EXCLUDE_TRUE || exclude == EXCLUDE_FLAG) {\r
++    if (exclude != EXCLUDE_FALSE) {\r
+       const char **search_exclude_tags;\r
+       size_t search_exclude_tags_length;\r
+ \r
+@@ -409,7 +411,9 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+       for (i = 0; i < search_exclude_tags_length; i++)\r
+           notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
+       if (exclude == EXCLUDE_FLAG)\r
+-          notmuch_query_set_omit_excluded (query, FALSE);\r
++          notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_FALSE);\r
++      if (exclude == EXCLUDE_ALL)\r
++          notmuch_query_set_omit_excluded (query, NOTMUCH_EXCLUDE_ALL);\r
+     }\r
+ \r
+     switch (output) {\r
+-- \r
+1.7.9.1\r
+\r