From fecc39f5dabeeea3b55e3ddec319faa8ccdd5b5d Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 2 Jan 2015 19:49:37 +0200 Subject: [PATCH] Re: [PATCH v2] emacs: add stash support for git send-email command line --- 6c/3d1e897d1104a94c90c476d3bd831f5bd7476b | 158 ++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 6c/3d1e897d1104a94c90c476d3bd831f5bd7476b diff --git a/6c/3d1e897d1104a94c90c476d3bd831f5bd7476b b/6c/3d1e897d1104a94c90c476d3bd831f5bd7476b new file mode 100644 index 000000000..2d8c374de --- /dev/null +++ b/6c/3d1e897d1104a94c90c476d3bd831f5bd7476b @@ -0,0 +1,158 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3C2A9431FAF + for ; Fri, 2 Jan 2015 09:49:35 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id P6mADcrMTzp6 for ; + Fri, 2 Jan 2015 09:49:32 -0800 (PST) +Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com + [74.125.82.52]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + D225A431FAE for ; Fri, 2 Jan 2015 09:49:31 -0800 + (PST) +Received: by mail-wg0-f52.google.com with SMTP id x12so24356381wgg.11 + for ; Fri, 02 Jan 2015 09:49:30 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:in-reply-to:references + :user-agent:date:message-id:mime-version:content-type; + bh=Jqq8nmu+Hlrz70oBoAkWMfbv+GgF9oLQEksY0vnTtKA=; + b=lJRy2JOrdZ/gjOhWG8Cd0KUVdE/PfHkVanI6FPwtVNZ1EZc+I9vTpWFD2lsiaHG+78 + Ja/uEhVHrf6vbCXmLiuHCwxnC2E7rfh9K9GFGP06JCaAEpdzkV+MYwpSXiLF0x+IJgrd + HXn4I0OHZeHtBKGudyYqu10wZz987bFaAy12WJjNyzWOVJPUDX9TlzT8Q3kZdvmMnj5L + /IOed8GOgj/uKtvBPM3kcaib1iab+jrbeEqas7njGtOIuhi+eGQ6lqv4biz8WZF3RIpR + cPcw+fJ1ZGSnHZas+5SzdUH/jjGHC5CUsgMAb/Zf7Dz6BHAL5yk87sJfYd1aZ/9xFEQ8 + 791A== +X-Gm-Message-State: + ALoCoQmtoPHMCly6gNsg9v9MK3WEH58/FOmI6Nl81FGNNJBPr+/ajoOpAny3ibCuHr8uA4Tc5hVE +X-Received: by 10.194.75.195 with SMTP id e3mr96730972wjw.44.1420220970662; + Fri, 02 Jan 2015 09:49:30 -0800 (PST) +Received: from localhost (mobile-internet-bceeb5-193.dhcp.inet.fi. + [188.238.181.193]) + by mx.google.com with ESMTPSA id cg8sm63246636wjc.1.2015.01.02.09.49.29 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Fri, 02 Jan 2015 09:49:30 -0800 (PST) +From: Jani Nikula +To: David Edmondson , notmuch@notmuchmail.org +Subject: Re: [PATCH v2] emacs: add stash support for git send-email command + line +In-Reply-To: +References: <1414525138-838-1-git-send-email-jani@nikula.org> + <1420134332-25698-1-git-send-email-jani@nikula.org> + +User-Agent: Notmuch/0.19+6~gf2e3d2c (http://notmuchmail.org) Emacs/24.4.1 + (x86_64-pc-linux-gnu) +Date: Fri, 02 Jan 2015 19:49:37 +0200 +Message-ID: <874ms9139q.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 02 Jan 2015 17:49:35 -0000 + +On Fri, 02 Jan 2015, David Edmondson wrote: +> On Thu, Jan 01 2015, Jani Nikula wrote: +>> Stash From/To/Cc as --to/--to/--cc, respectively, and Message-Id as +>> --in-reply-to, suitable for pasting to git send-email command line. +>> --- +>> emacs/notmuch-show.el | 38 ++++++++++++++++++++++++++++++++++++++ +>> 1 file changed, 38 insertions(+) +>> +>> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +>> index b8cfbb8a3286..887d877672fc 100644 +>> --- a/emacs/notmuch-show.el +>> +++ b/emacs/notmuch-show.el +>> @@ -1280,6 +1280,7 @@ reset based on the original query." +>> (define-key map "t" 'notmuch-show-stash-to) +>> (define-key map "l" 'notmuch-show-stash-mlarchive-link) +>> (define-key map "L" 'notmuch-show-stash-mlarchive-link-and-go) +>> + (define-key map "G" 'notmuch-show-stash-git-send-email) +>> (define-key map "?" 'notmuch-subkeymap-help) +>> map) +>> "Submap for stash commands") +>> @@ -2131,6 +2132,43 @@ the user (see `notmuch-show-stash-mlarchive-link-alist')." +>> (notmuch-show-stash-mlarchive-link mla) +>> (browse-url (current-kill 0 t))) +>> +>> +(defun notmuch-show-stash-git-helper (addresses prefix) +>> + "Escape, trim, quote, and add PREFIX to each address in list of +>> ADDRESSES." +> +> "...and return the result as a single string." +> +>> + (mapconcat (lambda (x) +>> + (concat prefix "\"" +>> + ;; escape double-quotes +>> + (replace-regexp-in-string +>> + "\"" "\\\\\"" +>> + ;; trim leading and trailing spaces +>> + (replace-regexp-in-string +>> + "\\(^ *\\| *$\\)" "" +>> + x)) "\"")) +>> + addresses " ")) +>> + +>> +(put 'notmuch-show-stash-git-send-email 'notmuch-prefix-doc +>> + "Copy From/To/Cc of current message to kill-ring in a form suitable for pasting to git send-email command line.") +>> + +>> +(defun notmuch-show-stash-git-send-email (&optional no-in-reply-to) +>> + "Copy From/To/Cc/Message-Id of current message to kill-ring in a form suitable for pasting to git send-email command line. +>> + +>> +If invoked with a prefix argument (or NO-IN-REPLY-TO is non-nil, +>> +omit --in-reply-to=." +> +> Missing ")" after "non-nil". +> +>> + (interactive "P") +>> + (notmuch-common-do-stash +>> + (mapconcat 'identity +>> + (remove "" +>> + (list +>> + (notmuch-show-stash-git-helper +>> + (message-tokenize-header (notmuch-show-get-from)) "--to=") +>> + (notmuch-show-stash-git-helper +>> + (message-tokenize-header (notmuch-show-get-to)) "--to=") +>> + (notmuch-show-stash-git-helper +>> + (message-tokenize-header (notmuch-show-get-cc)) "--cc=") +>> + (unless no-in-reply-to +>> + (notmuch-show-stash-git-helper +>> + (list (notmuch-show-get-message-id t)) +>> "--in-reply-to=")))) +> +> This will still generate a trailing space if `no-in-reply-to' is set, +> but I think that we can live with it. + +I know I can! ;) + +Thanks for the review, v3 in reply. + +BR, +Jani. + + +> +>> + " "))) +>> + +>> ;; Interactive part functions and their helpers +>> +>> (defun notmuch-show-generate-part-buffer (message-id nth) +>> -- +>> 2.1.4 -- 2.26.2