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