Re: [PATCH 8/8] emacs: Remove interactive behavior of `notmuch-tag'

diff --git a/38/30956fddfb23f8b1eb88492d70949594b00ca9 b/38/30956fddfb23f8b1eb88492d70949594b00ca9
new file mode 100644 (file)
index 0000000..f2ddcee
--- /dev/null
+++ b/38/30956fddfb23f8b1eb88492d70949594b00ca9
@@ -0,0 +1,188 @@
+Return-Path: <jrollins@finestructure.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 1FC79429E4A\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 16:42:44 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 WOHsS55S8A-V for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Nov 2013 16:42:38 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8F51F429E38\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 16:42:38 -0800 (PST)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 13E2332806B;\r
+       Sun,  3 Nov 2013 16:42:36 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-173-75-27.socal.res.rr.com\r
+       [76.173.75.27]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id CE9F0328073;\r
+       Sun,  3 Nov 2013 16:42:32 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 48A2C600B2; Sun,  3 Nov 2013 16:42:32 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 8/8] emacs: Remove interactive behavior of `notmuch-tag'\r
+In-Reply-To: <1382471457-26056-9-git-send-email-amdragon@mit.edu>\r
+References: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+       <1382471457-26056-9-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.16+120~gfd733a4 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 03 Nov 2013 16:42:29 -0800\r
+Message-ID: <8761s9gfpm.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha256; protocol="application/pgp-signature"\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: Mon, 04 Nov 2013 00:42:44 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Tue, Oct 22 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> We no longer use this, since we've lifted all interactive behavior to\r
+> the appropriate interactive entry points.  Because of this,\r
+> `notmuch-tag' also no longer needs to return the tag changes list,\r
+> since the caller always passes it in.\r
+> ---\r
+>  emacs/notmuch-tag.el | 19 ++++---------------\r
+>  1 file changed, 4 insertions(+), 15 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+> index f9c1740..feee17c 100644\r
+> --- a/emacs/notmuch-tag.el\r
+> +++ b/emacs/notmuch-tag.el\r
+> @@ -249,27 +249,18 @@ from TAGS if present."\r
+>         (error "Changed tag must be of the form `+this_tag' or `-that_tag'")=\r
+))))\r
+>      (sort result-tags 'string<)))\r
+>=20=20\r
+> -(defun notmuch-tag (query &optional tag-changes)\r
+> +(defun notmuch-tag (query tag-changes)\r
+>    "Add/remove tags in TAG-CHANGES to messages matching QUERY.\r
+>=20=20\r
+>  QUERY should be a string containing the search-terms.\r
+> -TAG-CHANGES can take multiple forms.  If TAG-CHANGES is a list of\r
+> -strings of the form \"+tag\" or \"-tag\" then those are the tag\r
+> -changes applied.  If TAG-CHANGES is a string then it is\r
+> -interpreted as a single tag change.  If TAG-CHANGES is the string\r
+> -\"-\" or \"+\", or null, then the user is prompted to enter the\r
+> -tag changes.\r
+> +TAG-CHANGES is a list of strings of the form \"+tag\" or\r
+> +\"-tag\" to add or remove tags, respectively.\r
+>=20=20\r
+>  Note: Other code should always use this function alter tags of\r
+>  messages instead of running (notmuch-call-notmuch-process \"tag\" ..)\r
+>  directly, so that hooks specified in notmuch-before-tag-hook and\r
+>  notmuch-after-tag-hook will be run."\r
+>    ;; Perform some validation\r
+> -  (if (string-or-null-p tag-changes)\r
+> -      (if (or (string=3D tag-changes "-") (string=3D tag-changes "+") (n=\r
+ull tag-changes))\r
+> -      (setq tag-changes (notmuch-read-tag-changes\r
+> -                         (notmuch-tag-completions query) nil tag-changes))\r
+> -    (setq tag-changes (list tag-changes))))\r
+\r
+Hey folks.  After a recent upgrade to 0.16+120~gfd733a4+1 I found that\r
+my custom tagging functions weren't working, which I traced back to the\r
+removal of this section.\r
+\r
+Previously notmuch-tag accepted tag changes in two forms: as a list of\r
+tag changes:\r
+\r
+(list "+foo" "-bar")\r
+\r
+or as a space-separated string:\r
+\r
+"+foo -bar"\r
+\r
+This removed section is what would turn the space-separated string into\r
+a list.\r
+\r
+I have custom tagging functions that were written like this:\r
+\r
+(notmuch-search-tag "+spam")\r
+\r
+notmuch-search-tag passes the TAG-CHANGES to notmuch-tag, which was\r
+changing it to a list in this removed section.  Since its removal, all\r
+of my custom functions started throwing the following error:\r
+\r
+Wrong type argument: stringp, 43\r
+\r
+I didn't pay super close attention to the rest of the patch series, but\r
+From=20a backwards compatibility point of view, do we really need to\r
+remove this section?  Is there a problem with specifying tag changes as\r
+a string?  I think it was actually me that last modified notmuch-tag,\r
+and I vaguely remember spending time thinking about how to preserve that\r
+particular way to specify the changes, so that things would be simpler\r
+for simple tag operations.\r
+\r
+In any event, some amount of backwards compatibility has been removed,\r
+so if we do want to keep it removed, we should add a good NEWS item to\r
+explain that peoples custom bindings might break.\r
+\r
+jamie.\r
+\r
+>    (mapc (lambda (tag-change)\r
+>        (unless (string-match-p "^[-+]\\S-+$" tag-change)\r
+>          (error "Tag must be of the form `+this_tag' or `-that_tag'")))\r
+> @@ -278,9 +269,7 @@ notmuch-after-tag-hook will be run."\r
+>      (run-hooks 'notmuch-before-tag-hook)\r
+>      (apply 'notmuch-call-notmuch-process "tag"\r
+>         (append tag-changes (list "--" query)))\r
+> -    (run-hooks 'notmuch-after-tag-hook))\r
+> -  ;; in all cases we return tag-changes as a list\r
+> -  tag-changes)\r
+> +    (run-hooks 'notmuch-after-tag-hook)))\r
+>=20=20\r
+>  (defun notmuch-tag-change-list (tags &optional reverse)\r
+>    "Convert TAGS into a list of tag changes.\r
+> --=20\r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.15 (GNU/Linux)\r
+\r
+iQIcBAEBCAAGBQJSdu12AAoJEO00zqvie6q8qm4P/iNt9rQEue2PXr+S64TIqiWE\r
+0eotrTAfGwcGvu2HrIuRUWELc9Nvix0ZIwT+COOxPB/iNn0l8ONTeQ+ATcOrZcOV\r
+m+H/wBWSFPOP45mYhSCbYQuWlhfO+oKM+9dOIVaHB+RIDkSfKnBgQQVusZVwp7Kw\r
+69LJ+DPTD3J0QnYAqhHblMwEsTc8ESETKbwa72BTugBdQWlQX3A8gBS2ws9V8NM+\r
+PBAT0eiHvnA3Dw2NM7BIqiS1MbvFqCeiHVL5b9Zt0HNEa1/nN6Rkp8th8RhSAWrQ\r
+8kHbUlCpBFdRteXqzgS9ZpfLbiMZPmrDK8RSxL7hbkgWTKKvy7fgYHQ2W7g+pXhm\r
+vMxuMFWhE/KJMVf4pj18NPMOaViU2843CHSYxN+sbKxHr5NrljNOvRBKNCy9nygE\r
+TfLGUqLUI7lXEPis0Izs4X373RJBIM2HqYKgdv3IGmuuKjoslwBzFeJHSwbtJ/f8\r
+6ZLEgu9CL3GC7FLjkjLlGE/wqExSq2slItti7do8ZhGlvJq5fmz0DSeqCIhNM9Z4\r
+SwpvUAHRcF3Z9JXHjHDl1o9+UDFIc0pkIHEs482Vkjlrr9ymtgiSTS4Fzg0GBmbv\r
+jR+gwYDz0FyHU00FL27rF/SGlgMAgHfFU4qt3wb88JUv1LTXikvWqQLCMNjpJJpx\r
+b7X33elCGage5rj/zV5F\r
+=MV+R\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r