[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#63378: [PATCH v2] teams: Fix script to produce a single X-Debbugs-Cc
From: |
Maxim Cournoyer |
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 |
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
bug#63378: [PATCH v2] teams: Fix script to produce a single X-Debbugs-Cc header.,
Maxim Cournoyer <=