Re: notmuch_query_add_tag_excluded and notmuch_query_search_threads

diff --git a/a1/175ff3de38d04c80860d01fb21f96978c62d42 b/a1/175ff3de38d04c80860d01fb21f96978c62d42
new file mode 100644 (file)
index 0000000..f2cb73d
--- /dev/null
+++ b/a1/175ff3de38d04c80860d01fb21f96978c62d42
@@ -0,0 +1,117 @@
+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 1AA55431FD0\r
+       for <notmuch@notmuchmail.org>; Mon,  8 Dec 2014 09:17:53 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 abcPYVQ4cSuZ for <notmuch@notmuchmail.org>;\r
+       Mon,  8 Dec 2014 09:17:49 -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 90C50431FC0\r
+       for <notmuch@notmuchmail.org>; Mon,  8 Dec 2014 09:17:49 -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 1Xy1w5-0003dc-Hi; Mon, 08 Dec 2014 17:17:45 +0000\r
+Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Xy1w5-0007yN-5g; Mon, 08 Dec 2014 17:17:25 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: notmuch_query_add_tag_excluded and notmuch_query_search_threads\r
+In-Reply-To: <87r3wbe4si.fsf@maritornes.cs.unb.ca>\r
+References: <1417905319-astroid-0-i86er7iwg5-10728@strange>\r
+       <87388rfzhw.fsf@maritornes.cs.unb.ca>\r
+       <1417958519-astroid-0-ydniq6pte2-8575@strange>\r
+       <87wq63ef9s.fsf@maritornes.cs.unb.ca>\r
+       <1417962498-astroid-0-zqj7j2s0ov-9575@strange>\r
+       <87r3wbe4si.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.18.1+86~gef5e66a (http://notmuchmail.org) Emacs/23.4.1\r
+       (i486-pc-linux-gnu)\r
+Date: Mon, 08 Dec 2014 17:17:24 +0000\r
+Message-ID: <87y4qi83iz.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 87.81.223.162\r
+X-QM-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: ddb8490478411c8ab9c42674f3cd47b0 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\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 -0.1 points.\r
+       Summary of the scoring: \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
+       * -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: Mon, 08 Dec 2014 17:17:53 -0000\r
+\r
+\r
+Hi\r
+\r
+>\r
+> At the end of this message is a simpler example, that I think\r
+> demonstrates a bug. At the very list it's not very nice that the\r
+> destructiveness only shows up when excludes are involved.\r
+>\r
+> Here is the output; note the second exclude query!\r
+\r
+I think I know what is causing this and can (almost) give a fix.\r
+\r
+The problem is that _notmuch_exclude_tags in lib/query.cc is not\r
+idempotent: it iterates through the list of excluded tag attached to\r
+query and changes any which match a tag in the query to "". But this\r
+gets confused if applied a second time as it sees an empty string rather\r
+than Ktag (where "K" is the prefix for 'tag'). \r
+\r
+We could just check in _notmuch_exclude_tags whether the excluded item\r
+is "" and if so, just skip it. (I am not sure what the right syntax for\r
+this in the mix of C and C++ that happens in query.cc)\r
+\r
+Alternatively we could try and modify the list of excluded tags directly\r
+when doing the iteration (ie link the previous tag to the next\r
+tag). \r
+\r
+Since both of these do modify the actual query (as we do currently)\r
+there is a possibility that a user could be surprised. I think the user\r
+can't modify the actual query string so I don't think this actually\r
+occurs.\r
+\r
+Any thoughts?\r
+\r
+Mark\r
+\r
+\r
+\r
+ \r
+\r