discussion and development of piem
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: piem@inbox.kyleam.com
Cc: Kyle Meyer <kyle@kyleam.com>
Subject: [PATCH] Support adding Message-Id to attached patches
Date: Fri, 12 Jun 2020 00:55:23 -0400	[thread overview]
Message-ID: <20200612045523.18120-1-kyle@kyleam.com> (raw)

With an inline patch that has a Message-Id, this information can be
linked up to the patch when applied (e.g., with git-am's --message-id
flag or using a post-applypatch hook [1]).  Unfortunately, this method
fails for projects where it is common to attach patches, as there is
no Message-Id within the patch.

Teach piem-am-ready-mbox how to insert the Message-Id that piem-mid
reports, which should always correspond to the message that contains
the patch attachments.

[1] Here's an example that used to keep the commit->Message-Id mapping
    in git.git:
 piem.el | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/piem.el b/piem.el
index a757092..fcd5d8c 100644
--- a/piem.el
+++ b/piem.el
@@ -101,6 +101,14 @@ (defcustom piem-am-ready-mbox-functions nil
 arguments and inserts the mbox's contents in the current buffer."
   :type 'hook)
+(defcustom piem-add-message-id-header nil
+  "Whether to add Message-Id header to non-mail patches.
+If this value is non-nil and a patch returned by a function in
+`piem-am-ready-mbox-functions' looks like a patch that was
+attached rather than sent inline, add a Message-Id header with
+the value of `piem-mid'."
+  :type 'boolean)
 (defcustom piem-git-executable
   (or (and (boundp 'magit-git-executable) magit-git-executable)
@@ -300,10 +308,19 @@ (defun piem-am-ready-mbox ()
   (when-let ((fn (run-hook-with-args-until-success
     (let ((buffer (generate-new-buffer " *piem am-ready mbox*"))
+          (mid (and piem-add-message-id-header (piem-mid)))
       (with-current-buffer buffer
         (funcall fn)
-        (setq has-content (< 1 (point-max))))
+        (setq has-content (< 1 (point-max)))
+        (when (and has-content mid)
+          (goto-char (point-min))
+          (while (re-search-forward
+                  (rx "From " (>= 40 hex-digit) " Mon Sep 17 00:00:00 2001")
+                  nil t)
+            (search-forward "\n\n")
+            (forward-line -1)
+            (insert (format "Message-Id: <%s>\n" mid)))))
       (if has-content
         (kill-buffer buffer)

base-commit: 54ea4ed7d1bc64222cf837ecc046f7aa4f42c769

             reply	other threads:[~2020-06-12  4:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-12  4:55 Kyle Meyer [this message]
2020-06-13  3:21 ` [PATCH] Support adding Message-Id to attached patches Kyle Meyer
2020-06-13  4:49   ` [PATCH v2] " Kyle Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://git.kyleam.com/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200612045523.18120-1-kyle@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=piem@inbox.kyleam.com \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).