Xapian-quoting based batch-tagging.

diff --git a/e2/d7ac95d5c8608d5850533b38069575182146b1 b/e2/d7ac95d5c8608d5850533b38069575182146b1
new file mode 100644 (file)
index 0000000..5b06597
--- /dev/null
+++ b/e2/d7ac95d5c8608d5850533b38069575182146b1
@@ -0,0 +1,88 @@
+Return-Path: <bremner@tethera.net>\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 CFFC4429E38\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:18 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\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 PtZTRWyZfgI9 for <notmuch@notmuchmail.org>;\r
+       Tue, 25 Dec 2012 11:43:09 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7BCED431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 25 Dec 2012 11:43:09 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>) id 1TnaP4-0001iC-Ii\r
+       for notmuch@notmuchmail.org; Tue, 25 Dec 2012 15:43:08 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>) id 1TnaOy-0005mt-Vu\r
+       for notmuch@notmuchmail.org; Tue, 25 Dec 2012 15:43:01 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: Xapian-quoting based batch-tagging.\r
+Date: Tue, 25 Dec 2012 15:42:36 -0400\r
+Message-Id: <1356464567-21779-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Spam_bar: -\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: Tue, 25 Dec 2012 19:43:19 -0000\r
+\r
+This is an alternative version of \r
+\r
+     id:1356313183-9266-1-git-send-email-david@tethera.net\r
+\r
+batch tagging patches rebased on top of \r
+\r
+     id:1356415076-5692-1-git-send-email-amdragon@mit.edu\r
+\r
+This mainly consisted of removing \r
+\r
+     [Patch v9 04/17] notmuch-tag: factor out double quoting routine\r
+     (superceded by one of Austin's patches)\r
+\r
+     [Patch v9 05/17] util/string-util: add a new string tokenized function\r
+     [Patch v9 06/17] unhex_and_quote: new function to quote hex-decoded queries\r
+     [Patch v9 07/17] notmuch-restore: move query handling for batch   \r
+     (uneeded if query is passed verbatim to xapian)\r
+\r
+     I also removed two tests, since they are about how we handle\r
+     quoting:\r
+\r
+     [Patch v9 13/17] test/tagging: add test for compound queries with batch tagging\r
+     [Patch v9 17/17] test/tagging: add test for handling of parenthesized     tag queries.\r
+\r
+A few small fixes were needed to the tests, and a fair amount of\r
+changes to the notmuch-tag man page.\r
+\r
+Diffstat (against Austin's series) is as follows\r
+\r
+ man/man1/notmuch-tag.1 |   99 ++++++++++++++++++++-\r
+ notmuch-tag.c          |  169 ++++++++++++++++++++----------------\r
+ tag-util.c             |   87 +++++++++++++++++--\r
+ tag-util.h             |   15 ++++\r
+ test/tagging           |  195 ++++++++++++++++++++++++++++++++++++++++++\r
+ 5 files changed, 480 insertions(+), 85 deletions(-)\r
+\r
+\r