From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8Lf0IW1XRWQMPgAASxT56A (envelope-from ) for ; Sun, 23 Apr 2023 18:06:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QF7rIG1XRWQXvAAAG6o9tA (envelope-from ) for ; Sun, 23 Apr 2023 18:06:05 +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 4140F3E8C8 for ; Sun, 23 Apr 2023 18:06:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqcDt-0006J3-Vu; Sun, 23 Apr 2023 12:05:58 -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 1pqcD2-00061x-0U for bug-guix@gnu.org; Sun, 23 Apr 2023 12:05:07 -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 1pqcD1-0002M3-Gk for bug-guix@gnu.org; Sun, 23 Apr 2023 12:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqcD1-0004iG-CG for bug-guix@gnu.org; Sun, 23 Apr 2023 12:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58813: [PATCH 3/5] teams: Add a configure-git action. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 23 Apr 2023 16:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58813 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 58813@debbugs.gnu.org Cc: ludo@gnu.org, liliana.prikler@gmail.com, Maxim Cournoyer , zimon.toutoune@gmail.com Received: via spool by 58813-submit@debbugs.gnu.org id=B58813.168226587618025 (code B ref 58813); Sun, 23 Apr 2023 16:05:03 +0000 Received: (at 58813) by debbugs.gnu.org; 23 Apr 2023 16:04:36 +0000 Received: from localhost ([127.0.0.1]:46813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqcCZ-0004ga-VK for submit@debbugs.gnu.org; Sun, 23 Apr 2023 12:04:36 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:53504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqcCX-0004fs-VJ for 58813@debbugs.gnu.org; Sun, 23 Apr 2023 12:04:34 -0400 Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-74d0dbd7c58so185958685a.3 for <58813@debbugs.gnu.org>; Sun, 23 Apr 2023 09:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682265868; x=1684857868; 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=kJDmkWu3xALL2xacbcHD5XH9gNpO9hwjHiSE5yacL+c=; b=mrStn5G6Q2uY4MEreAaGYc69YS9wwbVzuXVhXBgY5492R8v+4wMhP+GM/OipI7xKPI jWHJb6PYnIrLoeyJ5zBFc2iKeL2WZnvOjhAfOrBJear5RfUfh1lEUdc6nH/IRIMOV9// b0jobNZClPQ5miO2oXHpKHjrND9BAa9xQOaS8lhfSsVd9GPbG5NFFj3N1LAXwj37QHXM utkCecMtzgc1kPY88KSmj9dkAKIYEWMVsbnzAdKkjvYi49QywfajgGkSBjw//pyOxufi y58PMmNlUBxFgJmpnhSZY97Wv3pez6OMihAuthCpaJQWu2CglPUKs2Ru8vWNcdVr3yau 1ODA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682265868; x=1684857868; 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=kJDmkWu3xALL2xacbcHD5XH9gNpO9hwjHiSE5yacL+c=; b=NnuN54UkgOqU/rek3kLOF5fNZh16+Efnjzkf5S2cqwnqzzbhsKgvji+qDqL+dik4b0 K+wJoK560gERT8+V4zDCPE35AMsuAUj6ri4uFK0zHR5O1DSV8J8kHVyU/la3ug/O+S1i PZ9cBDhdZy0Z2pVcmTDPolTCW9/jmL79DE23UiXD0YLhM3EFSvRL/UzmEVR/fLGvV8Qd dO2DuhxsNo8zVdVRkamw1wINB/iD647H/XUhBM3TMg0Y+Q60Y9e3FKBYlsjPFNzrnT7W 7HBz+tIaTpWC3nutchKtF+OQw8A1C5p4CB7I6WwaKmJAgjRNQiZo2qmXDk+u+T8Lu+nF wGoA== X-Gm-Message-State: AAQBX9ewEjExNxfzScpgDu3ASl0VWb6o+ESc+KyoI0W0vZfNMR1Kt0m/ Ub7oSYZrbtUxYbr054iF7AiLFpfdtwlo6w== X-Google-Smtp-Source: AKy350YW9SAmL8X3fozbB9LmnWq3tmgq/Tk6v5oBqHA1Uk9lT7OeaStTnfuEKwwP+NESopBLU0i4gA== X-Received: by 2002:a05:622a:606:b0:3ef:2db1:6e67 with SMTP id z6-20020a05622a060600b003ef2db16e67mr15118778qta.17.1682265868169; Sun, 23 Apr 2023 09:04:28 -0700 (PDT) Received: from localhost.localdomain (dsl-141-20.b2b2c.ca. [66.158.141.20]) by smtp.gmail.com with ESMTPSA id d13-20020a05622a15cd00b003ef48392649sm2957469qty.4.2023.04.23.09.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 09:04:27 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 23 Apr 2023 12:04:13 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <878rg4snrf.fsf@gmail.com> References: <878rg4snrf.fsf@gmail.com> 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682265965; a=rsa-sha256; cv=none; b=HNU9nRjg0qIqVTCKjzvRntu5F4eMkUW/1qCtowYW6l9LAoXo6sezG1s4rmHyC7/0vHDg63 sU3vGPH33T7fbNvmv39VjU1PejuTVXFOgzyydbH4wtba+exj7LBeaIfYNdKq2UOSONwsSl 88oTPRKes/Qx3jNYEcUk4P32bKQ8mlb8qE6tsdfLFbbDjXoj6cWjmi+SyDaa6jH7WxFPct EOsyXDcVKtVbdFBAaCrBCOuR9/HGEMXttoOl0RDl2zIyzrUm2AEHP/vLDpktMbkeoSe+nL Iipn3crEBu6Wz4Oy1Ze3GHYGpv3awFeCH3jlBsngbzD6y4soyvg5CrtK4PYcig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20221208 header.b=mrStn5G6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682265965; 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=+pkxDDUkbKvAaQosWESmraihkKCQ7htTwGXr2XpswNA=; b=fBIZlpCvcMaPbGpbfYiNtHDomHO8W8kavPQQQrpYgJAHv+E1PPCFrTvcoZsJKkq6L+/pA/ eIGAE5PepepuMLd9tluRnttEMPhaUd9Jms+1xL8xTDwR0UcfT5+bXlQUlT2tcCWCVfYbD0 ckrVDK1xRrjRS4geJtUn4WBZj+A1elUDWKvrtl/aABjAy5BN882v4dlyy1g9yxgB8IWgf6 8AUo0kzha5ifJGuJyQ2Ulscaipwb98/PFF36LOdDhsaY3v3D1t8VjVMtjwFAXrKlHv7qX4 L44/1c218ZQphYt2i3bWq8Jw45QugxSE/VNULq22OpzdIieqkgzgAFB6dYkwWg== X-Migadu-Spam-Score: -1.71 X-Spam-Score: -1.71 X-Migadu-Queue-Id: 4140F3E8C8 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20221208 header.b=mrStn5G6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: ygko6xf8H2q6 * etc/git/gitconfig: Augment configuration template with useful options to allow for auto-configuration. * etc/teams.scm.in (configure-git): New procedure. (main): Register it and add documentation. --- etc/git/gitconfig | 15 +++++++++++++++ etc/teams.scm.in | 12 +++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/etc/git/gitconfig b/etc/git/gitconfig index c9ebdc8fa8..0b6984a05f 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -1,5 +1,20 @@ +[commit] + gpgsign = true + [diff "scheme"] xfuncname = "^(\\(define.*)$" [diff "texinfo"] xfuncname = "^@node[[:space:]]+([^,]+).*$" + +[format] + useAutoBase = true + thread = shallow + +[pull] + rebase = true + +[sendemail] + to = guix-patches@gnu.org + headerCmd = etc/teams.scm cc-members-header-cmd + thread = no diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 408db8b7d5..8203446446 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -36,8 +36,9 @@ (ice-9 regex) (ice-9 match) (ice-9 rdelim) + (git) (guix ui) - (git)) + (guix build utils)) (define-record-type (make-team id name description members scope) @@ -702,6 +703,11 @@ (define (patch->teams patch-file) (find-team-by-scope (apply diff-revisions (git-patch->revisions patch-file))))) +(define (configure-git) + "Automate the required Git configurations for the Guix project." + (invoke "git" "config" "include.path" "../etc/git/gitconfig") + (copy-file "etc/git/pre-push" ".git/hooks/pre-push")) + (define (main . args) (match args @@ -719,6 +725,8 @@ (define (main . args) (list-members (find-team team-name) (current-output-port) "X-Debbugs-Cc: ")) (patch->teams patch-file))) + (("configure-git") + (configure-git)) (("get-maintainer" patch-file) (apply main "list-members" (patch->teams patch-file))) (("list-teams" . args) @@ -739,6 +747,8 @@ (define (main . args) cc teams related to files changed between revisions or in a patch file cc-members-header-cmd cc-members variant for use with 'git send-email --header-cmd' + configure-git + automatically configure your Git checkout for Guix list-teams list teams and their members list-members -- 2.39.2