From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 63378@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
rekado@elephly.net, arunisaac@systemreboot.net
Subject: bug#63378: [PATCH v2] teams: Fix script to produce a single X-Debbugs-Cc header.
Date: Tue, 9 May 2023 22:55:02 -0400 [thread overview]
Message-ID: <21d6e09603863ff5add037ad459131198c699dd6.1683687260.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <875y92vj2j.fsf@gmail.com>
Fixes <https://issues.guix.gnu.org/63378>.
* etc/teams.scm.in (cc): Adjust format pattern.
(sort-members, member->string): New procedures.
(list-members): Refactor in terms of the above procedures.
(main): Adjust the output of the 'cc-members-header-cmd' and
'cc-mentors-header-cmd' actions.
---
etc/teams.scm.in | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/etc/teams.scm.in b/etc/teams.scm.in
index d21f1ff67b..d81ce984f6 100644
--- a/etc/teams.scm.in
+++ b/etc/teams.scm.in
@@ -605,24 +605,28 @@ (define (find-team-by-scope files)
(define (cc . teams)
"Return arguments for `git send-email' to notify the members of the given
TEAMS when a patch is received by Debbugs."
- (format #true
- "~{--add-header=\"X-Debbugs-Cc: ~a\"~^ ~}"
- (map person-email
- (delete-duplicates (append-map team-members teams) equal?))))
+ (let ((members (append-map team-members teams)))
+ (unless (null? members)
+ (format #true "--add-header=\"X-Debbugs-Cc: ~{~a~^, ~}\""
+ (map person-email (sort-members members))))))
+
+(define (sort-members members)
+ "Deduplicate and sort MEMBERS alphabetically by their name."
+ (sort (delete-duplicates members equal?)
+ (lambda (m1 m2)
+ (string<? (person-name m1) (person-name m2)))))
+
+(define (member->string member)
+ "Return the 'email <name>' string representation of MEMBER."
+ (format #false "\"~a\" <~a>" (person-name member) (person-email member)))
(define* (list-members team #:optional port (prefix ""))
"Print the members of the given TEAM."
(define port* (or port (current-output-port)))
(for-each
(lambda (member)
- (format port*
- "~a~a <~a>~%"
- prefix
- (person-name member)
- (person-email member)))
- (sort
- (team-members team)
- (lambda (m1 m2) (string<? (person-name m1) (person-name m2))))))
+ (format port* "~a~a~%" prefix (member->string member)))
+ (sort-members (team-members team))))
(define (list-teams)
"Print all teams, their scope and their members."
@@ -716,13 +720,15 @@ (define (main . args)
(apply cc (find-team-by-scope
(diff-revisions rev-start rev-end))))
(("cc-members-header-cmd" patch-file)
- (for-each (lambda (team-name)
- (list-members (find-team team-name) (current-output-port)
- "X-Debbugs-Cc: "))
- (patch->teams patch-file)))
+ (let* ((teams (map find-team (patch->teams patch-file)))
+ (members (sort-members (append-map team-members teams))))
+ (unless (null? members)
+ (format #true "X-Debbugs-Cc: ~{~a~^, ~}"
+ (map member->string members)))))
(("cc-mentors-header-cmd" patch-file)
- (list-members (find-team "mentors") (current-output-port)
- "X-Debbugs-Cc: "))
+ (format #true "X-Debbugs-Cc: ~{~a~^, ~}"
+ (map member->string
+ (sort-members (team-members (find-team "mentors"))))))
(("get-maintainer" patch-file)
(apply main "list-members" (patch->teams patch-file)))
(("list-teams" . args)
base-commit: 8f92dfd9ae7ac491ab7fb4b425799a8c909708a8
--
2.39.2
prev parent reply other threads:[~2023-05-10 2:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-08 17:17 bug#63378: A single X-Debbugs-CC header must be used Maxim Cournoyer
2023-05-08 18:29 ` bug#63378: [PATCH] teams: Fix script to produce a single X-Debbugs-Cc header Maxim Cournoyer
2023-05-09 13:33 ` bug#63378: A single X-Debbugs-CC header must be used Maxim Cournoyer
2023-05-09 23:43 ` Arun Isaac
2023-05-10 1:15 ` Maxim Cournoyer
2023-05-09 23:55 ` bug#63378: [PATCH] teams: Fix script to produce a single X-Debbugs-Cc header Arun Isaac
2023-05-10 16:15 ` Maxim Cournoyer
2023-05-11 11:13 ` Arun Isaac
2023-05-11 13:18 ` Maxim Cournoyer
2023-05-11 23:59 ` Arun Isaac
2023-05-10 2:55 ` Maxim Cournoyer [this message]
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21d6e09603863ff5add037ad459131198c699dd6.1683687260.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=63378@debbugs.gnu.org \
--cc=arunisaac@systemreboot.net \
--cc=rekado@elephly.net \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
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).