--- /dev/null
+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 2356C431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 8 Oct 2013 00:27:27 -0700 (PDT)\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 rOgJuPvERXCH for <notmuch@notmuchmail.org>;\r
+ Tue, 8 Oct 2013 00:27:20 -0700 (PDT)\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 D0444431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 8 Oct 2013 00:27:19 -0700 (PDT)\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 1VTRhJ-00079J-8J; Tue, 08 Oct 2013 08:27:18 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] 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 1VTRhI-0003a1-TV; Tue, 08 Oct 2013 08:27:13 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 07/11] emacs: Use notmuch tag --batch for large tag\r
+ queries\r
+In-Reply-To: <1381185201-25197-8-git-send-email-amdragon@mit.edu>\r
+References: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
+ <1381185201-25197-8-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 08 Oct 2013 08:27:12 +0100\r
+Message-ID: <87vc18rzn3.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 2461cb8702d68c66d6081ab66dc5e6ec (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\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.0 points. 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 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: Tue, 08 Oct 2013 07:27:27 -0000\r
+\r
+On Mon, 07 Oct 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> (Unfortunately, it's difficult to first demonstrate this problem with\r
+> a known-broken test because modern Linux kernels have argument length\r
+> limits in the megabytes, which makes Emacs really slow!)\r
+> ---\r
+> emacs/notmuch-lib.el | 8 ++++++++\r
+> emacs/notmuch-tag.el | 12 ++++++++++--\r
+> test/emacs | 8 ++++++++\r
+> 3 files changed, 26 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 22156f1..348112b 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -261,6 +261,14 @@ user-friendly queries."\r
+> "Return a query that matches the message with id ID."\r
+> (concat "id:" (notmuch-escape-boolean-term id)))\r
+> \r
+> +(defun notmuch-hex-encode (str)\r
+> + "Hex-encode STR (e.g., as used by batch tagging).\r
+> +\r
+> +This replaces spaces, percents, and double quotes in STR with\r
+> +%NN where NN is the hexadecimal value of the character."\r
+> + (replace-regexp-in-string\r
+> + "[ %\"]" (lambda (match) (format "%%%02x" (aref match 0))) str))\r
+> +\r
+> ;;\r
+> \r
+> (defun notmuch-common-do-stash (text)\r
+> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+> index 064cfa8..a4eec14 100644\r
+> --- a/emacs/notmuch-tag.el\r
+> +++ b/emacs/notmuch-tag.el\r
+> @@ -242,6 +242,8 @@ from TAGS if present."\r
+> (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))\r
+> (sort result-tags 'string<)))\r
+> \r
+> +(defconst notmuch-tag-argument-limit 1000)\r
+> +\r
+\r
+Another triviality: I think this should have a doc string saying use\r
+batch tag if the query is longer than this.\r
+\r
+The other patches in the series up to this point LGTM.\r
+\r
+Mark\r
+\r
+\r
+> (defun notmuch-tag (query &optional tag-changes)\r
+> "Add/remove tags in TAG-CHANGES to messages matching QUERY.\r
+> \r
+> @@ -268,8 +270,14 @@ notmuch-after-tag-hook will be run."\r
+> tag-changes)\r
+> (unless (null tag-changes)\r
+> (run-hooks 'notmuch-before-tag-hook)\r
+> - (apply 'notmuch-call-notmuch-process "tag"\r
+> - (append tag-changes (list "--" query)))\r
+> + (if (<= (length query) notmuch-tag-argument-limit)\r
+> + (apply 'notmuch-call-notmuch-process "tag"\r
+> + (append tag-changes (list "--" query)))\r
+> + ;; Use batch tag mode to avoid argument length limitations\r
+> + (let ((batch-op (concat (mapconcat #'notmuch-hex-encode tag-changes " ")\r
+> + " -- " query)))\r
+> + (message "Batch tagging with %s" batch-op)\r
+> + (notmuch-call-notmuch-process :stdin-string batch-op "tag" "--batch")))\r
+> (run-hooks 'notmuch-after-tag-hook))\r
+> ;; in all cases we return tag-changes as a list\r
+> tag-changes)\r
+> diff --git a/test/emacs b/test/emacs\r
+> index 05295af..2917189 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -122,6 +122,14 @@ test_emacs "(notmuch-search \"$os_x_darwin_thread\")\r
+> output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+> test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"\r
+> \r
+> +test_begin_subtest "Add tag (large query)"\r
+> +# We use a long query to force us into batch mode and use a funny tag\r
+> +# that requires escaping for batch tagging.\r
+> +test_emacs "(notmuch-tag (concat \"$os_x_darwin_thread\" \" or \" (make-string notmuch-tag-argument-limit ?x)) \"+tag-from-%-large-query\")"\r
+> +output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)\r
+> +test_expect_equal "$output" "thread:XXX 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox tag-from-%-large-query unread)"\r
+> +notmuch tag -tag-from-%-large-query $os_x_darwin_thread\r
+> +\r
+> test_begin_subtest "notmuch-show: add single tag to single message"\r
+> test_emacs "(notmuch-show \"$os_x_darwin_thread\")\r
+> (execute-kbd-macro \"+tag-from-show-view\")"\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff