Re: [PATCH 0/4] Allow specifying alternate names for addresses in other_email

[notmuch-archives.git] / 74 / be989d065ff85bdcbb4e4c024b8c4d1effe3de

Return-Path: <tomi.ollila@iki.fi>\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 8764F431FD6\r
        for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 09:26:50 -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 ZJqxnp6EnRHP for <notmuch@notmuchmail.org>;\r
        Thu,  7 Nov 2013 09:26:41 -0800 (PST)\r
Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
        by olra.theworths.org (Postfix) with ESMTP id A11CA431FC3\r
        for <notmuch@notmuchmail.org>; Thu,  7 Nov 2013 09:26:40 -0800 (PST)\r
Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
        by guru.guru-group.fi (Postfix) with ESMTP id ABEEB100051;\r
        Thu,  7 Nov 2013 19:26:32 +0200 (EET)\r
From: Tomi Ollila <tomi.ollila@iki.fi>\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+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
        (x86_64-unknown-linux-gnu)\r
X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
        $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
        !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
Date: Thu, 07 Nov 2013 19:26:32 +0200\r
Message-ID: <m2k3gki0mv.fsf@guru.guru-group.fi>\r
MIME-Version: 1.0\r
Content-Type: text/plain\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: Thu, 07 Nov 2013 17:26:50 -0000\r
\r
On Thu, Oct 24 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
\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 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
LGTM. applies cleanly and tests pass\r
\r
Tomi\r
\r
\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
>\r
>\r
> _______________________________________________\r
> notmuch mailing list\r
> notmuch@notmuchmail.org\r
> http://notmuchmail.org/mailman/listinfo/notmuch\r