[PATCH v2 1/6] lib: change default for notmuch_query_set_omit_excluded

diff --git a/89/7c1313d60518a219e48bf5f59f881fb9a27e75 b/89/7c1313d60518a219e48bf5f59f881fb9a27e75
new file mode 100644 (file)
index 0000000..d2f2b5f
--- /dev/null
+++ b/89/7c1313d60518a219e48bf5f59f881fb9a27e75
@@ -0,0 +1,137 @@
+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 9DEFC431E82\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:12 -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 4SoRV1WITlrX for <notmuch@notmuchmail.org>;\r
+       Sat, 31 Mar 2012 15:54:12 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CD3E0431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:11 -0700 (PDT)\r
+Received: by wibhn6 with SMTP id hn6so1346075wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:10 -0700 (PDT)\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=eo4x3qOniAZtifC3PD1Jdj4s5WHERevlsxTnlNI1qyY=;\r
+       b=KGJwrKHEG5kKzilRLXVqt8ADeqLNWMmqBhY09Cejpx1XvdvOBPksLnnaxsfL98+Uqu\r
+       kJAO1omtPRcLHmn/3IWz3FFhVhqhlY355pEGw/DTJX8rqGosoC05saDM+m1zgZ3O0GYo\r
+       t+ZKYVgGXTdFCSJIq8sAnqjRlMWIDOt/pp1jmedrXs1xqhiGPr7FuiiZHsg3e/7sSvlZ\r
+       q+kzfUqXdhrOloINPvlymNNkjy7y4j/XSC/iMT9Reps+Bj0VPvz28OPiHksgfbcuqceJ\r
+       PLpRjAQoaSa60xxyvQwD3P938YXzg5gmLAE5LdFvUubVGv4agKJIiApJWGIl5P5/Hw3f\r
+       Wdcg==\r
+Received: by 10.180.97.4 with SMTP id dw4mr10377024wib.18.1333234450555;\r
+       Sat, 31 Mar 2012 15:54:10 -0700 (PDT)\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
+ 17sm29017490wis.0.2012.03.31.15.54.09 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 31 Mar 2012 15:54:09 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/6] lib: change default for\r
+ notmuch_query_set_omit_excluded\r
+Date: Sat, 31 Mar 2012 23:53:57 +0100\r
+Message-Id: <1333234442-28616-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333234442-28616-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1333234442-28616-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, 31 Mar 2012 22:54:12 -0000\r
+\r
+---\r
+ lib/notmuch.h |   11 ++++++-----\r
+ lib/query.cc  |   10 +++++-----\r
+ 2 files changed, 11 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index babd208..029a2c3 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -449,12 +449,13 @@ typedef enum {\r
+ const char *\r
+ notmuch_query_get_query_string (notmuch_query_t *query);\r
+ \r
+-/* Specify whether to results should omit the excluded results rather\r
+- * than just marking them excluded. This is useful for passing a\r
+- * notmuch_messages_t not containing the excluded messages to other\r
+- * functions. */\r
++/* Specify whether to omit the excluded results or just flag\r
++ * them. Note when calling notmuch_query_search_threads, the returned\r
++ * thread will contain all messages regardless of this setting but,\r
++ * unless this is unset, only threads matching in a non-excluded\r
++ * message will be returned. */\r
+ void\r
+-notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit);\r
++notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit_excluded);\r
+ \r
+ /* Specify the sorting desired for this query. */\r
+ void\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 68ac1e4..f7c7099 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -28,7 +28,7 @@ struct _notmuch_query {\r
+     const char *query_string;\r
+     notmuch_sort_t sort;\r
+     notmuch_string_list_t *exclude_terms;\r
+-    notmuch_bool_t omit_excluded_messages;\r
++    notmuch_bool_t omit_excluded;\r
+ };\r
+ \r
+ typedef struct _notmuch_mset_messages {\r
+@@ -92,7 +92,7 @@ notmuch_query_create (notmuch_database_t *notmuch,\r
+ \r
+     query->exclude_terms = _notmuch_string_list_create (query);\r
+ \r
+-    query->omit_excluded_messages = FALSE;\r
++    query->omit_excluded = TRUE;\r
+ \r
+     return query;\r
+ }\r
+@@ -104,9 +104,9 @@ notmuch_query_get_query_string (notmuch_query_t *query)\r
+ }\r
+ \r
+ void\r
+-notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit)\r
++notmuch_query_set_omit_excluded_messages (notmuch_query_t *query, notmuch_bool_t omit_excluded)\r
+ {\r
+-    query->omit_excluded_messages = omit;\r
++    query->omit_excluded = omit_excluded;\r
+ }\r
+ \r
+ void\r
+@@ -220,7 +220,7 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
+       if (query->exclude_terms) {\r
+           exclude_query = _notmuch_exclude_tags (query, final_query);\r
+ \r
+-          if (query->omit_excluded_messages)\r
++          if (query->omit_excluded)\r
+               final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
+                                            final_query, exclude_query);\r
+           else {\r
+-- \r
+1.7.9.1\r
+\r