From patchwork Wed Mar 13 17:42:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 61785 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2BE9627BBEB; Wed, 13 Mar 2024 17:45:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D88227BBE9 for ; Wed, 13 Mar 2024 17:45:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkSfV-0000X2-VW; Wed, 13 Mar 2024 13:45:33 -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 1rkSfT-0000WM-9G for guix-patches@gnu.org; Wed, 13 Mar 2024 13:45:31 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkSfT-0001oa-0P; Wed, 13 Mar 2024 13:45:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkSfz-0008KG-HO; Wed, 13 Mar 2024 13:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69780] [PATCH 3/4] git authenticate: Install pre-push and post-checkout hooks. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 17:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69780@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69780-submit@debbugs.gnu.org id=B69780.171035194831959 (code B ref 69780); Wed, 13 Mar 2024 17:46:03 +0000 Received: (at 69780) by debbugs.gnu.org; 13 Mar 2024 17:45:48 +0000 Received: from localhost ([127.0.0.1]:47362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkSfj-0008JI-Mb for submit@debbugs.gnu.org; Wed, 13 Mar 2024 13:45:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkSfS-0008IK-8H for 69780@debbugs.gnu.org; Wed, 13 Mar 2024 13:45:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkScg-0000w8-Jh; Wed, 13 Mar 2024 13:42:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=p1AjpATHK4VP0ER2YWQgDYbrKLAnCVuCnH6/9qgSQyA=; b=XS8HWCkqC8hbQiUAkMC8 JqOnnL7Eziv4z5OYtDVjXx54+WY7DVguQhDsOSWGznMDx5cY/2HmTbvfZ9LgRGHHtiqge5ZK0jTDq Cvg4qHSGoueftoTbS1no9S5C1DFK9PTY0bq8HDtUkDJ+392BKINr+zS7xAOduzo25kBDnqXNcIE41 7FjzIQCswAdg1uFpE/F5tQ0UlxyiMmgCxEj9WOBkpbjmovAB2rvNo4BQzq13c3JWskPq8f0T3Jqk7 U8O2SCtctvsK0gOhsLVsL99Fp9dR7NNt3EEUPSla3HaRPe5U+C004IQme9ws5TOIXiI+u1moGc5H7 yWEpMKmtgj0inw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 13 Mar 2024 18:42:21 +0100 Message-ID: <6a556beb2566aa401d5064049e136ff2a7669b63.1710351278.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/git/authenticate.scm (install-hooks): New procedure. (guix-git-authenticate): Use it. * doc/guix.texi (Invoking guix git authenticate): Document it. Change-Id: I4464a33193186e85b476a12740e54412bd58429c --- doc/guix.texi | 5 ++++ guix/scripts/git/authenticate.scm | 43 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index ac0766b98c..b1672803c0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7624,6 +7624,11 @@ Invoking guix git authenticate guix git authenticate [@var{options}@dots{}] @end example +The first run also attempts to install pre-push and post-checkout hooks, +such that @command{guix git authenticate} is invoked as soon as you run +@command{git push}, @command{git checkout}, and related commands; it +does not overwrite preexisting hooks though. + The options below allow you to fine-tune the process. @table @code diff --git a/guix/scripts/git/authenticate.scm b/guix/scripts/git/authenticate.scm index 36e1aa6228..13e1de3099 100644 --- a/guix/scripts/git/authenticate.scm +++ b/guix/scripts/git/authenticate.scm @@ -129,6 +129,46 @@ (define* (record-configuration repository (info (G_ "introduction and keyring configuration recorded in '~a'~%") config-file)) +(define (install-hooks repository) + "Attempt to install in REPOSITORY pre-push and update hooks that invoke +'guix git authenticate'. Bail out if one of these already exists." + (define directory + (repository-directory repository)) + + (define pre-push-hook + (in-vicinity directory "hooks/pre-push")) + + (define post-checkout-hook + (in-vicinity directory "hooks/post-checkout")) + + (if (or (file-exists? pre-push-hook) + (file-exists? post-checkout-hook)) + (begin + (warning (G_ "not overriding pre-existing hooks '~a' and '~a'~%") + pre-push-hook post-checkout-hook) + (display-hint (G_ "Consider running @command{guix git authenticate} +from your pre-push and update hooks so your repository is automatically +authenticated before you push or receive updates."))) + (begin + (call-with-output-file pre-push-hook + (lambda (port) + (format port "#!/bin/sh +set -e +while read local_ref local_oid remote_ref remote_oid +do + guix git authenticate --end=\"$local_ref\" +done\n") + (chmod port #o755))) + (call-with-output-file post-checkout-hook + (lambda (port) + (format port "#!/bin/sh +oldrev=\"$1\" +newrev=\"$2\" +exec guix git authenticate --end=\"$newrev\"\n") + (chmod port #o755))) + (info (G_ "installed hooks '~a' and '~a'~%") + pre-push-hook post-checkout-hook)))) + (define (show-stats stats) "Display STATS, an alist containing commit signing stats as returned by 'authenticate-repository'." @@ -250,7 +290,8 @@ (define (guix-git-authenticate . args) (unless (configured? repository) (record-configuration repository #:commit commit #:signer signer - #:keyring-reference keyring)) + #:keyring-reference keyring) + (install-hooks repository)) (when (and show-stats? (not (null? stats))) (show-stats stats))))))