--- /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 295B6431FC9\r
+ for <notmuch@notmuchmail.org>; Fri, 25 Oct 2013 16:10: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 rb5jVi363LJt for <notmuch@notmuchmail.org>;\r
+ Fri, 25 Oct 2013 16:10:21 -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 08910431FC7\r
+ for <notmuch@notmuchmail.org>; Fri, 25 Oct 2013 16:10:21 -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 1VZqWE-0002de-S7; Sat, 26 Oct 2013 00:10:15 +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 1VZqWE-0006K6-Fk; Sat, 26 Oct 2013 00:10:14 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 00/11] Fix search tagging races\r
+In-Reply-To: <1382627951-25252-1-git-send-email-amdragon@mit.edu>\r
+References: <1382627951-25252-1-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: Sat, 26 Oct 2013 00:10:12 +0100\r
+Message-ID: <87txg59cbv.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: d2ecb311316381e23c67ad8bf60fb53e (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: Fri, 25 Oct 2013 23:10:27 -0000\r
+\r
+\r
+\r
+On Thu, 24 Oct 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> This is v2 of id:1381185201-25197-1-git-send-email-amdragon@mit.edu.\r
+> It fixes several comments from Mark and Jani. This has been rebased\r
+> on top of the tag completion changes, so doing * from a large search\r
+> buffer will no longer crash. Hence, this series depends on the\r
+> (currently pending) series in\r
+> id:1382487721-31776-1-git-send-email-amdragon@mit.edu.\r
+\r
+This looks good to me +1\r
+\r
+Mark\r
+\r
+>\r
+> This version does not address what happens when you * on a search\r
+> buffer that's still filling. With this series, it will apply to all\r
+> messages that have appeared when the user finishes entering tag\r
+> changes. This isn't ideal, but this seems pretty obscure and I'm not\r
+> sure what the right answer is, so I'm punting it to the future.\r
+>\r
+> Another thing that may be worth changing in a follow-up is what\r
+> messages * applies to. Currently, * applies *only* to matched\r
+> messages, not all threads in the search, which I think was an accident\r
+> of implementation. This series retains that behavior, but opens up\r
+> the possibility of applying to all threads instead. I think that\r
+> would be much more consistent and less surprising behavior.\r
+>\r
+> An approximate diff from v1 is below. This diff is prior to rebasing,\r
+> since the post-rebase diff is not useful.\r
+>\r
+> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+> index a4eec14..36937fb 100644\r
+> --- a/emacs/notmuch-tag.el\r
+> +++ b/emacs/notmuch-tag.el\r
+> @@ -242,7 +242,11 @@ 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
+> +(defconst notmuch-tag-argument-limit 1000\r
+> + "Use batch tagging if the tagging query is longer than this.\r
+> +\r
+> +This limits the length of arguments passed to the notmuch CLI to\r
+> +avoid system argument length limits and performance problems.")\r
+> \r
+> (defun notmuch-tag (query &optional tag-changes)\r
+> "Add/remove tags in TAG-CHANGES to messages matching QUERY.\r
+> @@ -276,7 +280,6 @@ notmuch-after-tag-hook will be run."\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
+> diff --git a/notmuch-client.h b/notmuch-client.h\r
+> index 1b14910..8bc1a2a 100644\r
+> --- a/notmuch-client.h\r
+> +++ b/notmuch-client.h\r
+> @@ -144,7 +144,8 @@ chomp_newline (char *str)\r
+> #define NOTMUCH_FORMAT_MIN 1\r
+> /* The minimum non-deprecated structured output format version.\r
+> * Requests for format versions below this will print a stern warning.\r
+> - * Must be >= NOTMUCH_FORMAT_MIN and < NOTMUCH_FORMAT_CUR.\r
+> + * Must be between NOTMUCH_FORMAT_MIN and NOTMUCH_FORMAT_CUR,\r
+> + * inclusive.\r
+> */\r
+> #define NOTMUCH_FORMAT_MIN_ACTIVE 1\r
+> \r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index 1d14651..7c973b3 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -53,13 +53,13 @@ sanitize_string (const void *ctx, const char *str)\r
+> * NULL. */\r
+> static int\r
+> get_thread_query (notmuch_thread_t *thread,\r
+> - char **matched_out, char **unmached_out)\r
+> + char **matched_out, char **unmatched_out)\r
+> {\r
+> notmuch_messages_t *messages;\r
+> char *escaped = NULL;\r
+> size_t escaped_len = 0;\r
+> \r
+> - *matched_out = *unmached_out = NULL;\r
+> + *matched_out = *unmatched_out = NULL;\r
+> \r
+> for (messages = notmuch_thread_get_messages (thread);\r
+> notmuch_messages_valid (messages);\r
+> @@ -69,17 +69,16 @@ get_thread_query (notmuch_thread_t *thread,\r
+> const char *mid = notmuch_message_get_message_id (message);\r
+> /* Determine which query buffer to extend */\r
+> char **buf = notmuch_message_get_flag (\r
+> - message, NOTMUCH_MESSAGE_FLAG_MATCH) ? matched_out : unmached_out;\r
+> - /* Allocate the query buffer is this is the first message */\r
+> - if (!*buf && (*buf = talloc_strdup (thread, "")) == NULL)\r
+> - return -1;\r
+> + message, NOTMUCH_MESSAGE_FLAG_MATCH) ? matched_out : unmatched_out;\r
+> /* Add this message's id: query. Since "id" is an exclusive\r
+> * prefix, it is implicitly 'or'd together, so we only need to\r
+> * join queries with a space. */\r
+> if (make_boolean_term (thread, "id", mid, &escaped, &escaped_len) < 0)\r
+> return -1;\r
+> - *buf = talloc_asprintf_append_buffer (\r
+> - *buf, "%s%s", **buf ? " " : "", escaped);\r
+> + if (*buf)\r
+> + *buf = talloc_asprintf_append_buffer (*buf, " %s", escaped);\r
+> + else\r
+> + *buf = talloc_strdup (thread, escaped);\r
+> if (!*buf)\r
+> return -1;\r
+> }\r
projects / notmuch-archives.git / commitdiff