From patchwork Sun Apr 7 20:38:29 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: 62828 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 E151527BBEA; Sun, 7 Apr 2024 21:40:20 +0100 (BST) 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 F2E3227BBE2 for ; Sun, 7 Apr 2024 21:40:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtZJ6-00019b-20; Sun, 07 Apr 2024 16:40:04 -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 1rtZJ4-00017b-9S for guix-patches@gnu.org; Sun, 07 Apr 2024 16:40:02 -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 1rtZJ3-0005xn-Um; Sun, 07 Apr 2024 16:40:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtZJ8-00013T-W1; Sun, 07 Apr 2024 16:40:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69780] [PATCH v2 4/5] 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: Sun, 07 Apr 2024 20:40:06 +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.17125223553713 (code B ref 69780); Sun, 07 Apr 2024 20:40:06 +0000 Received: (at 69780) by debbugs.gnu.org; 7 Apr 2024 20:39:15 +0000 Received: from localhost ([127.0.0.1]:44806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtZIF-0000xg-B3 for submit@debbugs.gnu.org; Sun, 07 Apr 2024 16:39:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtZI9-0000vN-Pc for 69780@debbugs.gnu.org; Sun, 07 Apr 2024 16:39:06 -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 1rtZHx-0005qU-G3; Sun, 07 Apr 2024 16:38:53 -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=8ZAmKgn+xiBZV4lMXqIvlvuj3DrSx3JRkOaDsBKL2YY=; b=SKwuXANgVrYFqXqtuipG OVgujT3zBe55yYUpfQihdIvOZZaLhqwmPCQHefpwWqna1/hCj7dhVr2XeqNFAg6KTEcg4QP7SHamd zShj8ghRaTc6puolB8wIw0Cqru8QInYcmF4he8Sld8IgKHfY8npW31+8ZDx3kA6QZGB3mFbBR5PuW rY5pDHUQp73Lm5llvJa7vAtEdqtxRhaDi+vSQnDN4KWG3JGI4MxNYofTQqOL0+iAxEfweF71LbKU8 MvegS6TGo7msAif9R6N3HDJ1Px0yGEq6BvvcMl++SJQNlVKNoJu/Eia3ZubSzgwCGa0+1pTguNpAw abjrZIsxrQ1mIw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 7 Apr 2024 22:38:29 +0200 Message-ID: <8361a793c4b4e18115c0e68e6065a7846e759795.1712522119.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 | 49 ++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6ff0e76d97..9db0ff865d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7715,6 +7715,11 @@ Invoking guix git authenticate keyring = keyring @end smallexample +The first run also attempts to install pre-push and post-merge hooks, +such that @command{guix git authenticate} is invoked as soon as you run +@command{git push}, @command{git pull}, and related commands; it does +not overwrite preexisting hooks though. + The command-line options described below allow you to fine-tune the process. diff --git a/guix/scripts/git/authenticate.scm b/guix/scripts/git/authenticate.scm index 0797cba0b6..e3ecb67c89 100644 --- a/guix/scripts/git/authenticate.scm +++ b/guix/scripts/git/authenticate.scm @@ -148,6 +148,52 @@ (define* (record-configuration repository (warning (G_ "could not record introduction and keyring configuration\ (Guile-Git too old?)~%")))) +(define (install-hooks repository) + "Attempt to install in REPOSITORY hooks that invoke 'guix git authenticate'. +Bail out if one of these already exists." + ;; Guile-Git < 0.7.0 lacks 'repository-common-directory'. + (if (module-defined? (resolve-interface '(git)) + 'repository-common-directory) + (let () + (define directory + (repository-common-directory repository)) + + (define pre-push-hook + (in-vicinity directory "hooks/pre-push")) + + (define post-merge-hook + (in-vicinity directory "hooks/post-merge")) + + (if (or (file-exists? pre-push-hook) + (file-exists? post-merge-hook)) + (begin + (warning (G_ "not overriding pre-existing hooks '~a' and '~a'~%") + pre-push-hook post-merge-hook) + (display-hint (G_ "Consider running @command{guix git authenticate} +from your pre-push and post-merge hooks so your repository is automatically +authenticated before you push and when you pull updates."))) + (begin + (call-with-output-file pre-push-hook + (lambda (port) + (format port "#!/bin/sh +# Installed by 'guix git authenticate'. +set -e +while read local_ref local_oid remote_ref remote_oid +do + guix git authenticate --end=\"$local_oid\" +done\n") + (chmod port #o755))) + (call-with-output-file post-merge-hook + (lambda (port) + (format port "#!/bin/sh +# Installed by 'guix git authenticate'. +exec guix git authenticate\n") + (chmod port #o755))) + (info (G_ "installed hooks '~a' and '~a'~%") + pre-push-hook post-merge-hook)))) + (warning (G_ "cannot determine where to install hooks\ + (Guile-Git too old?)~%")))) + (define (show-stats stats) "Display STATS, an alist containing commit signing stats as returned by 'authenticate-repository'." @@ -271,7 +317,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))