Re: [Patch v7 00/13] Add NOTMUCH_MESSAGE_FLAG_EXCLUDED flag

diff --git a/cc/e182584b31e4707c80fc35273e8b69916548ff b/cc/e182584b31e4707c80fc35273e8b69916548ff
new file mode 100644 (file)
index 0000000..2cd03a6
--- /dev/null
+++ b/cc/e182584b31e4707c80fc35273e8b69916548ff
@@ -0,0 +1,154 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 B2E2B431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 12:30:07 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.401\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.401 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       FREEMAIL_REPLY=2.499, NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3]\r
+       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 SLhHZzEE-P5v for <notmuch@notmuchmail.org>;\r
+       Fri,  2 Mar 2012 12:30:07 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A8F84431E84\r
+       for <notmuch@notmuchmail.org>; Fri,  2 Mar 2012 12:30:05 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1S3Z73-0003dc-5k; Fri, 02 Mar 2012 20:30:01 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1S3Z72-0001tN-Kl; Fri, 02 Mar 2012 20:30:00 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ Jameson Graef Rollins <jrollins@finestructure.net>\r
+Subject: Re: [Patch v7 00/13] Add NOTMUCH_MESSAGE_FLAG_EXCLUDED flag\r
+In-Reply-To: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.11.1+277~g6441649 (http://notmuchmail.org) Emacs/23.2.1\r
+       (i486-pc-linux-gnu)\r
+Date: Fri, 02 Mar 2012 20:31:47 +0000\r
+Message-ID: <871upawxqk.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: c151b21dddc29410e89bc96fd6679986 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.2\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.2 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  1.0 FREEMAIL_REPLY From and body contain different freemails\r
+       *  0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Fri, 02 Mar 2012 20:30:07 -0000\r
+\r
+On Thu,  1 Mar 2012 22:30:32 +0000, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> This is essentially the same as\r
+> id:"1330157204-26094-1-git-send-email-markwalters1009@gmail.com" but\r
+> has been rebased against master. The changes are to patch 12/13 for\r
+> notmuch-show.el (which was posted as a followup to the previous series)\r
+> and to the tests (patch 9/13) which changed in Austin's JSON show\r
+> rewrite.\r
+\r
+This series has some significant speed issues in some use cases. It also\r
+defaults to returning excluded messages on the command line which is\r
+wrong.\r
+\r
+This adds an option --include-excluded to tell search to return all\r
+threads (excluded threads will show up as [0/n] in the match column) but\r
+otherwise (default) omits them.\r
+\r
+It is not clear whether there is sufficient utility to make it\r
+worthwhile keeping this option but it should make the series usable\r
+while that is worked out.\r
+\r
+I will try to check old emails and work out what the uses were/corner\r
+cases fixed by the series and post that later. It may be the case that \r
+the show part of this series is worth keeping but not the search part.\r
+\r
+Best wishes \r
+\r
+Mark\r
+\r
+\r
+--->8--- \r
+\r
+>From 64416494f4eceb9f0afbdcb973fd7a82e1e2fcf5 Mon Sep 17 00:00:00 2001\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+Date: Fri, 2 Mar 2012 20:19:01 +0000\r
+Subject: [PATCH] cli: make notmuch-search.c default to omitting excluded messages\r
+\r
+This is a temporary measure to make notmuch-search.c default to\r
+omitting threads only matching in excluded messages entirely. This is\r
+intended as a temporary measure while we decide whether to revert this\r
+part of the exclude_flag series entirely.\r
+---\r
+ notmuch-search.c |    4 ++++\r
+ 1 files changed, 4 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index f6061e4..3d73bd5 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -436,6 +436,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+     int offset = 0;\r
+     int limit = -1; /* unlimited */\r
+     notmuch_bool_t no_exclude = FALSE;\r
++    notmuch_bool_t include_excluded = FALSE;\r
+     unsigned int i;\r
+ \r
+     enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
+@@ -458,6 +459,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+                                 { "tags", OUTPUT_TAGS },\r
+                                 { 0, 0 } } },\r
+       { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &include_excluded, "include-excluded", '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
+@@ -514,6 +516,8 @@ notmuch_search_command (void *ctx, 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
+     }\r
++    if (!include_excluded)\r
++      notmuch_query_set_omit_excluded_messages (query, TRUE);\r
+ \r
+     switch (output) {\r
+     default:\r
+-- \r
+1.7.2.3\r
+\r