Re: [PATCH] emacs: add stash support for git send-email command line
authorDavid Edmondson <dme@dme.org>
Wed, 29 Oct 2014 08:41:22 +0000 (08:41 +0000)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:05:47 +0000 (10:05 -0800)
40/d3bd1a65b7dba15b6c3a9008cafbb487bc1a87 [new file with mode: 0644]

diff --git a/40/d3bd1a65b7dba15b6c3a9008cafbb487bc1a87 b/40/d3bd1a65b7dba15b6c3a9008cafbb487bc1a87
new file mode 100644 (file)
index 0000000..f490444
--- /dev/null
@@ -0,0 +1,173 @@
+Return-Path: <dme@dme.org>\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 11C5B431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Oct 2014 01:41:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001]\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 PCKsS4z3Flxo for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Oct 2014 01:41:26 -0700 (PDT)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+       [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7E821431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Oct 2014 01:41:26 -0700 (PDT)\r
+Received: by mail-wi0-f180.google.com with SMTP id hi2so3872526wib.7\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Oct 2014 01:41:25 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:to:subject:in-reply-to:references:user-agent\r
+       :from:date:message-id:mime-version:content-type;\r
+       bh=XVN2pKdK1fVnTPtKrk0Z5163MfV1YKiwneEeMIioY/I=;\r
+       b=g/SkJdzsRf2X2I7ZEtqVfrxvMY6G5n2JE9OsCKW5ffpnmbJCTwKC+pC3YGpBbwEpYg\r
+       l2H+8Y+l37N0/xmkk/kkaXbHWYnyM9s2uuJs2qxMwqRetnKf26/+oWbByCg49kikvMzG\r
+       te7ExTFQ+lcq3YkPlv+jrMgrmBvSLH8xQQBlpMJ7exKuT7sfVwd2vKGZKzVeOzDCpow4\r
+       DRoh2rKGpGwRHi5DTOXJmSEu2ss1CKpOt/wnwMfDJGYhNl94otjYb1tBomAuM+zrn2ZV\r
+       kIGfcGgszK7oR5OLzdfRPkA6fZ4A+DDD3OYUXVgMyXDKC65W3KfZDPd9btkz5zXYJytV\r
+       3mpg==\r
+X-Gm-Message-State:\r
+ ALoCoQkNWXrAxPZ7D3XBCXcfZbx7S0gu5M9/Vad7PlMU/IG2GNw+fMqcfRec5jQ0O2baReQlqhdQ\r
+X-Received: by 10.180.82.7 with SMTP id e7mr10702666wiy.27.1414572084207;\r
+       Wed, 29 Oct 2014 01:41:24 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+       ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+       by mx.google.com with ESMTPSA id\r
+       bg10sm4377180wjc.47.2014.10.29.01.41.23 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Wed, 29 Oct 2014 01:41:23 -0700 (PDT)\r
+Received: from localhost (30000@localhost [local]);\r
+       by localhost (OpenSMTPD) with ESMTPA id 1cc0af54;\r
+       Wed, 29 Oct 2014 08:41:22 +0000 (UTC)\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: add stash support for git send-email command line\r
+In-Reply-To: <1414525138-838-1-git-send-email-jani@nikula.org>\r
+References: <1414525138-838-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.18.1 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-apple-darwin14.0.0)\r
+From: David Edmondson <dme@dme.org>\r
+Date: Wed, 29 Oct 2014 08:41:22 +0000\r
+Message-ID: <m2h9yn6zf1.fsf@dme.org>\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: Wed, 29 Oct 2014 08:41:30 -0000\r
+\r
+On Tue, Oct 28 2014, Jani Nikula wrote:\r
+> Stash From/To/Cc as --to/--to/--cc, respectively, and Message-Id as\r
+> --in-reply-to, suitable for pasting to git send-email command line.\r
+> ---\r
+>  emacs/notmuch-show.el | 25 +++++++++++++++++++++++++\r
+>  1 file changed, 25 insertions(+)\r
+>\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index a9974826e824..328c93ba0584 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -1274,6 +1274,7 @@ reset based on the original query."\r
+>      (define-key map "t" 'notmuch-show-stash-to)\r
+>      (define-key map "l" 'notmuch-show-stash-mlarchive-link)\r
+>      (define-key map "L" 'notmuch-show-stash-mlarchive-link-and-go)\r
+> +    (define-key map "G" 'notmuch-show-stash-git-send-email)\r
+>      (define-key map "?" 'notmuch-subkeymap-help)\r
+>      map)\r
+>    "Submap for stash commands")\r
+> @@ -2125,6 +2126,30 @@ the user (see `notmuch-show-stash-mlarchive-link-alist')."\r
+>    (notmuch-show-stash-mlarchive-link mla)\r
+>    (browse-url (current-kill 0 t)))\r
+>  \r
+> +(defun notmuch-show-stash-git-helper (addresses prefix)\r
+> +  "Escape, trim, and add PREFIX to each address in list of ADDRESSES."\r
+> +  (when addresses\r
+> +    (mapconcat (lambda (x)\r
+> +             (concat prefix "\""\r
+> +                     ;; escape double-quotes\r
+> +                     (replace-regexp-in-string\r
+> +                      "\"" "\\\\\""\r
+> +                      ;; trim leading and trailing spaces\r
+> +                      (replace-regexp-in-string\r
+> +                       "\\(^ *\\| *$\\)" ""\r
+> +                       x)) "\" "))\r
+> +           addresses "")))\r
+\r
+This doesn't seem quite right. You leave a spurious trailing\r
+space. Maybe that's because you need it in the following function to\r
+separate the from/to/cc elements? That kind of interaction between the\r
+two functions is icky.\r
+\r
+There's no need to test `addresses' at the head of the list - mapconcat\r
+is fine with nil.\r
+\r
+How about:\r
+\r
+(defun notmuch-show-stash-git-helper (addresses prefix)\r
+  "Escape, trim, and add PREFIX to each address in list of ADDRESSES."\r
+  (mapconcat (lambda (x)\r
+              (concat prefix "\""\r
+                      ;; escape double-quotes\r
+                      (replace-regexp-in-string\r
+                       "\"" "\\\\\""\r
+                       ;; trim leading and trailing spaces\r
+                       (replace-regexp-in-string\r
+                        "\\(^ *\\| *$\\)" ""\r
+                        x)) "\""))\r
+            addresses " "))\r
+\r
+This would remove the trailing space, so...\r
+\r
+> +\r
+> +(defun notmuch-show-stash-git-send-email ()\r
+> +  "Copy From/To/Cc/Message-Id of current message to kill-ring in a form suitable for pasting to git send-email command line."\r
+> +  (interactive)\r
+> +  (notmuch-common-do-stash\r
+> +   (concat\r
+> +    (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-from)) "--to=")\r
+> +    (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-to)) "--to=")\r
+> +    (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-cc)) "--cc=")\r
+> +    (concat "--in-reply-to=\"" (notmuch-show-get-message-id t) "\""))))\r
+\r
+...this would have to use something like:\r
+\r
+  (mapconcat 'identity (list\r
+                       (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-from)) "--to=")\r
+                       (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-to)) "--to=")\r
+                       (notmuch-show-stash-git-helper (message-tokenize-header (notmuch-show-get-cc)) "--cc=")\r
+                       (concat "--in-reply-to=\"" (notmuch-show-get-message-id t) "\""))\r
+            "")\r
+\r
+to separate the chunks (untested).\r
+\r
+Could you avoid the double-quote quoting by using single quotes inside\r
+the strings? Do the leading and trailing spaces really matter?\r
+\r
+(Domo: Look, I managed to write 'separate', twice!)\r
+\r
+> +\r
+>  ;; Interactive part functions and their helpers\r
+>  \r
+>  (defun notmuch-show-generate-part-buffer (message-id nth)\r
+> -- \r
+> 2.1.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r