From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gJG4IQQNgmT8CQAASxT56A (envelope-from ) for ; Thu, 08 Jun 2023 19:16:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id EC6bIQQNgmTBfQAAauVa8A (envelope-from ) for ; Thu, 08 Jun 2023 19:16:52 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 646912901C for ; Thu, 8 Jun 2023 19:16:47 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="KxX/2Kh+"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686244608; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=TxIsWRb933kbMKt20ovYCT1l+gLthf3NXnuRFqR0Wx8=; b=kyKRFw7bogloDB8nbNSwF0FlD6jJ7V9+wcF9r6CMgx6T/+VjEb2pgCb8GuWCmZrOQIaVrN +MSwP9lCgKIPcrTV0LrOTnsnslUyNKNpvihKU8SQWifguUAtsmj0cI6pElsafohxHvqtvP 9UCnNIsptY6GyQcCx41Xchama6fq3eeO4FO03uulfy5n65/0+sl6AXcY5R09Ou8/VaKo+g nNSTaTaXShG/IvwBE7utSEcUup6q9AKgIBcOOd/H3CXXrci9ILhvNyIEq/2T7hXlTTPhzg DbM61E0BsUBnBkWJFTx5TgSgw3NJfK6N9QRQSznOd4Jc/ts1f4h0mwUXm5QQWg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="KxX/2Kh+"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686244608; a=rsa-sha256; cv=none; b=G0w95HFfgETl8zX5SF1I2/RrZGuqZQlzde0++Gd8Q64Y1CpVsbjI8F6cp4bWj7XQDE3G3N CZh7UuUkCA+zM+U0Nx2GEnfkw0cIB4ibOnoriPo0taxuHwFaY/Q3KcjhAop9fLmG4a1THV MGc137abPuC/wpnuiwCQ44nvHFRqZNPKMd0dhTZENR4ad6SJi2WJ+JK5B5dZffAj8jQPmr pAO6vqMTFPncRGt1DeCGJ1F0k+TRU+EY0a3aZba1N84QR2ufm4H2UHk9UAWJgdes+12grQ gi92vWxTHfWXmQbX9SnmJutCjS8yOZp3P9QiYGvyH30N0ajO7RWkFxlLKxljWA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7JF0-0003TM-6c; Thu, 08 Jun 2023 13:16:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7JEx-0003Re-F6 for guix-patches@gnu.org; Thu, 08 Jun 2023 13:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7JEx-0007iz-5m for guix-patches@gnu.org; Thu, 08 Jun 2023 13:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7JEw-0008Oy-1H; Thu, 08 Jun 2023 13:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63802] [PATCH 2/3] client: Add git-send-email-headers subcommand. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 08 Jun 2023 17:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63802 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63802@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Maxim Cournoyer X-Debbugs-Original-Xcc: Arun Isaac , Maxim Cournoyer Received: via spool by 63802-submit@debbugs.gnu.org id=B63802.168624452832238 (code B ref 63802); Thu, 08 Jun 2023 17:16:01 +0000 Received: (at 63802) by debbugs.gnu.org; 8 Jun 2023 17:15:28 +0000 Received: from localhost ([127.0.0.1]:57430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7JEN-0008Nr-TR for submit@debbugs.gnu.org; Thu, 08 Jun 2023 13:15:28 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:53342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7JEK-0008NS-9x for 63802@debbugs.gnu.org; Thu, 08 Jun 2023 13:15:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TxIsWRb933kbMKt20ovYCT1l+gLthf3NXnuRFqR0Wx8=; b=KxX/2Kh+zHWkqwukMUPHKez07t 9jTGCEL8PsXtaqJC+wUuHqp5ufL53KFiNEHPdmsc4kOcq5DWxe4l2Ed4xkSYNOq27ShOXWQSO6Bj/ 5XoMyfIPjOZuwEAPhw+yRI2JCSXFHr5PGPa+lTRVK14OGf0LhDO7xNuER10r5rOmojlpw7p0tVpY7 z/aw2xzCYcS5LRfHpP8z5dNr8mb5wwRXOzxwedPkG3weTb9mex9pisdeU4nf35wYwMYkBV9xwvYN2 dF0mvYKjoCzfHEs+AQhtck79Z4uyCf7kMrFcqbjDppJwfP7c8g9c6vAlMj8/fqSIVSI0HU7MUCu8g 8L8VWBQg==; Received: from [192.168.2.1] (port=42546 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1q7JEG-000UaF-2L; Thu, 08 Jun 2023 18:15:21 +0100 From: Arun Isaac Date: Thu, 8 Jun 2023 18:14:51 +0100 Message-Id: <20230608171453.14788-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608171453.14788-1-arunisaac@systemreboot.net> References: <20230608171453.14788-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: UNKNOWN X-Migadu-Flow: FLOW_IN X-Spam-Score: 2.05 X-Migadu-Queue-Id: 646912901C X-Migadu-Scanner: in3.migadu.com X-Migadu-Spam-Score: 2.05 X-TUID: d/gbHrfSu8xA * mumi/client.scm: Import (rnrs exceptions). (git-send-email-headers): New public function. (split-cc): New function. * scripts/mumi.in: Add git-send-email-headers subcommand. * tests/client.scm (split-cc): New variable. ("split Cc field"): New test. --- mumi/client.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++- scripts/mumi.in | 2 ++ tests/client.scm | 8 ++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/mumi/client.scm b/mumi/client.scm index c30429d..b89e608 100644 --- a/mumi/client.scm +++ b/mumi/client.scm @@ -17,6 +17,7 @@ ;;; along with mumi. If not, see . (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,9 @@ print-current-issue set-current-issue! clear-current-issue! - send-email)) + send-email + git-send-email-headers + compose)) (define (git-top-level) "Return the top-level directory of the current git repository." @@ -229,6 +232,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 +321,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 + (guard (ex (#t #f)) + (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\" " (serialize-email-address "Bar, Foo" "foobar@example.com")) +(test-equal "split Cc field" + (list "Foo " + "\"Bar, Foo\" ") + (split-cc "Foo , \"Bar, Foo\" ")) + (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