From 1dc14264a4103b7b2f47877817b30f9e14b3682b Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Fri, 2 Jan 2015 06:48:52 +0000 Subject: [PATCH] Re: [PATCH v2] emacs: add stash support for git send-email command line --- 4c/d9e9417bdbd1f6b5d595c3ca86279d80f5c300 | 150 ++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 4c/d9e9417bdbd1f6b5d595c3ca86279d80f5c300 diff --git a/4c/d9e9417bdbd1f6b5d595c3ca86279d80f5c300 b/4c/d9e9417bdbd1f6b5d595c3ca86279d80f5c300 new file mode 100644 index 000000000..72aeaae4b --- /dev/null +++ b/4c/d9e9417bdbd1f6b5d595c3ca86279d80f5c300 @@ -0,0 +1,150 @@ +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 89AB5431FBC + for ; Thu, 1 Jan 2015 22:49:05 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.699 +X-Spam-Level: +X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7, UNPARSEABLE_RELAY=0.001] + 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 uvEVOTdd7C7E for ; + Thu, 1 Jan 2015 22:48:58 -0800 (PST) +Received: from mail-we0-f176.google.com (mail-we0-f176.google.com + [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 64852431FAF + for ; Thu, 1 Jan 2015 22:48:57 -0800 (PST) +Received: by mail-we0-f176.google.com with SMTP id w61so4078156wes.21 + for ; Thu, 01 Jan 2015 22:48:56 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:to:cc:subject:in-reply-to:references:user-agent + :from:date:message-id:mime-version:content-type; + bh=Qfb40+diy+U3YHIKlOqXdOLF5vzd+HVuWsyHrHE9EXQ=; + b=GtkoA/T59KsxsAzHQp6j9geDxQkQMpv9eujbqgegVI+6deHpxTHc6m4+dzmV227r5J + S6ATkW8pa3vLd2xTCN8wxK6gUJlba/lem1EjuU6gheY8hIqHoQiCJXZvyGGMsErKV+LN + i1x2gbjIChk9EUp7X0Rrm17X2ncN8BwYsbnaAqRvdUrJ0LwK6QEfSPyIk0M82GWD5VNl + VvuH0qHCzqfMfk3JBDVFgOOCZNk//wYRjhysYQgT8p/ydIILoV/d7fHAK/clNo3nVqUi + wiqSkp8TN9gbKRcW5UOA3sJvn+e17RyxDgM4HiU7eKe14JGFt0kyM/Sq6Ptz++XczRra + 8Ciw== +X-Gm-Message-State: + ALoCoQn7AXEJlda7dqBrvM21u+GtKvastOxw9iLVv8NwP+ZiPMnAQtlGh39GjKUMH6y21Eix3GlN +X-Received: by 10.194.108.98 with SMTP id hj2mr147842832wjb.102.1420181335950; + Thu, 01 Jan 2015 22:48:55 -0800 (PST) +Received: from disaster-area.hh.sledj.net + ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) + by mx.google.com with ESMTPSA id cs8sm53118237wib.1.2015.01.01.22.48.54 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Thu, 01 Jan 2015 22:48:55 -0800 (PST) +Received: from localhost (30000@localhost [local]); + by localhost (OpenSMTPD) with ESMTPA id e5405405; + Fri, 2 Jan 2015 06:48:52 +0000 (UTC) +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH v2] emacs: add stash support for git send-email command + line +In-Reply-To: <1420134332-25698-1-git-send-email-jani@nikula.org> +References: <1414525138-838-1-git-send-email-jani@nikula.org> + <1420134332-25698-1-git-send-email-jani@nikula.org> +User-Agent: none +From: David Edmondson +Date: Fri, 02 Jan 2015 06:48:52 +0000 +Message-ID: +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 06:49:06 -0000 + +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. + +> + " "))) +> + +> ;; Interactive part functions and their helpers +> +> (defun notmuch-show-generate-part-buffer (message-id nth) +> -- +> 2.1.4 -- 2.26.2