From: Arun Isaac <arunisaac@systemreboot.net>
To: 63802@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>,
Arun Isaac <arunisaac@systemreboot.net>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#63802] [PATCH 2/3] client: Add git-send-email-headers subcommand.
Date: Mon, 17 Jul 2023 23:19:20 +0100 [thread overview]
Message-ID: <20230717221921.28889-2-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20230717221921.28889-1-arunisaac@systemreboot.net>
* mumi/client.scm: Import (rnrs exceptions).
(git-send-email-headers): New public procedure.
(split-cc): New procedure.
* scripts/mumi.in: Add git-send-email-headers subcommand.
* tests/client.scm (split-cc): New variable.
("split Cc field"): New test.
---
mumi/client.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++-
scripts/mumi.in | 2 ++
tests/client.scm | 8 ++++++++
3 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/mumi/client.scm b/mumi/client.scm
index c30429d..797ec91 100644
--- a/mumi/client.scm
+++ b/mumi/client.scm
@@ -17,6 +17,7 @@
;;; along with mumi. If not, see <http://www.gnu.org/licenses/>.
(define-module (mumi client)
+ #:use-module (rnrs exceptions)
#:use-module (rnrs io ports)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-19)
@@ -38,7 +39,8 @@
print-current-issue
set-current-issue!
clear-current-issue!
- send-email))
+ send-email
+ git-send-email-headers))
(define (git-top-level)
"Return the top-level directory of the current git repository."
@@ -229,6 +231,13 @@ arguments."
name)
" <" address ">"))
+(define (split-cc cc)
+ "Split CC into a list of email addresses."
+ (map (lambda (address)
+ (serialize-email-address (assq-ref address 'name)
+ (assq-ref address 'address)))
+ (assq-ref (parse-email-headers (string-append "Cc: " cc "\n"))
+ 'cc)))
(define* (git-send-email to patches #:optional (options '()))
"Send PATCHES using git send-email to the TO address with
@@ -311,3 +320,43 @@ ISSUE-NUMBER."
"@"
(client-config 'debbugs-host))
other-patches)))))
+
+(define (git-send-email-headers patch)
+ "Print send-email headers for PATCH."
+ (let* (;; Compute headers if configured in git config.
+ (header-command
+ (false-if-exception
+ (call-with-input-pipe* (list "git" "config" "sendemail.headerCmd")
+ get-line)))
+ (headers
+ (if header-command
+ (call-with-input-pipe (string-append header-command " " patch)
+ get-string-all)
+ ""))
+ (external-x-debbugs-cc
+ (cond
+ ((assq-ref (parse-email-headers (string-append headers "\n"))
+ 'x-debbugs-cc)
+ => split-cc)
+ (else '())))
+ ;; Fetch Cc addresses for current issue.
+ (x-debbugs-cc
+ (cond
+ ((assq-ref (reply-email-headers (current-issue-number))
+ 'cc)
+ => split-cc)
+ (else '()))))
+ ;; Print X-Debbugs-Cc header.
+ (display "X-Debbugs-Cc: ")
+ (display (string-join (delete-duplicates
+ (append x-debbugs-cc external-x-debbugs-cc))
+ ", "))
+ (newline)
+ ;; Print headers other than X-Debbugs-Cc.
+ ;; TODO: RFC5322 headers are not restricted to a single
+ ;; line. "Folded" multi-line headers are allowed. Support them.
+ (for-each (lambda (line)
+ (unless (string-prefix-ci? "X-Debbugs-Cc:" line)
+ (display line)
+ (newline)))
+ (string-split headers #\newline))))
diff --git a/scripts/mumi.in b/scripts/mumi.in
index 2295328..8fb7cd4 100644
--- a/scripts/mumi.in
+++ b/scripts/mumi.in
@@ -163,6 +163,8 @@
(client:clear-current-issue!))
(("send-email" . patches)
(client:send-email patches))
+ (("git-send-email-headers" patch)
+ (client:git-send-email-headers patch))
(("mailer" . rest)
(let* ((opts (parse-options rest))
(sender (assoc-ref opts 'sender))
diff --git a/tests/client.scm b/tests/client.scm
index 2b2c1be..ced573b 100644
--- a/tests/client.scm
+++ b/tests/client.scm
@@ -68,6 +68,9 @@ called with."
(define serialize-email-address
(@@ (mumi client) serialize-email-address))
+(define split-cc
+ (@@ (mumi client) split-cc))
+
(test-begin "client")
(test-equal "serialize email address"
@@ -78,6 +81,11 @@ called with."
"\"Bar, Foo\" <foobar@example.com>"
(serialize-email-address "Bar, Foo" "foobar@example.com"))
+(test-equal "split Cc field"
+ (list "Foo <foo@example.com>"
+ "\"Bar, Foo\" <foobar@example.com>")
+ (split-cc "Foo <foo@example.com>, \"Bar, Foo\" <foobar@example.com>"))
+
(test-equal "send patches to new issue"
'(("git" "send-email" "--to=foo@patches.com" "foo.patch")
("git" "send-email" "--to=12345@example.com" "bar.patch" "foobar.patch"))
--
2.39.2
next prev parent reply other threads:[~2023-07-17 22:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 12:11 [bug#63802] [mumi PATCH 0/3] Use consolidated X-Debbugs-Cc header Arun Isaac
2023-05-30 12:14 ` [bug#63802] [mumi PATCH 1/3] client: Do not pass --add-header to git send-email Arun Isaac
2023-05-30 12:14 ` [bug#63802] [mumi PATCH 2/3] client: Add git-send-email-headers subcommand Arun Isaac
2023-06-05 2:31 ` Maxim Cournoyer
2023-06-08 17:09 ` Arun Isaac
2023-06-08 17:29 ` Arun Isaac
2023-05-30 12:14 ` [bug#63802] [mumi PATCH 3/3] client: Use mumi " Arun Isaac
2023-06-05 2:36 ` Maxim Cournoyer
2023-06-05 2:21 ` [bug#63802] [mumi PATCH 1/3] client: Do not pass --add-header to git send-email Maxim Cournoyer
2023-06-08 17:14 ` [bug#63802] [PATCH 1/3] client: Separate serialize-email-address into a function Arun Isaac
2023-06-08 17:14 ` [bug#63802] [PATCH 2/3] client: Add git-send-email-headers subcommand Arun Isaac
2023-07-16 3:39 ` [bug#63802] [mumi PATCH 0/3] Use consolidated X-Debbugs-Cc header Maxim Cournoyer
2023-07-17 22:14 ` Arun Isaac
2023-07-18 15:32 ` Maxim Cournoyer
2023-07-19 16:49 ` bug#63802: " Arun Isaac
2023-06-08 17:14 ` [bug#63802] [PATCH 3/3] client: Use mumi git-send-email-headers subcommand Arun Isaac
2023-07-16 4:01 ` [bug#63802] [mumi PATCH 0/3] Use consolidated X-Debbugs-Cc header Maxim Cournoyer
2023-07-17 22:14 ` Arun Isaac
2023-07-16 3:14 ` Maxim Cournoyer
2023-07-17 22:19 ` [bug#63802] [PATCH 1/3] client: Separate serialize-email-address into a procedure Arun Isaac
2023-07-17 22:19 ` Arun Isaac [this message]
2023-07-17 22:19 ` [bug#63802] [PATCH 3/3] client: Use mumi git-send-email-headers subcommand Arun Isaac
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230717221921.28889-2-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=63802@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.