X-Loop: help-debbugs@HIDDEN Subject: bug#66027: Add a feature to automatically close specified bug reports upon committing. Resent-From: Giovanni Biscuolo <g@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN Resent-Date: Sat, 16 Sep 2023 09:38:02 +0000 Resent-Message-ID: <handler.66027.B.169485707010023 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 66027 <at> debbugs.gnu.org X-Debbugs-Original-To: bug-guix@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.169485707010023 (code B ref -1); Sat, 16 Sep 2023 09:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2023 09:37:50 +0000 Received: from localhost ([127.0.0.1]:45388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qhRkM-0002bb-7D for submit <at> debbugs.gnu.org; Sat, 16 Sep 2023 05:37:50 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <g@HIDDEN>) id 1qhRkH-0002bJ-BB for submit <at> debbugs.gnu.org; Sat, 16 Sep 2023 05:37:49 -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 <g@HIDDEN>) id 1qhRk4-0004ui-Uc for bug-guix@HIDDEN; Sat, 16 Sep 2023 05:37:32 -0400 Received: from ns13.heimat.it ([46.4.214.66]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from <g@HIDDEN>) id 1qhRk3-0007uW-37 for bug-guix@HIDDEN; Sat, 16 Sep 2023 05:37:32 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id CD3833009C1 for <bug-guix@HIDDEN>; Sat, 16 Sep 2023 09:37:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oo7vkFO74-1T for <bug-guix@HIDDEN>; Sat, 16 Sep 2023 09:37:27 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.217]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id 321AA3009C0 for <bug-guix@HIDDEN>; Sat, 16 Sep 2023 09:37:27 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id C2FAE29D0C55 for <bug-guix@HIDDEN>; Sat, 16 Sep 2023 11:37:26 +0200 (CEST) Received: (nullmailer pid 10986 invoked by uid 1000); Sat, 16 Sep 2023 09:37:26 -0000 From: Giovanni Biscuolo <g@HIDDEN> Organization: Xelera.eu Date: Sat, 16 Sep 2023 11:37:25 +0200 Message-ID: <87fs3e792i.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=46.4.214.66; envelope-from=g@HIDDEN; helo=ns13.heimat.it X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, following a (lengthy) discussion on guix-devel [1] I propose to add the new feature to our currently used server side post-receive git hook. Some details about the implementation have been discussed with other interested persons in [1] and I'll try to summarize them in this thread Soon=E2=84=A2. To complete this feature request (wishlist) we need: 1. code implementation in the git hook _and_ testing 2. documentation ("Contributing" section) 3. installation on out git server I'm going to take ownership of this bug (wishlist) but I'm not able to do it on my own because I miss some info and authorization on the server side. (to be continued...) Happy hacking! Gio' [1] https://yhetil.org/guix/8734zrn1sc.fsf@HIDDEN/ =2D-=20 Giovanni Biscuolo Xelera IT Infrastructures --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmUFd1YMHGdAeGVsZXJh LmV1AAoJENN9DqfOzDkSW6EQAN+lOQU7aJlTzHZLj9f7uOez/ahT5NrrX6xLoDbv +H5pVvzw+CNEzqAQzot1vpvSo1TPdTETH8BD+DUrfH5REkyJ4aQlbOXJ0z01fsgJ FvwR1rMEklhZTk4kOU0Er/6p57aUzR9Xsl+Y6oWnqzAmRuhNmp+ZOwpZcuQNY055 89zCUIA0z3+O4zhFcStwiwGCKTcApjjWhWjPj12Kzxh665+IYXXvcMB2rEwWoKsY tWMTonQ6VeKUbslp9nLAsszPJ6wXbq4ZIsyFbrsGbXiVJ9qtYYcxhNVlnYXqUTbV C8vFdcYong9VL4CeIQQhs3zbyWTjnPxQWJ5ZrWvBU/DLz24vimZ+/PR3Qd2T455/ ARWjnd/MmyQZGak9GHwCaw9CldX/xwri0fqpqcakhnmrpFkakYxrDkXNA/HQXy+5 Yj/F/s8QTyooVSDh62fUBULAhkYWOPAbg1U62KlF2eQjKMnYZUpledCCoD4tgX+U rszPd7TK5AkvfPENgUEGGkkNMJSx/FIsSSZYOSA0WKF5T7uzh0wGstemxCZ6eIht af6/bm3BPf5ze3zLiDvgWpOnIFIZrs/p9OzUuysVEJPY0D/40RohAvElyMoT+kkB g3xf0n41z2Qrv6xUnJvconmofHN+GxxDbF2pgfB9Bb0wUZui2kth0bcn9Wk9TZTr Q1uP =i/uF -----END PGP SIGNATURE----- --=-=-=--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Giovanni Biscuolo <g@HIDDEN> Subject: bug#66027: Acknowledgement (Add a feature to automatically close specified bug reports upon committing.) Message-ID: <handler.66027.B.169485707010023.ack <at> debbugs.gnu.org> References: <87fs3e792i.fsf@HIDDEN> X-Gnu-PR-Message: ack 66027 X-Gnu-PR-Package: guix Reply-To: 66027 <at> debbugs.gnu.org Date: Sat, 16 Sep 2023 09:38:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): bug-guix@HIDDEN If you wish to submit further information on this problem, please send it to 66027 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 66027: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66027 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
Received: (at control) by debbugs.gnu.org; 16 Sep 2023 12:39:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 16 08:39:13 2023 Received: from localhost ([127.0.0.1]:45643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qhUZt-0004gi-EB for submit <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:39:13 -0400 Received: from ns13.heimat.it ([46.4.214.66]:49362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <g@HIDDEN>) id 1qhUZo-0004gQ-P3 for control <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:39:12 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id 6D7D03009C1 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U5rBXK3_xAW9 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:54 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.217]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id 2179D3009C0 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:54 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id 9362329D19D7 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 14:38:53 +0200 (CEST) Received: (nullmailer pid 16933 invoked by uid 1000); Sat, 16 Sep 2023 12:38:52 -0000 From: Giovanni Biscuolo <g@HIDDEN> To: control <at> debbugs.gnu.org Subject: i command you... Organization: Xelera.eu Date: Sat, 16 Sep 2023 14:38:52 +0200 Message-ID: <877coq70o3.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) owner 66027 ! severity 66027 whishlist tags 66027 notabug moreinfo help quit This is a new feature request so it's a wishlist. I'll try to send patches, any help is very wellcome obviously! Happy hacking, Gio' -- Giovanni Biscuolo Xelera IT Infrastructures
Received: (at control) by debbugs.gnu.org; 16 Sep 2023 12:39:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 16 08:39:13 2023 Received: from localhost ([127.0.0.1]:45643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qhUZt-0004gi-EB for submit <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:39:13 -0400 Received: from ns13.heimat.it ([46.4.214.66]:49362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <g@HIDDEN>) id 1qhUZo-0004gQ-P3 for control <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:39:12 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id 6D7D03009C1 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U5rBXK3_xAW9 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:54 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.217]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id 2179D3009C0 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:38:54 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id 9362329D19D7 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 14:38:53 +0200 (CEST) Received: (nullmailer pid 16933 invoked by uid 1000); Sat, 16 Sep 2023 12:38:52 -0000 From: Giovanni Biscuolo <g@HIDDEN> To: control <at> debbugs.gnu.org Subject: i command you... Organization: Xelera.eu Date: Sat, 16 Sep 2023 14:38:52 +0200 Message-ID: <877coq70o3.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) owner 66027 ! severity 66027 whishlist tags 66027 notabug moreinfo help quit This is a new feature request so it's a wishlist. I'll try to send patches, any help is very wellcome obviously! Happy hacking, Gio' -- Giovanni Biscuolo Xelera IT Infrastructures
Received: (at control) by debbugs.gnu.org; 16 Sep 2023 12:47:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 16 08:47:23 2023 Received: from localhost ([127.0.0.1]:45648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qhUhl-0007Yt-BF for submit <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:47:23 -0400 Received: from ns13.heimat.it ([46.4.214.66]:49944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <g@HIDDEN>) id 1qhUhg-0007Yb-2R for control <at> debbugs.gnu.org; Sat, 16 Sep 2023 08:47:20 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id 005D23009C1 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:47:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dxQzC-0KNg5U for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:47:01 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.217]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id B1EE03009C0 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 12:47:01 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id C4BFB29D1A83 for <control <at> debbugs.gnu.org>; Sat, 16 Sep 2023 14:47:00 +0200 (CEST) Received: (nullmailer pid 17286 invoked by uid 1000); Sat, 16 Sep 2023 12:47:00 -0000 From: Giovanni Biscuolo <g@HIDDEN> To: control <at> debbugs.gnu.org Subject: i command you... Organization: Xelera.eu Date: Sat, 16 Sep 2023 14:47:00 +0200 Message-ID: <875y4a70aj.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) severity 66027 wishlist quit Sorry fixing bad severity level! -- Giovanni Biscuolo Xelera IT Infrastructures
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH] build: Add a commit-msg hook that embeds Change-Id in commit messages. References: <87fs3e792i.fsf@HIDDEN> In-Reply-To: <87fs3e792i.fsf@HIDDEN> Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: g@HIDDEN, bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Sun, 08 Oct 2023 17:00:02 +0000 Resent-Message-ID: <handler.66027.B66027.169678435316045 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: 66027 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN>, g@HIDDEN, ludo@HIDDEN, Christopher Baines <mail@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, Giovanni Biscuolo <g@HIDDEN> X-Debbugs-Original-Xcc: Giovanni Biscuolo <g@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169678435316045 (code B ref 66027); Sun, 08 Oct 2023 17:00:02 +0000 Received: (at 66027) by debbugs.gnu.org; 8 Oct 2023 16:59:13 +0000 Received: from localhost ([127.0.0.1]:58457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qpX7Y-0004Aj-Nc for submit <at> debbugs.gnu.org; Sun, 08 Oct 2023 12:59:13 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]:48606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qpX7W-0004AU-T5 for 66027 <at> debbugs.gnu.org; Sun, 08 Oct 2023 12:59:11 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1e1a2e26afcso2406620fac.1 for <66027 <at> debbugs.gnu.org>; Sun, 08 Oct 2023 09:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696784325; x=1697389125; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hZ12fWCjJZiM5d6RBmhh6lpYb1LTFcRGe+Z1idpS4S8=; b=Wqo8y62BVgoLnREe8pP/qmX+jnkuln0bF114O3hJsey/xEFppfr6uj7j0H2tg/IiYI QszMnkwuThx7K1skNsFC0AJGs0Pyactxp8vJJEwRS3HfF0WD838JT7ikDpjiO9Hs8jC7 1VgfEBNsR08z2ldeGTrg8Tf8ml9q/4bvR0GpUPR/osQGhUaKQVLBDWwrfAxNJgkXtSMx hQPOwRIvDlyiIydqNrDC+7pCyySKSP5IEOlHflvfzvEdT+NUEsZXZaL7XCgzushww90y RKfAG6Qe+0Qnb0skcnySWRwNXa3iVMvBmpEjGLpKy7NKrJklo8z0E60kcVYBmQFRJG2H mUHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696784325; x=1697389125; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hZ12fWCjJZiM5d6RBmhh6lpYb1LTFcRGe+Z1idpS4S8=; b=Dw3zEEyEQ4uddzhGTES1gbNWYkexpVbuDOQWhyhbAbTFn8txcFkfQbgojI2Fd6LDLo BPvXhAbdre0UmkqHDz0gZ6UqTRu3qIrFzchgrEefH0ec5vlSKcQNrVORNio5EinqRxjt Pi4V1m7Zv5CEQnHI86EfDofSrzznvSNIEoKY85aW9B/4vkYbBFPLiXwWOOgfNPzCtLdX O0G5TKyr17SAWfOOzuALzUivH5UAuNBStbNmXIdU4mjlNdH4eXgs8BgdlZce7Rr/Jxzw l7ggCumeYTJaBT3NYP3SxjysBVLg3/P0mdK1hmG5Aio1Su8ZfoToVnuD3RVrCTINCe0e PbNQ== X-Gm-Message-State: AOJu0YwHfckTjBhbIjNT5mq8E+hEFTy19StBfjC+8M5/P0vpPGq6EMiT ifO2qEeD9+AhIxFT1KtFYLoJQ3J537Z0JA== X-Google-Smtp-Source: AGHT+IERSNJ2njx79sKGtsmlw7U2eqjhPlmC7Pl1GuTfu7EciHutFYhobiyi5aBG99cZONBApqKLxQ== X-Received: by 2002:a05:6870:7010:b0:1c0:5f7a:896f with SMTP id u16-20020a056870701000b001c05f7a896fmr15639928oae.8.1696784324694; Sun, 08 Oct 2023 09:58:44 -0700 (PDT) Received: from localhost.localdomain (dsl-158-21.b2b2c.ca. [66.158.158.21]) by smtp.gmail.com with ESMTPSA id c26-20020a0ca9da000000b0065b079366a7sm3175685qvb.114.2023.10.08.09.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 09:58:43 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Date: Sun, 8 Oct 2023 12:58:22 -0400 Message-ID: <9a58086598da5059232a05ce2a423e57e3ba997e.1696783796.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Partially implements <https://issues.guix.gnu.org/66027>. This will make it possible to track a merged commit back to its original posting on the mailing list, and open the door to new opportunities such as closing fully merged series automatically. * Makefile.am (COMMIT_MSG_MAGIC): New variable. (.git/hooks/commit-msg): New target. * etc/git/commit-msg: New file. * doc/contributing.texi (Configuring Git): Document Change-Id. Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6 --- Makefile.am | 12 +++++- doc/contributing.texi | 10 ++++- etc/git/commit-msg | 92 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) create mode 100755 etc/git/commit-msg diff --git a/Makefile.am b/Makefile.am index 310a231259..b860af7258 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1172,7 +1172,17 @@ cuirass-jobs: $(GOBJECTS) git config --add include.path ../etc/git/gitconfig; \ fi -nodist_noinst_DATA = .git/hooks/pre-push .git/config +COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +.git/hooks/commit-msg: etc/git/commit-msg + $(AM_V_at)if test -d .git; then \ + if test -f $@ && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \ + mkdir -p $@.d && mv $@ $@.d && \ + @ echo user commit-msg hook moved to $@.d/commit-msg; \ + fi; \ + cp etc/git/commit-msg $@; \ + fi + +nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg # Downloading up-to-date PO files. diff --git a/doc/contributing.texi b/doc/contributing.texi index 864190b119..778bfb8fe6 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1575,8 +1575,16 @@ Configuring Git use @command{git config --local}, or edit @file{.git/config} in the repository instead of @file{~/.gitconfig}. +@cindex commit-msg hook Other important Git configuration will automatically be configured when -building the project (@pxref{Building from Git}). +building the project (@pxref{Building from Git}). A +@file{.git/hooks/commit-msg} hook will be installed that embeds +@samp{Change-Id} Git @emph{trailers} in your commit messages for +traceability purposes. It is important to preserve these when editing +your commit messages, particularly if a first version of your proposed +changes was already published. If you have a @file{commit-msg} hook of +your own you would like to use with Guix, you can place it under the +@file{.git/hooks/commit-msg.d/} directory. @node Sending a Patch Series @subsection Sending a Patch Series diff --git a/etc/git/commit-msg b/etc/git/commit-msg new file mode 100755 index 0000000000..0826f3a56e --- /dev/null +++ b/etc/git/commit-msg @@ -0,0 +1,92 @@ +#!/bin/sh +# From Gerrit Code Review 3.6.1 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +### Guix modifications start +COMMIT_MSG_MAGIC=VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +top=$(git rev-parse --show-toplevel) +for msg_hook in "$top/.git/hooks/commit-msg.d/"*; do + if ! sh "$msg_hook"; then + echo "error while running $msg_hook" + exit 1 + fi +done +### Guix modifications end + +set -u + +# avoid [[ which is not POSIX sh. +if test "$#" != 1 ; then + echo "$0 requires an argument." + exit 1 +fi + +if test ! -f "$1" ; then + echo "file does not exist: $1" + exit 1 +fi + +# Do not create a change id if requested +if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then + exit 0 +fi + +if git rev-parse --verify HEAD >/dev/null 2>&1; then + refhash="$(git rev-parse HEAD)" +else + refhash="$(git hash-object -t tree /dev/null)" +fi + +random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git hash-object --stdin) +dest="$1.tmp.${random}" + +trap 'rm -f "${dest}"' EXIT + +if ! git stripspace --strip-comments < "$1" > "${dest}" ; then + echo "cannot strip comments from $1" + exit 1 +fi + +if test ! -s "${dest}" ; then + echo "file is empty: $1" + exit 1 +fi + +reviewurl="$(git config --get gerrit.reviewUrl)" +if test -n "${reviewurl}" ; then + if ! git interpret-trailers --parse < "$1" | grep -q '^Link:.*/id/I[0-9a-f]\{40\}$' ; then + if ! git interpret-trailers \ + --trailer "Link: ${reviewurl%/}/id/I${random}" < "$1" > "${dest}" ; then + echo "cannot insert link footer in $1" + exit 1 + fi + fi +else + # Avoid the --in-place option which only appeared in Git 2.8 + # Avoid the --if-exists option which only appeared in Git 2.15 + if ! git -c trailer.ifexists=doNothing interpret-trailers \ + --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then + echo "cannot insert change-id line in $1" + exit 1 + fi +fi + +if ! mv "${dest}" "$1" ; then + echo "cannot mv ${dest} to $1" + exit 1 +fi base-commit: 9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH v2] build: Add a commit-msg hook that embeds Change-Id in commit messages. References: <87fs3e792i.fsf@HIDDEN> In-Reply-To: <87fs3e792i.fsf@HIDDEN> Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: g@HIDDEN, maxim.cournoyer@HIDDEN, bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Mon, 09 Oct 2023 15:06:02 +0000 Resent-Message-ID: <handler.66027.B66027.16968639131166 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: 66027 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-Debbugs-Original-Xcc: Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.16968639131166 (code B ref 66027); Mon, 09 Oct 2023 15:06:02 +0000 Received: (at 66027) by debbugs.gnu.org; 9 Oct 2023 15:05:13 +0000 Received: from localhost ([127.0.0.1]:60691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qprom-0000Ij-Cw for submit <at> debbugs.gnu.org; Mon, 09 Oct 2023 11:05:12 -0400 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]:48528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qproj-0000IU-56 for 66027 <at> debbugs.gnu.org; Mon, 09 Oct 2023 11:05:11 -0400 Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-65b0c9fb673so24335096d6.1 for <66027 <at> debbugs.gnu.org>; Mon, 09 Oct 2023 08:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696863882; x=1697468682; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=H2AmQBJG5gk5Poy3Pa32/fluUTrdWt8PkLkVRwFI21A=; b=GHVeAfYE8uu25zjDNgXKbZ8f8grUL+p1MD1jSzBYMHdLtKaek6vo/fQXz6h8DEvWhP BMDeeCVvE5Lvsd9FOtGeXphy/dY9gl1lHeOC7cq2sNCaxvrEegDSXL+DLyaRoKwpflrg mnoHn2DkFXV4ypv/wQDGJcrMWQ5TUSqTLpA7mwgxehBfuJdgjYHNFnrfLj3C5+SkmjqP ojJvVQKr7vCnwtcsBQAP2HWwysntzTyXS3W89a4tySInKhfQpels+KX76B8V4MnkM15O pi180k18PBJutwqEZoxh04pkt5HD6hL3RN/NoJ535SKDARk80q6QTHplDS/7g2f8bow+ X7fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696863882; x=1697468682; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H2AmQBJG5gk5Poy3Pa32/fluUTrdWt8PkLkVRwFI21A=; b=kSL7XSgEzJMQHBZlfI3e7TrIIR4++oiTEUcMNbPh2+syFk6gFI2uXnbRssLWAL9rSn Z54OYsyIjH6DrsTNKEv87FWuPVEyMqwen7yKr6aFQlwpw4reJPYasXy9Tuu/SwvrmWie dchd0tafGPrphoRkzZ7P0fXJeo38lxrFBwp8FW2xpfhHw4WZh+Fk/cFdYfq/mWuuRlLp ipsLz1xwIMWFPtceN8yZ+LmHH8a0h8RDFpF70VMEJ6pS7JtS52PsKKk7PetumdSCxmfF U5TQQ/korWQ4IvliaONa+HiiTiy1KBhrhomjVVPQj0715Vbjz9TFU6ZdIcVl6mPVZpEC Qt8w== X-Gm-Message-State: AOJu0YwROmrvdWQK4n77YTEDs78c99n0i0+FIfT0CVgqMwloot83b7oV Yh1aNJedkY+N0eNB2rgiS2/qTXb717c= X-Google-Smtp-Source: AGHT+IEF8KMB/84Cf2VU2KNK++/wvc96ivi1TolNSl02gmPK4JCRE2ed9Yuah1hUA8zDyk485DveKw== X-Received: by 2002:a05:6214:4a4c:b0:658:24e2:f237 with SMTP id ph12-20020a0562144a4c00b0065824e2f237mr13895973qvb.31.1696863882344; Mon, 09 Oct 2023 08:04:42 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id q11-20020a0ce20b000000b0065b13180892sm3917536qvl.16.2023.10.09.08.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 08:04:42 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Date: Mon, 9 Oct 2023 11:03:52 -0400 Message-ID: <5cf8fc887ccaf4e0d81828293ea5c1bb13e747fd.1696863754.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Partially implements <https://issues.guix.gnu.org/66027>. This will make it possible to track a merged commit back to its original posting on the mailing list, and open the door to new opportunities such as closing fully merged series automatically. * Makefile.am (COMMIT_MSG_MAGIC): New variable. (.git/hooks/commit-msg): New target. * etc/git/commit-msg: New file. * doc/contributing.texi (Configuring Git): Document Change-Id. Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6 --- Changes in v2: * Guard against nonexistant .git/hooks/commit-msg.d in commit-msg hook Makefile.am | 12 +++++- doc/contributing.texi | 10 ++++- etc/git/commit-msg | 94 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 etc/git/commit-msg diff --git a/Makefile.am b/Makefile.am index 310a231259..b860af7258 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1172,7 +1172,17 @@ cuirass-jobs: $(GOBJECTS) git config --add include.path ../etc/git/gitconfig; \ fi -nodist_noinst_DATA = .git/hooks/pre-push .git/config +COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +.git/hooks/commit-msg: etc/git/commit-msg + $(AM_V_at)if test -d .git; then \ + if test -f $@ && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \ + mkdir -p $@.d && mv $@ $@.d && \ + @ echo user commit-msg hook moved to $@.d/commit-msg; \ + fi; \ + cp etc/git/commit-msg $@; \ + fi + +nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg # Downloading up-to-date PO files. diff --git a/doc/contributing.texi b/doc/contributing.texi index 864190b119..778bfb8fe6 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1575,8 +1575,16 @@ Configuring Git use @command{git config --local}, or edit @file{.git/config} in the repository instead of @file{~/.gitconfig}. +@cindex commit-msg hook Other important Git configuration will automatically be configured when -building the project (@pxref{Building from Git}). +building the project (@pxref{Building from Git}). A +@file{.git/hooks/commit-msg} hook will be installed that embeds +@samp{Change-Id} Git @emph{trailers} in your commit messages for +traceability purposes. It is important to preserve these when editing +your commit messages, particularly if a first version of your proposed +changes was already published. If you have a @file{commit-msg} hook of +your own you would like to use with Guix, you can place it under the +@file{.git/hooks/commit-msg.d/} directory. @node Sending a Patch Series @subsection Sending a Patch Series diff --git a/etc/git/commit-msg b/etc/git/commit-msg new file mode 100755 index 0000000000..dfa07918bb --- /dev/null +++ b/etc/git/commit-msg @@ -0,0 +1,94 @@ +#!/bin/sh +# From Gerrit Code Review 3.6.1 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +### Guix modifications start +COMMIT_MSG_MAGIC=VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +top=$(git rev-parse --show-toplevel) +if test -d "$top/.git/hooks/commit-msg.d/"; then + for msg_hook in "$top/.git/hooks/commit-msg.d/"*; do + if ! sh "$msg_hook"; then + echo "error while running $msg_hook" + exit 1 + fi + done +fi +### Guix modifications end + +set -u + +# avoid [[ which is not POSIX sh. +if test "$#" != 1 ; then + echo "$0 requires an argument." + exit 1 +fi + +if test ! -f "$1" ; then + echo "file does not exist: $1" + exit 1 +fi + +# Do not create a change id if requested +if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then + exit 0 +fi + +if git rev-parse --verify HEAD >/dev/null 2>&1; then + refhash="$(git rev-parse HEAD)" +else + refhash="$(git hash-object -t tree /dev/null)" +fi + +random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git hash-object --stdin) +dest="$1.tmp.${random}" + +trap 'rm -f "${dest}"' EXIT + +if ! git stripspace --strip-comments < "$1" > "${dest}" ; then + echo "cannot strip comments from $1" + exit 1 +fi + +if test ! -s "${dest}" ; then + echo "file is empty: $1" + exit 1 +fi + +reviewurl="$(git config --get gerrit.reviewUrl)" +if test -n "${reviewurl}" ; then + if ! git interpret-trailers --parse < "$1" | grep -q '^Link:.*/id/I[0-9a-f]\{40\}$' ; then + if ! git interpret-trailers \ + --trailer "Link: ${reviewurl%/}/id/I${random}" < "$1" > "${dest}" ; then + echo "cannot insert link footer in $1" + exit 1 + fi + fi +else + # Avoid the --in-place option which only appeared in Git 2.8 + # Avoid the --if-exists option which only appeared in Git 2.15 + if ! git -c trailer.ifexists=doNothing interpret-trailers \ + --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then + echo "cannot insert change-id line in $1" + exit 1 + fi +fi + +if ! mv "${dest}" "$1" ; then + echo "cannot mv ${dest} to $1" + exit 1 +fi base-commit: 87ffb3d3fbcc9273cb77f22e153ed31a70e2da11 -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH v2] build: Add a commit-msg hook that embeds Change-Id in commit messages. Resent-From: Simon Tournier <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Thu, 12 Oct 2023 14:45:02 +0000 Resent-Message-ID: <handler.66027.B66027.169712186719344 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, 66027 <at> debbugs.gnu.org Cc: Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169712186719344 (code B ref 66027); Thu, 12 Oct 2023 14:45:02 +0000 Received: (at 66027) by debbugs.gnu.org; 12 Oct 2023 14:44:27 +0000 Received: from localhost ([127.0.0.1]:44053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qqwvL-00051w-Du for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 10:44:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:38110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1qqwvH-00051X-I3 for 66027 <at> debbugs.gnu.org; Thu, 12 Oct 2023 10:44:25 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3232e96deaaso229555f8f.0 for <66027 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 07:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697121835; x=1697726635; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9ecw1++DY0Tn8azDB9sMqgqlWlUXnGNfJlHlUp19wBU=; b=Idpsu2vyScx5L0x7vB7g+zVgO64naXsYETmkdO3FXID6/6kJADqipbii0kgCkEgat0 v2nWPaTAnha1hsOvsazvKi/r1Tq3JZZKAV3N6dWZzIXBQ6YX2wV0iifEASTnHv0Q4Ntl NKa68AIh9LXRTn1qOb1iwAagGahOBZhng1ijg2SZyRKG1rxaRXqEfvP2PkYv2NOc6usY s0Fyk7lWx4poQfIe0fgrgYh5yHw8x/lUY8Q+8YaaN4F+p99V3Qwr3EgWTj2zF2TA3u0K OeLP81IyQHsq2osrr90eFW353RDrcVesC8ORSE1Djw5xgFoiCjsBsvxqCw26mhC/4uPD XtLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697121835; x=1697726635; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ecw1++DY0Tn8azDB9sMqgqlWlUXnGNfJlHlUp19wBU=; b=w9IhL/02Mi/Ox8RE1XEGTfOcch4xdgpe34LQKkVg0k+bfz+1FzDuB+3Xaad5/K/x2G 7sZ8UrUh9eKf83jh42NJ+kyjyrp23b5iQXOPXPRwHRQ5CyNw5D8UUyy4Jay7OUBoh9gs 47DHSn1JJDCE3zSSkvdoyLs98nuMJJzEAMP+HVIAgy89f4Q1sHrjOU8QiXkdVmkFJtjS YLajZ4B6uop9v/j+nU4PTWlPoam724UL4UaoASfnqmhl9zJ43GMqknjLRYyQ+svdvSaB nqbm+DgaO1sO8h36UHeZzzrVBHDCFTTzCS6cHwfgYooRzi0T6XaQK0m0+hdvtt5UZtr0 /FQg== X-Gm-Message-State: AOJu0YwmQEVG9qIHao8QDsnFyYkbxi7jKbEdpapSIfvR2DtifTW6vuyh dQ+81i2n7s/Q2es2Q9efwHU= X-Google-Smtp-Source: AGHT+IFoYug77oUHMBLBNjjCVFzjaRWVmhyQ+cPPdycspbSuaWlaXo5EVM+dvcdV4S8xk46CPMpwQQ== X-Received: by 2002:adf:ab49:0:b0:32d:974b:6dde with SMTP id r9-20020adfab49000000b0032d974b6ddemr344728wrc.0.1697121834960; Thu, 12 Oct 2023 07:43:54 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id p5-20020a7bcc85000000b00406447b798bsm7856wma.37.2023.10.12.07.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 07:43:54 -0700 (PDT) From: Simon Tournier <zimon.toutoune@HIDDEN> In-Reply-To: <5cf8fc887ccaf4e0d81828293ea5c1bb13e747fd.1696863754.git.maxim.cournoyer@HIDDEN> References: <87fs3e792i.fsf@HIDDEN> <5cf8fc887ccaf4e0d81828293ea5c1bb13e747fd.1696863754.git.maxim.cournoyer@HIDDEN> Date: Thu, 12 Oct 2023 15:54:45 +0200 Message-ID: <86r0m02bfe.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, On Mon, 09 Oct 2023 at 11:03, Maxim Cournoyer <maxim.cournoyer@HIDDEN> w= rote: > + particularly if a first version of your proposed > +changes was already published. Sorry if my English is not good enough. Here, it is not clear for me what =E2=80=9Cpublished=E2=80=9D means. Does it mean =E2=80=9Ctracked=E2= =80=9D by Debbugs? If yes, I would suggest: particularly if a previous version of your proposed changes was already submitted for review. Cheers, simon
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH v3 1/3] build: Add a commit-msg hook that embeds Change-Id in commit messages. References: <87fs3e792i.fsf@HIDDEN> In-Reply-To: <87fs3e792i.fsf@HIDDEN> Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Fri, 13 Oct 2023 03:36:01 +0000 Resent-Message-ID: <handler.66027.B66027.169716813830401 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: 66027 <at> debbugs.gnu.org Cc: Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169716813830401 (code B ref 66027); Fri, 13 Oct 2023 03:36:01 +0000 Received: (at 66027) by debbugs.gnu.org; 13 Oct 2023 03:35:38 +0000 Received: from localhost ([127.0.0.1]:44525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qr8xd-0007uA-0T for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:38 -0400 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]:60675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qr8xZ-0007to-5S for 66027 <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:35 -0400 Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-66d09b6d007so9502746d6.1 for <66027 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 20:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697168104; x=1697772904; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pVUGZvD5Di5dQ+2xRcA0CVqxoW7pVEvTrsOUV5WW5nc=; b=Kse5BM6+SRm4hTR5m5eyxP6zSaw9AWZUXVOo5RqlEzZpQIN1Or631HnP9IjvKlEvKU 6RQPo9/vTlfaud1drDtt2+rWXuJ8Izk3uxuKxEHRcUSSGpSwVhGba5yKDFOzG1zVMG4e aXgw+fXXWK1txq03AiY1C++OvbGSw9qiJMsHRZX6SoRqPxDJ5L3o2UmPvvyEf0eyOdBO jRarZKkwrT3aDo2w3iUkrZIS0cQ5EfKsTGaa35MyyAJKqWMFbYGkb0Vf/63WFid270z3 iSp6mgkiStClbIYg0JL4gZ8Q6RQEK2MNrkgFvQpqv0r9V0fws6sjPwUfNzOvy3Jsn9Zt vWvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697168104; x=1697772904; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pVUGZvD5Di5dQ+2xRcA0CVqxoW7pVEvTrsOUV5WW5nc=; b=LgHbDOyYT/DvDRyHaRBYjpoWEGDXCW2WNTswNfeNhW+vgjXGBfC8WfIXm4gkjPQ6xH jU2HZHUkzTyb3C0noLL/8B3MKFt/dUI3cLy969jIXibVjt56GCNfMkVoOYrDiiHyf1XB 9optRLEt5OZ64u3Fp1e2Ty7U2yaOthJ3Znw422NmhpP4hMJHf01cTkyq6rBUze8SAdyx y/yeQZhWIDE3KNSkR5AH9J/6YA8cyrPTTbOo1CUOtRcNdNsNt8lPDvFUVlz8/S55wEhH tsEfk12KURDbPM9Tw0MsSN9vnv5+vVemrda6FNynfxeGVvJAsmben4kliI62KZ2lN8Pl wu0g== X-Gm-Message-State: AOJu0YwXM3cnaJcdifbIEdnjLbWx7FlEpaOCs1KBOGAy+IZb91cqNahf oCJn/FF1ZAgSlTEEtGN9vIm28IIvJke7rg== X-Google-Smtp-Source: AGHT+IFTSuIRcrHfV4wCHhF6/49QX8OU0cZ9nI/D3io6QSlFnV4/F2KpTvNQx4afGtN4QhSKSjJAZg== X-Received: by 2002:a05:6214:c65:b0:66d:1256:6dbc with SMTP id t5-20020a0562140c6500b0066d12566dbcmr5389954qvj.44.1697168104451; Thu, 12 Oct 2023 20:35:04 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id v5-20020a0ccd85000000b00655e428604esm329512qvm.137.2023.10.12.20.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 20:35:03 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Date: Thu, 12 Oct 2023 23:33:43 -0400 Message-ID: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Partially implements <https://issues.guix.gnu.org/66027>. This will make it possible to track a merged commit back to its original posting on the mailing list, and open the door to new opportunities such as closing fully merged series automatically. * Makefile.am (COMMIT_MSG_MAGIC): New variable. (.git/hooks/commit-msg): New target. * etc/git/commit-msg: New file. * doc/contributing.texi (Configuring Git): Document Change-Id. Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6 Reviewed-by: Simon Tournier <zimon.toutoune@HIDDEN> --- Changes in v3: - Clarify documentation text, as suggested by Simon Makefile.am | 12 +++++- doc/contributing.texi | 10 ++++- etc/git/commit-msg | 94 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 etc/git/commit-msg diff --git a/Makefile.am b/Makefile.am index 310a231259..b860af7258 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1172,7 +1172,17 @@ cuirass-jobs: $(GOBJECTS) git config --add include.path ../etc/git/gitconfig; \ fi -nodist_noinst_DATA = .git/hooks/pre-push .git/config +COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +.git/hooks/commit-msg: etc/git/commit-msg + $(AM_V_at)if test -d .git; then \ + if test -f $@ && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \ + mkdir -p $@.d && mv $@ $@.d && \ + @ echo user commit-msg hook moved to $@.d/commit-msg; \ + fi; \ + cp etc/git/commit-msg $@; \ + fi + +nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg # Downloading up-to-date PO files. diff --git a/doc/contributing.texi b/doc/contributing.texi index 864190b119..43cfae26c4 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1575,8 +1575,16 @@ Configuring Git use @command{git config --local}, or edit @file{.git/config} in the repository instead of @file{~/.gitconfig}. +@cindex commit-msg hook Other important Git configuration will automatically be configured when -building the project (@pxref{Building from Git}). +building the project (@pxref{Building from Git}). A +@file{.git/hooks/commit-msg} hook will be installed that embeds +@samp{Change-Id} Git @emph{trailers} in your commit messages for +traceability purposes. It is important to preserve these when editing +your commit messages, particularly if a first version of your proposed +changes was already submitted for review. If you have a +@file{commit-msg} hook of your own you would like to use with Guix, you +can place it under the @file{.git/hooks/commit-msg.d/} directory. @node Sending a Patch Series @subsection Sending a Patch Series diff --git a/etc/git/commit-msg b/etc/git/commit-msg new file mode 100755 index 0000000000..dfa07918bb --- /dev/null +++ b/etc/git/commit-msg @@ -0,0 +1,94 @@ +#!/bin/sh +# From Gerrit Code Review 3.6.1 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +### Guix modifications start +COMMIT_MSG_MAGIC=VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= +top=$(git rev-parse --show-toplevel) +if test -d "$top/.git/hooks/commit-msg.d/"; then + for msg_hook in "$top/.git/hooks/commit-msg.d/"*; do + if ! sh "$msg_hook"; then + echo "error while running $msg_hook" + exit 1 + fi + done +fi +### Guix modifications end + +set -u + +# avoid [[ which is not POSIX sh. +if test "$#" != 1 ; then + echo "$0 requires an argument." + exit 1 +fi + +if test ! -f "$1" ; then + echo "file does not exist: $1" + exit 1 +fi + +# Do not create a change id if requested +if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then + exit 0 +fi + +if git rev-parse --verify HEAD >/dev/null 2>&1; then + refhash="$(git rev-parse HEAD)" +else + refhash="$(git hash-object -t tree /dev/null)" +fi + +random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git hash-object --stdin) +dest="$1.tmp.${random}" + +trap 'rm -f "${dest}"' EXIT + +if ! git stripspace --strip-comments < "$1" > "${dest}" ; then + echo "cannot strip comments from $1" + exit 1 +fi + +if test ! -s "${dest}" ; then + echo "file is empty: $1" + exit 1 +fi + +reviewurl="$(git config --get gerrit.reviewUrl)" +if test -n "${reviewurl}" ; then + if ! git interpret-trailers --parse < "$1" | grep -q '^Link:.*/id/I[0-9a-f]\{40\}$' ; then + if ! git interpret-trailers \ + --trailer "Link: ${reviewurl%/}/id/I${random}" < "$1" > "${dest}" ; then + echo "cannot insert link footer in $1" + exit 1 + fi + fi +else + # Avoid the --in-place option which only appeared in Git 2.8 + # Avoid the --if-exists option which only appeared in Git 2.15 + if ! git -c trailer.ifexists=doNothing interpret-trailers \ + --trailer "Change-Id: I${random}" < "$1" > "${dest}" ; then + echo "cannot insert change-id line in $1" + exit 1 + fi +fi + +if ! mv "${dest}" "$1" ; then + echo "cannot mv ${dest} to $1" + exit 1 +fi base-commit: 0c1d893b346d2fdbe7bb89b26fc913325b4bd57b -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH v3 2/3] gnu: patman: Apply patch for new Change-Id setting. Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, vagrant@HIDDEN, bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Fri, 13 Oct 2023 03:36:02 +0000 Resent-Message-ID: <handler.66027.B66027.169716814030410 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: 66027 <at> debbugs.gnu.org Cc: Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Efraim Flashner <efraim@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169716814030410 (code B ref 66027); Fri, 13 Oct 2023 03:36:02 +0000 Received: (at 66027) by debbugs.gnu.org; 13 Oct 2023 03:35:40 +0000 Received: from localhost ([127.0.0.1]:44527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qr8xf-0007uP-8a for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:40 -0400 Received: from mail-yb1-xb2a.google.com ([2607:f8b0:4864:20::b2a]:48426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qr8xb-0007tr-86 for 66027 <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:37 -0400 Received: by mail-yb1-xb2a.google.com with SMTP id 3f1490d57ef6-d81dd7d76e0so1741064276.1 for <66027 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 20:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697168106; x=1697772906; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qzsF8ycVQrvKI6mCU8zxNXdfq74+12hDgbwBdds0z+g=; b=h14/+1pBQDspx7LIzP3/MksdRgcHnGQfjCJuWpp70yxIbPKpGIJXg5I6uUz70DS4W4 rp6mq6927YYH0r0it4ifN51OvZvt1Fjak9/4iDt217LyC9nevxmKnJPzg4E+p0sIqnto pQMDImGYFUB6xc7uEh99VXjHv8EME/mIKlvyHl4E+/VddqvTaf7cSynveReeC35sx3zL Wfd+9gpqxqo86jT/IR5NdhXPQQiY7/U2Y1Zpzw0B2POukwthCWjABlCNr8nGz/FnKubS 7GnlgdCsE8QMWBxrsk+myL8d4UB72uWKUn/4bpXGfadlg0Dwy5zthZIhX+RKcnL7KJT4 b8Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697168106; x=1697772906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qzsF8ycVQrvKI6mCU8zxNXdfq74+12hDgbwBdds0z+g=; b=dHr/KU0RaPlQpgfq20OGcTvfQCU37V0P7iJG2QnGAP+CpqE/ncRG/Ra6UuRBcH35ES dRZfotoZNJi3Tvgy/iEjadr8wKiH5s5almaAOghn5K3p95kVmodfe7w8ZWeP6nsOTgnx VWR47tbLWE+KRF0lVnImZa+BwAmHPLsxts/vYeGHm2iKQ+dpr9DhGrT8zhSku5DHSdxQ RPZ8JEUsXYjaG8xiPOJAqEuKS5u/tFwZeUxEFf+yafRDrDj6KyIFDqjvKPQJXfoTB5cl ojcvMYNQIaONZNMUaBelLlOfri29+Ik/9twb2e+KCN33Z9t+Vbg6vKbrzKTrvkEVLewx utBg== X-Gm-Message-State: AOJu0Yx1HAERbnVYhXiiyrruxZUpmqR+OMin2aJ/yxQmVuPQ5PvoEtlj A9tI9oXIEEClUC8IRMsCYXhNa3XFNF4o3w== X-Google-Smtp-Source: AGHT+IGin4o84KrM9urwoTeqkSbQgb89RDCTxdXzWF7J0Sndg+FFPy0oBi2L5Hb1WIKRcqFxzW7JPw== X-Received: by 2002:a25:e80f:0:b0:d9a:ca1e:92ed with SMTP id k15-20020a25e80f000000b00d9aca1e92edmr3362388ybd.1.1697168106334; Thu, 12 Oct 2023 20:35:06 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id v5-20020a0ccd85000000b00655e428604esm329512qvm.137.2023.10.12.20.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 20:35:05 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Date: Thu, 12 Oct 2023 23:33:44 -0400 Message-ID: <3b95af8a90afdec5839a9de61dbcbccc5e842cb6.1697168025.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> References: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/bootloaders.scm (u-boot) [source]: Apply patch. * gnu/packages/patches/u-boot-patman-change-id.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * .patman (keep_change_id): Use it. Change-Id: I33c03013f6a260b5f5d80212b7b6ebe8a3f97efa --- Changes in v3: - New commit .patman | 1 + gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- .../patches/u-boot-patman-change-id.patch | 232 ++++++++++++++++++ 4 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-patman-change-id.patch diff --git a/.patman b/.patman index 13fa4d0fab..efc42144a2 100644 --- a/.patman +++ b/.patman @@ -8,3 +8,4 @@ add_signoff: False # TODO: enable check_patch check_patch: False ignore_bad_tags: True +keep_change_id: True diff --git a/gnu/local.mk b/gnu/local.mk index 13c2b94944..39d833cee0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2052,6 +2052,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ + %D%/packages/patches/u-boot-patman-change-id.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1124eca837..fb20ba0efa 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -654,7 +654,8 @@ (define u-boot %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch (search-patch "u-boot-fix-build-python-3.10.patch") - (search-patch "u-boot-fix-u-boot-lib-build.patch"))) + (search-patch "u-boot-fix-u-boot-lib-build.patch") + (search-patch "u-boot-patman-change-id.patch"))) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/packages/patches/u-boot-patman-change-id.patch new file mode 100644 index 0000000000..354aee2755 --- /dev/null +++ b/gnu/packages/patches/u-boot-patman-change-id.patch @@ -0,0 +1,232 @@ +Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/20231013030633.7191-1-maxim.cournoyer@HIDDEN/ + +From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> +Date: Thu, 12 Oct 2023 17:04:25 -0400 +Subject: [PATCH] patman: Add a 'keep_change_id' setting + +A Change-Id can be useful for traceability purposes, and some projects +may wish to have them preserved. This change makes it configurable +via a new 'keep_change_id' setting. + +Series-version: 2 +Series-changes: 2 +- Add missing argument to send parser +--- + tools/patman/__main__.py | 2 ++ + tools/patman/control.py | 12 +++++++++--- + tools/patman/patchstream.py | 17 ++++++++++++----- + tools/patman/patman.rst | 11 ++++++----- + tools/patman/test_checkpatch.py | 16 ++++++++++++++++ + 5 files changed, 45 insertions(+), 13 deletions(-) + +diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py +index 8eba5d3486..197ac1aad1 100755 +--- a/tools/patman/__main__.py ++++ b/tools/patman/__main__.py +@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action='store_false', dest='add_signoff', + default=True, help="Don't add Signed-off-by to patches") + send.add_argument('--smtp-server', type=str, + help="Specify the SMTP server to 'git send-email'") ++send.add_argument('--keep-change-id', action='store_true', ++ help='Preserve Change-Id tags in patches to send.') + + send.add_argument('patchfiles', nargs='*') + +diff --git a/tools/patman/control.py b/tools/patman/control.py +index 916ddf8fcf..b292da9dc2 100644 +--- a/tools/patman/control.py ++++ b/tools/patman/control.py +@@ -16,11 +16,14 @@ from patman import gitutil + from patman import patchstream + from u_boot_pylib import terminal + ++ + def setup(): + """Do required setup before doing anything""" + gitutil.setup() + +-def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): ++ ++def prepare_patches(col, branch, count, start, end, ignore_binary, signoff, ++ keep_change_id=False): + """Figure out what patches to generate, then generate them + + The patch files are written to the current directory, e.g. 0001_xxx.patch +@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): + end (int): End patch to use (0=last one in series, 1=one before that, + etc.) + ignore_binary (bool): Don't generate patches for binary files ++ keep_change_id (bool): Preserve the Change-Id tag. + + Returns: + Tuple: +@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): + branch, start, to_do, ignore_binary, series, signoff) + + # Fix up the patch files to our liking, and insert the cover letter +- patchstream.fix_patches(series, patch_files) ++ patchstream.fix_patches(series, patch_files, keep_change_id) + if cover_fname and series.get('cover'): + patchstream.insert_cover_letter(cover_fname, series, to_do) + return series, cover_fname, patch_files + ++ + def check_patches(series, patch_files, run_checkpatch, verbose, use_tree): + """Run some checks on a set of patches + +@@ -166,7 +171,8 @@ def send(args): + col = terminal.Color() + series, cover_fname, patch_files = prepare_patches( + col, args.branch, args.count, args.start, args.end, +- args.ignore_binary, args.add_signoff) ++ args.ignore_binary, args.add_signoff, ++ keep_change_id=args.keep_change_id) + ok = check_patches(series, patch_files, args.check_patch, + args.verbose, args.check_patch_use_tree) + +diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py +index f91669a940..e2e2a83e67 100644 +--- a/tools/patman/patchstream.py ++++ b/tools/patman/patchstream.py +@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT = 1 # In patch subject (first line of log for a commit) + STATE_PATCH_HEADER = 2 # In patch header (after the subject) + STATE_DIFFS = 3 # In the diff part (past --- line) + ++ + class PatchStream: + """Class for detecting/injecting tags in a patch or series of patches + +@@ -76,7 +77,7 @@ class PatchStream: + unwanted tags or inject additional ones. These correspond to the two + phases of processing. + """ +- def __init__(self, series, is_log=False): ++ def __init__(self, series, is_log=False, keep_change_id=False): + self.skip_blank = False # True to skip a single blank line + self.found_test = False # Found a TEST= line + self.lines_after_test = 0 # Number of lines found after TEST= +@@ -86,6 +87,7 @@ class PatchStream: + self.section = [] # The current section...END section + self.series = series # Info about the patch series + self.is_log = is_log # True if indent like git log ++ self.keep_change_id = keep_change_id # True to keep Change-Id tags + self.in_change = None # Name of the change list we are in + self.change_version = 0 # Non-zero if we are in a change list + self.change_lines = [] # Lines of the current change +@@ -452,6 +454,8 @@ class PatchStream: + + # Detect Change-Id tags + elif change_id_match: ++ if self.keep_change_id: ++ out = [line] + value = change_id_match.group(1) + if self.is_log: + if self.commit.change_id: +@@ -763,7 +767,7 @@ def get_metadata_for_test(text): + pst.finalise() + return series + +-def fix_patch(backup_dir, fname, series, cmt): ++def fix_patch(backup_dir, fname, series, cmt, keep_change_id=False): + """Fix up a patch file, by adding/removing as required. + + We remove our tags from the patch file, insert changes lists, etc. +@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): + fname (str): Filename to patch file to process + series (Series): Series information about this patch set + cmt (Commit): Commit object for this patch file ++ keep_change_id (bool): Keep the Change-Id tag. + + Return: + list: A list of errors, each str, or [] if all ok. +@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): + handle, tmpname = tempfile.mkstemp() + outfd = os.fdopen(handle, 'w', encoding='utf-8') + infd = open(fname, 'r', encoding='utf-8') +- pst = PatchStream(series) ++ pst = PatchStream(series, keep_change_id=keep_change_id) + pst.commit = cmt + pst.process_stream(infd, outfd) + infd.close() +@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): + shutil.move(tmpname, fname) + return cmt.warn + +-def fix_patches(series, fnames): ++def fix_patches(series, fnames, keep_change_id=False): + """Fix up a list of patches identified by filenames + + The patch files are processed in place, and overwritten. +@@ -803,6 +808,7 @@ def fix_patches(series, fnames): + Args: + series (Series): The Series object + fnames (:type: list of str): List of patch files to process ++ keep_change_id (bool): Keep the Change-Id tag. + """ + # Current workflow creates patches, so we shouldn't need a backup + backup_dir = None #tempfile.mkdtemp('clean-patch') +@@ -811,7 +817,8 @@ def fix_patches(series, fnames): + cmt = series.commits[count] + cmt.patch = fname + cmt.count = count +- result = fix_patch(backup_dir, fname, series, cmt) ++ result = fix_patch(backup_dir, fname, series, cmt, ++ keep_change_id=keep_change_id) + if result: + print('%d warning%s for %s:' % + (len(result), 's' if len(result) > 1 else '', fname)) +diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst +index 038b651ee8..a8b317eed6 100644 +--- a/tools/patman/patman.rst ++++ b/tools/patman/patman.rst +@@ -371,11 +371,12 @@ Series-process-log: sort, uniq + Separate each tag with a comma. + + Change-Id: +- This tag is stripped out but is used to generate the Message-Id +- of the emails that will be sent. When you keep the Change-Id the +- same you are asserting that this is a slightly different version +- (but logically the same patch) as other patches that have been +- sent out with the same Change-Id. ++ This tag is used to generate the Message-Id of the emails that ++ will be sent. When you keep the Change-Id the same you are ++ asserting that this is a slightly different version (but logically ++ the same patch) as other patches that have been sent out with the ++ same Change-Id. The Change-Id tag line is removed from outgoing ++ patches, unless the `keep_change_id` settings is set to `True`. + + Various other tags are silently removed, like these Chrome OS and + Gerrit tags:: +diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py +index a8bb364e42..59a53ef8ca 100644 +--- a/tools/patman/test_checkpatch.py ++++ b/tools/patman/test_checkpatch.py +@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass <sjg@HIDDEN> + + rc = os.system('diff -u %s %s' % (inname, expname)) + self.assertEqual(rc, 0) ++ os.remove(inname) ++ ++ # Test whether the keep_change_id settings works. ++ inhandle, inname = tempfile.mkstemp() ++ infd = os.fdopen(inhandle, 'w', encoding='utf-8') ++ infd.write(data) ++ infd.close() ++ ++ patchstream.fix_patch(None, inname, series.Series(), com, ++ keep_change_id=True) ++ ++ with open(inname, 'r') as f: ++ content = f.read() ++ self.assertIn( ++ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', ++ content) + + os.remove(inname) + os.remove(expname) + +base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df +-- +2.41.0 + -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: [PATCH v3 3/3] etc: teams: Parse 'From' commit more leniently. Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Fri, 13 Oct 2023 03:36:02 +0000 Resent-Message-ID: <handler.66027.B66027.169716814830430 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: 66027 <at> debbugs.gnu.org Cc: Giovanni Biscuolo <g@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN> Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169716814830430 (code B ref 66027); Fri, 13 Oct 2023 03:36:02 +0000 Received: (at 66027) by debbugs.gnu.org; 13 Oct 2023 03:35:48 +0000 Received: from localhost ([127.0.0.1]:44529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qr8xi-0007ud-A8 for submit <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:48 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:47214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qr8xc-0007tu-TR for 66027 <at> debbugs.gnu.org; Thu, 12 Oct 2023 23:35:41 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-66d13ac2796so8274126d6.2 for <66027 <at> debbugs.gnu.org>; Thu, 12 Oct 2023 20:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697168108; x=1697772908; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5BJtwCavyKAWFV+qF/ZJIkorZkgFcF7eg1tqdvdqTIM=; b=GtV9639BdyHqLBckENadFH6uQU+g3W1ne1MYT+DJ04VPepk4E+zXG77VTkMe7Smybe vp1c7A1a+D7VuiKmpiW+iTnpodwYYvX4kMqmSgORnO0wGIP9D8FtVPrJaSDTXQAgWCEV FkPvSzryEhChotaAjv5mP9zQ+fwUlfQiXB68STyQ31Vtna38knUmev0HULMdSoT2vFP2 uVoh++Di/t3MZekvvSuBVHW8JVIz/EwMf/ZNb/zp7Ea9VdMXYxFuux0lJCXlWAE+Crmt zgn0tgErzQMfZoths0r/81nhJkKxMNvH/JZx0P/+XhHRZ0zoIqz5r5Tdnwl+8ZzZj3cq Y77w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697168108; x=1697772908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5BJtwCavyKAWFV+qF/ZJIkorZkgFcF7eg1tqdvdqTIM=; b=L8uqWCG7T+JSqZM7qEoJQP8o2Hj1BkXSf6ylHCcfONKA2NriKF4TRbmR98iqcBLxlN +sXs3/mFwi9Lhgh7xGR/0+NORD6BSEK8zgZ6jsmlbZtKRO1h7Lysd3qPeruvNXzNH+CC nL2kUFn0sFG/XBYioQYwBRfYcFJ8C0ssovd3Sh7MCdFcGUsV79YnMkg36ddWE6jQoEox WI9Qs4/+ONLMxu37mudgxzqpqsBK6jQUz+fqZaa3Oh4h+DY52LyCdceCAO6pGfo6eQG1 pyZWPJvBQ4xHm8dyNKSwsVSNlxmfCbxKLSHZdtA3PDEBFd6tj/ZmgN3j11bCQz2WoLSv fSsQ== X-Gm-Message-State: AOJu0Yw2aNM/YjkX5ahobw6yRcqpcmbtzX6fR920cmoHgfYOU9/IgVc3 d49FiQGktN1Y2rTYcZw/MP7gqvAAkpLJig== X-Google-Smtp-Source: AGHT+IGThnWsrLqP+R3aZyIkVMQWUwXmrPTLSk+xAbb4qA+LgiZIFJjKAv+XFrioGupK51gmDdQeuw== X-Received: by 2002:a0c:8c44:0:b0:656:3ed4:ffe9 with SMTP id o4-20020a0c8c44000000b006563ed4ffe9mr23103756qvb.58.1697168108394; Thu, 12 Oct 2023 20:35:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-66.b2b2c.ca. [72.10.128.66]) by smtp.gmail.com with ESMTPSA id v5-20020a0ccd85000000b00655e428604esm329512qvm.137.2023.10.12.20.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 20:35:07 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Date: Thu, 12 Oct 2023 23:33:45 -0400 Message-ID: <b350567a862fe6d49377ab8c2e1b8df0a007f141.1697168025.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> References: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) When a Change-Id is used, patman prepends a Message-Id field on the first line of the patch, which broke the assumption that the 'From $commit' line must appear on the first line. * etc/teams.scm.in (git-patch->commit-id): Loop each line of the file until a match is found. Update doc. Change-Id: I20400f87469ffb761ffc82dd32e34cd06f619043 --- Changes in v3: - New commit etc/teams.scm.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 55242caad1..703d76fe8d 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -770,13 +770,16 @@ (define (diff-revisions rev-start rev-end) files)) (define (git-patch->commit-id file) - "Parse the commit ID from the first line of FILE, a patch produced with git." + "Parse the commit ID from FILE, a patch produced with git." (call-with-input-file file (lambda (port) - (let ((m (string-match "^From ([0-9a-f]{40})" (read-line port)))) - (unless m - (error "invalid patch file:" file)) - (match:substring m 1))))) + (let loop ((line (read-line port))) + (when (eof-object? line) + (error "could not find 'from' commit in patch" file)) + (let ((m (string-match "^From ([0-9a-f]{40})" line))) + (if m + (match:substring m 1) + (loop (read-line port)))))))) (define (git-patch->revisions file) "Return the start and end revisions of FILE, a patch file produced with git." -- 2.41.0
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: Add a feature to automatically close specified bug reports upon committing. Resent-From: Simon Tournier <zimon.toutoune@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Mon, 23 Oct 2023 17:31:02 +0000 Resent-Message-ID: <handler.66027.B66027.169808222817830 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Cc: Giovanni Biscuolo <g@HIDDEN>, 66027 <at> debbugs.gnu.org Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169808222817830 (code B ref 66027); Mon, 23 Oct 2023 17:31:02 +0000 Received: (at 66027) by debbugs.gnu.org; 23 Oct 2023 17:30:28 +0000 Received: from localhost ([127.0.0.1]:51558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1quyl1-0004dR-OJ for submit <at> debbugs.gnu.org; Mon, 23 Oct 2023 13:30:28 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <zimon.toutoune@HIDDEN>) id 1quyky-0004cz-QY for 66027 <at> debbugs.gnu.org; Mon, 23 Oct 2023 13:30:25 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32de9764793so546983f8f.0 for <66027 <at> debbugs.gnu.org>; Mon, 23 Oct 2023 10:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698082190; x=1698686990; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=NsU/Fn6mbNT7owAttkpYqW6VOLH5uSaRheb+XVaA4i0=; b=Sa1hBJM8Sp7bLzsOgE2qRV9iQrH7Ujx8i3VX2Vp+c0jYAonMw4Fes3xvJnwhJcLEQY 7meUKVO+OkO3piQoPXfqwF9hen4TijJrQ2EWRUQ6hAcAAfH5MpefHcQdzBM20xGu37Kq O3OBwOlhut1l/n+lzH0bhD37xhNBF11hgaAh99WEnWA7fl3q5Dd67RPMAM2gojbqYZMh W4X66URKcFwf1b50GtUlrsHT6QA3nG3EVjeySjONZNqU3F3NgnWwLQKbd2q4XdY76dhF 0NZAZ8sKhq2NG40VaIAlAOIYg6BQ4/WcJtQhArpMdd/18MiYFvjJV2OXsd96MBpMXLLC 8YRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698082190; x=1698686990; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NsU/Fn6mbNT7owAttkpYqW6VOLH5uSaRheb+XVaA4i0=; b=ihlOL9qge4QD78hIQwQQHPusjKuTJ0B4PS5Hf5lIX2zmDBd+e9FGzDGoYEIDLKITo+ PQ5ve70yiZZausXeX8hJSpmoroaN9QlnpqB36C8UqdKfmRD+U9he1apwDCYDcA9LLQ3K 0HHnGhsIwo0wcgGCp1LVKfMst2bwNWcXiBIFGuu4XVDeh4magF80MMc/SsyXJdQcx1Xw Y/2BWdlddtAdpEN15vzWhFsiShDcEGY+KavxZFx0m9u+g82Uuc8J/VD3PsV1VbKkhe+h oDRHJ8KgQ3wVD4VYjxbXsbNAMc2W6ji2vwIEUiR1CCDvwclRfooxXSk2+4fKKmIvlIPV OOpA== X-Gm-Message-State: AOJu0YwJmOR5b1wzxMzLlVA4yqiKer7qfu8RoP+WYp/5hPxZoGEIe6sR UQXdeYIb0Lh1fXJeRFeFzYYhng9zbgo= X-Google-Smtp-Source: AGHT+IEh/TyUrEhdK1ygEF/PdG+/2LdJxpc0esBB2sK7oTIDTCukJgIOknUcwRRvQur614I4PRzf1w== X-Received: by 2002:adf:a356:0:b0:32d:c293:1ab4 with SMTP id d22-20020adfa356000000b0032dc2931ab4mr6150931wrb.6.1698082189737; Mon, 23 Oct 2023 10:29:49 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id dl11-20020a0560000b8b00b0032da4f70756sm8193926wrb.5.2023.10.23.10.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 10:29:49 -0700 (PDT) From: Simon Tournier <zimon.toutoune@HIDDEN> References: <87fs3e792i.fsf@HIDDEN> <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> Date: Mon, 23 Oct 2023 15:58:55 +0200 In-Reply-To: <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 12 Oct 2023 23:33:43 -0400") Message-ID: <87o7gpjv8g.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxim, If I read correctly, this series had been merged with: fb3707762d * etc: teams: Parse 'From' commit more leniently. f44fa21c3e * gnu: patman: Apply patch for new Change-Id setting. 8005e09b26 * build: Add a commit-msg hook that embeds Change-Id in commit [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:42d listed in] [list.dnswl.org] X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 0.1 (/) Hi Maxim, If I read correctly, this series had been merged with: fb3707762d * etc: teams: Parse 'From' commit more leniently. f44fa21c3e * gnu: patman: Apply patch for new Change-Id setting. 8005e09b26 * build: Add a commit-msg hook that embeds Change-Id in commit messages. Right? Mark the submission as done? Or maybe is it a way for testing the feature? ;-) Cheers, simon
X-Loop: help-debbugs@HIDDEN Subject: bug#66027: Add a feature to automatically close specified bug reports upon committing. Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: bug-guix@HIDDEN, Giovanni Biscuolo <g@HIDDEN> Resent-Date: Mon, 23 Oct 2023 20:11:01 +0000 Resent-Message-ID: <handler.66027.B66027.169809181222574 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 66027 X-GNU-PR-Package: guix X-GNU-PR-Keywords: help moreinfo notabug To: Simon Tournier <zimon.toutoune@HIDDEN> Cc: Giovanni Biscuolo <g@HIDDEN>, 66027 <at> debbugs.gnu.org Received: via spool by 66027-submit <at> debbugs.gnu.org id=B66027.169809181222574 (code B ref 66027); Mon, 23 Oct 2023 20:11:01 +0000 Received: (at 66027) by debbugs.gnu.org; 23 Oct 2023 20:10:12 +0000 Received: from localhost ([127.0.0.1]:51926 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qv1Fc-0005s1-1s for submit <at> debbugs.gnu.org; Mon, 23 Oct 2023 16:10:12 -0400 Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:50418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1qv1Fa-0005rm-3e for 66027 <at> debbugs.gnu.org; Mon, 23 Oct 2023 16:10:10 -0400 Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-6ce2eaf7c2bso2539990a34.0 for <66027 <at> debbugs.gnu.org>; Mon, 23 Oct 2023 13:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698091775; x=1698696575; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=0/JAQwIHZ2G3XSZvetYRE/6ZdKx8bMbe49KckaD1+BM=; b=kJ869MgUWH8sN1EMAOgbSJUTOWM2sk4UGW3bDh/Yqc4gXJ3cT142aiIXFIxKzPbDku haJYxpteXXIssKNN2PAilagkHKTiXeENDu+WUmX/Z+cnteARGzMloGvuHMXQ1gQV5jKh cnGH4qPKt/mi8kLt21o94/ESolBZNsI47obc3KB2iSISnp0xTRryEQoT2p5cFmWAIKH0 2R52dB5DOugTQzOAxKiceh7L/+jtiK2lzgLIh+LxwRJRNxwdlMUzBCzv2XIDeBkzhIf3 FU5GjUdXSUbua3ApucRiHiYCb7t0a1AgPdyqMgig3p8RXryGfBZ7z3eJpnG1p5NDZaGv HlWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698091775; x=1698696575; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0/JAQwIHZ2G3XSZvetYRE/6ZdKx8bMbe49KckaD1+BM=; b=g3uEa4vRafqtAYExzkB3O5/B1JZZCBo+7cPNtFjRpNhjqTMfR0XMHmldwpsvwe80EF krl+V6fgyNa7GiW1zzNm0ilOsgtPwsBYj/FYQ5U3+Y2BiQLzkQaeF9o/crnBawDXvyTE Ckh7Mx2MYBpK+6+TWszkhqXPtQLljNSfiGFJVrpmbYutllNywgdn755lOQXtNR3sbyIA gXnyXgW8ZDVNHcmkRdujh9eQIJMjcGBFysHF8BrjXJfwkS3pReUzWY9Wq0sY6/I1vWFo OahUK9vOgKY+nqn1Lc998ENKsLNFYwv77U0ewqxFlVAXUHCmzVmA+H94eDpWPIVZ9rrO nJUQ== X-Gm-Message-State: AOJu0YxQF8Hm8oDBsOCDYrB5pEfYYXwHK9jWNVf15rytF4Rcsi1bcp5n LCA36gIVM3lyelgiUSL8JLA= X-Google-Smtp-Source: AGHT+IHSTIOlXdXuuOpCXqMIgOidGiajcPGQLkxItrqfMfqX6dE9HZC1xHHTVRCfnHsdeFLE4f5cGA== X-Received: by 2002:a05:6870:9a87:b0:1bb:509a:824f with SMTP id hp7-20020a0568709a8700b001bb509a824fmr12990994oab.55.1698091775038; Mon, 23 Oct 2023 13:09:35 -0700 (PDT) Received: from hurd (dsl-10-148-194.b2b2c.ca. [72.10.148.194]) by smtp.gmail.com with ESMTPSA id f1-20020a05622a1a0100b0041cc25a75e5sm2987312qtb.77.2023.10.23.13.09.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 13:09:34 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> In-Reply-To: <87o7gpjv8g.fsf_-_@HIDDEN> (Simon Tournier's message of "Mon, 23 Oct 2023 15:58:55 +0200") References: <87fs3e792i.fsf@HIDDEN> <177d9176ef9d06a4ee51c271db982c15d7729a0e.1697168025.git.maxim.cournoyer@HIDDEN> <87o7gpjv8g.fsf_-_@HIDDEN> Date: Mon, 23 Oct 2023 16:09:33 -0400 Message-ID: <87wmvd5cea.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Simon Tournier <zimon.toutoune@HIDDEN> writes: > Hi Maxim, > > If I read correctly, this series had been merged with: > > fb3707762d * etc: teams: Parse 'From' commit more leniently. > f44fa21c3e * gnu: patman: Apply patch for new Change-Id setting. > 8005e09b26 * build: Add a commit-msg hook that embeds Change-Id in commit messages. > > Right? > > Mark the submission as done? Or maybe is it a way for testing the > feature? ;-) It's only partially implementing the fix as mentioned in fb3707762d; the missing bit is making use of the newly introduced Change-Id in mumi or a script to determine if a series was fully merged, and close it if so. So it should remain open until then :-). -- Thanks, Maxim
Received: (at control) by debbugs.gnu.org; 8 Feb 2024 18:10:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Feb 08 13:10:13 2024 Received: from localhost ([127.0.0.1]:33588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rY8qj-0005AM-Fa for submit <at> debbugs.gnu.org; Thu, 08 Feb 2024 13:10:13 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:48486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <felix.lechner@HIDDEN>) id 1rY8qh-0005AA-LL for control <at> debbugs.gnu.org; Thu, 08 Feb 2024 13:10:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=XrIgDZ7mZ0dQp6T wRe7sjm8y5ZfkPOnCmJm9zs1kVlM=; h=date:cc:to:from; d=lease-up.com; b=UW FEa0Qy5KCV5arELu1Oppbrps+ZoO0kX1j/CvHU6uDn7no8sztU/JtzGCpIS/JaNVKKRylP ISGarjW/EZyDRt+vvrbIMPWt6HeswWxYQOu6VnPCrE6wp4NJWdK0G5SdYBcZh2NOAHEuQ3 PjhhxpX0UZnQSkN+1JWhJteksPBqo= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 5de564b4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <control <at> debbugs.gnu.org>; Thu, 8 Feb 2024 18:09:55 +0000 (UTC) From: Felix Lechner <felix.lechner@HIDDEN> To: control <at> debbugs.gnu.org Date: Thu, 08 Feb 2024 10:09:55 -0800 Message-ID: <87h6ii6d58.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: reassign 65858 mumi reassign 65809 mumi reassign 49295 mumi reassign 64833 mumi reassign 54204 mumi reassign 68920 mumi reassign 55765 mumi reassign 65923 mumi reassign 63507 mumi reassign 60226 mumi [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 1.0 (+) reassign 65858 mumi reassign 65809 mumi reassign 49295 mumi reassign 64833 mumi reassign 54204 mumi reassign 68920 mumi reassign 55765 mumi reassign 65923 mumi reassign 63507 mumi reassign 60226 mumi reassign 63936 mumi reassign 60951 mumi reassign 66027 mumi thanks
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.