aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2020-06-13 00:49:33 -0400
committerKyle Meyer <kyle@kyleam.com>2020-06-13 00:58:22 -0400
commitd85b6854b2d5bff0d77855de3f687dd06ee0ea82 (patch)
tree8aff6dac9274f726abb71fd496588b564ee1c337
parent54ea4ed7d1bc64222cf837ecc046f7aa4f42c769 (diff)
downloadpiem-d85b6854b2d5bff0d77855de3f687dd06ee0ea82.tar.gz
Support adding Message-Id to attached patches
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: https://lore.kernel.org/git/xmqq7e5ag4g5.fsf@gitster-ct.c.googlers.com/ Message-Id: <20200613044933.4046-1-kyle@kyleam.com>
-rw-r--r--piem.el43
1 files changed, 42 insertions, 1 deletions
diff --git a/piem.el b/piem.el
index a757092..6e13cc9 100644
--- a/piem.el
+++ b/piem.el
@@ -101,6 +101,14 @@ how to create an mbox, it should return a function that takes no
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 return value of `piem-mid'."
+ :type 'boolean)
+
(defcustom piem-git-executable
(or (and (boundp 'magit-git-executable) magit-git-executable)
"git")
@@ -294,16 +302,49 @@ intended to be used by libraries implementing a function for
"Return the current buffer's message ID."
(run-hook-with-args-until-success 'piem-get-mid-functions))
+(defun piem--insert-message-id-header (mid)
+ ;; Be strict about case because this is coming from
+ ;; git-format-patch.
+ (let ((case-fold-search nil))
+ (while (re-search-forward
+ (rx line-start
+ "From " (>= 40 hex-digit) " Mon Sep 17 00:00:00 2001"
+ line-end)
+ nil t)
+ (catch 'has-message-id
+ (let ((header-count 0))
+ (while (and (= (forward-line) 0)
+ (not (looking-at-p
+ (rx line-start (zero-or-one space) line-end))))
+ (cond
+ ((looking-at-p
+ (rx line-start
+ "Message-Id: <" (one-or-more not-newline) ">"
+ line-end))
+ (throw 'has-message-id nil))
+ ((looking-at-p
+ (rx line-start (or "From" "Date" "Subject") ": "
+ not-newline))
+ (cl-incf header-count))))
+ (when (= header-count 3)
+ ;; Found all the expected headers before hitting a
+ ;; blank line. Assume we're in a header.
+ (insert (format "Message-Id: <%s>\n" mid))))))))
+
(defun piem-am-ready-mbox ()
"Return buffer containing an am-ready mbox.
Callers are responsible for killing the buffer."
(when-let ((fn (run-hook-with-args-until-success
'piem-am-ready-mbox-functions)))
(let ((buffer (generate-new-buffer " *piem am-ready mbox*"))
+ (mid (and piem-add-message-id-header (piem-mid)))
has-content)
(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))
+ (piem--insert-message-id-header mid)))
(if has-content
buffer
(kill-buffer buffer)