From patchwork Mon Jun 8 22:02:48 2020 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: 22620 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 A738227BBE3; Mon, 8 Jun 2020 23:04:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 360DC27BBE1 for ; Mon, 8 Jun 2020 23:04:28 +0100 (BST) Received: from localhost ([::1]:50304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPsZ-0007rq-NO for patchwork@mira.cbaines.net; Mon, 08 Jun 2020 18:04:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiPsA-0007d7-Al for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiPs9-00019k-WE for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiPs9-0006nb-RF for guix-patches@gnu.org; Mon, 08 Jun 2020 18:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41767] [PATCH 1/9] git-authenticate: Cache takes a key parameter. References: <20200608215224.2672-1-ludo@gnu.org> In-Reply-To: <20200608215224.2672-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jun 2020 22:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41767@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 41767-submit@debbugs.gnu.org id=B41767.159165380225996 (code B ref 41767); Mon, 08 Jun 2020 22:04:01 +0000 Received: (at 41767) by debbugs.gnu.org; 8 Jun 2020 22:03:22 +0000 Received: from localhost ([127.0.0.1]:58128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPrV-0006lC-Uc for submit@debbugs.gnu.org; Mon, 08 Jun 2020 18:03:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPrT-0006kg-VZ for 41767@debbugs.gnu.org; Mon, 08 Jun 2020 18:03:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57795) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPrO-00015e-1o; Mon, 08 Jun 2020 18:03:14 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56846 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiPrN-0000Iv-M8; Mon, 08 Jun 2020 18:03:13 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 9 Jun 2020 00:02:48 +0200 Message-Id: <20200608220256.3267-1-ludo@gnu.org> X-Mailer: git-send-email 2.26.2 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" X-getmail-retrieved-from-mailbox: Patches * guix/git-authenticate.scm (authenticated-commit-cache-file) (cache-authenticated-commit, previously-authenticated-commits): Add 'key' parameter and honor it. * build-aux/git-authenticate.scm (git-authenticate): Pass "channels/guix" as the key. --- build-aux/git-authenticate.scm | 5 +++-- guix/git-authenticate.scm | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 5e1fdaaa24..a3d4b40ccf 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -252,7 +252,7 @@ (filter-map (lambda (id) (false-if-exception (commit-lookup repository (string->oid id)))) - (previously-authenticated-commits))) + (previously-authenticated-commits "channels/guix"))) (define commits ;; Commits to authenticate, excluding the closure of @@ -274,7 +274,8 @@ #:default-authorizations %historical-authorized-signing-keys #:report-progress report))))) - (cache-authenticated-commit (oid->string (commit-id end-commit))) + (cache-authenticated-commit "channels/guix" + (oid->string (commit-id end-commit))) (unless (null? stats) (format #t (G_ "Signing statistics:~%")) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index c333717136..6d71228d72 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -272,33 +272,33 @@ The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." ;;; Caching. ;;; -(define (authenticated-commit-cache-file) +(define (authenticated-commit-cache-file key) "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) +previously-authenticated commits for KEY." + (string-append (cache-directory) "/authentication/" key)) -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." +(define (previously-authenticated-commits key) + "Return the previously-authenticated commits under KEY as a list of commit +IDs (hex strings)." (catch 'system-error (lambda () - (call-with-input-file (authenticated-commit-cache-file) + (call-with-input-file (authenticated-commit-cache-file key) read)) (lambda args (if (= ENOENT (system-error-errno args)) '() (apply throw args))))) -(define (cache-authenticated-commit commit-id) - "Record in ~/.cache COMMIT-ID and its closure as authenticated (only -COMMIT-ID is written to cache, though)." +(define (cache-authenticated-commit key commit-id) + "Record in ~/.cache, under KEY, COMMIT-ID and its closure as +authenticated (only COMMIT-ID is written to cache, though)." (define %max-cache-length ;; Maximum number of commits in cache. 200) (let ((lst (delete-duplicates - (cons commit-id (previously-authenticated-commits)))) - (file (authenticated-commit-cache-file))) + (cons commit-id (previously-authenticated-commits key)))) + (file (authenticated-commit-cache-file key))) (mkdir-p (dirname file)) (with-atomic-file-output file (lambda (port)