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 ms0.migadu.com with LMTPS id aMxAMFe80GF5dgEAgWs5BA (envelope-from ) for ; Sat, 01 Jan 2022 21:40:55 +0100 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 2B75KFe80GF6UgEAG6o9tA (envelope-from ) for ; Sat, 01 Jan 2022 21:40:55 +0100 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 D28E43AF88 for ; Sat, 1 Jan 2022 21:40:52 +0100 (CET) Received: from localhost ([::1]:57212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3lBM-0007bf-0z for larch@yhetil.org; Sat, 01 Jan 2022 15:40:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3lAa-0007ZJ-1C for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3lAZ-00042y-Mn for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3lAZ-0003CZ-LY for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH v2 1/4] guix hash: Extract file hashing procedures. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jan 2022 20:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50072@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Sarah Morgensen Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164106959712264 (code B ref 50072); Sat, 01 Jan 2022 20:40:03 +0000 Received: (at 50072) by debbugs.gnu.org; 1 Jan 2022 20:39:57 +0000 Received: from localhost ([127.0.0.1]:59467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3lAT-0003Be-5K for submit@debbugs.gnu.org; Sat, 01 Jan 2022 15:39:57 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:42624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3lAL-0003Ak-Bs for 50072@debbugs.gnu.org; Sat, 01 Jan 2022 15:39:51 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id dYfm2600C4UW6Th06YfnkB; Sat, 01 Jan 2022 21:39:47 +0100 From: Maxime Devos Date: Sat, 1 Jan 2022 20:39:37 +0000 Message-Id: <20220101203940.149517-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220101203940.149517-1-maximedevos@telenet.be> References: <20220101203940.149517-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1641069587; bh=datHYzL0SVd0rwUCzuWszTQqKpojPeEL4RGz2j9hH1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VNadx7TYJS+teRei0C1Ri8+UqLAo2ROvZrr3CZ0GaytqXuo/etZYU/KIAFS5nlvuT A/MA+l33nxki3vhP7LA/pEgNB8sGbVwgdUMj6DEt7RV2bPNIfIlIHp/oyNcvWuaDqG JqGSILtiigIpjFeS8P3in8fdqdpIKExVAZnL6/weHFfnNTN9okp1cKT///suHkBCye GKL9U3uShwyBsctHkvZyFS9Rkfqupy3xITlfR4wwCzyKo4MFPdQXLPL5JMx1WpaSdk debMVbMPJTb3uDvExAinXrc1kwubAzOQkp7eNuhAaP/4e6VrK3MdqJfoDFUkBKU7kv gG5mJ5h3mJ8Lw== 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641069652; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=datHYzL0SVd0rwUCzuWszTQqKpojPeEL4RGz2j9hH1M=; b=BxqBSILgM6gbY9wYOZJuUtvzK18T/mBjk4hRhD805a0Q6Cri9O4Jg6o/6VRwbd2cTlvFKd 4XqQcB7wbJilzXMvHVJWqkRlrjP3bAQaqZcnd9ARJoqtJEoKB9LUghC2MrNQUBHioBlsNS 63Z7ng4CWwkjZyWCqLSiTy1QfMoExPJO9mYzwiWZbW18UIJiiLBG4xdc8Cxik/Wn2Kdzye sb6gMVN9ZSxdl8OFLgwZqW4xxy7mJavfwUw3pYLc6GvKfXOKToi1XIPx/Id1fhwjW2bJ0v X6i/3HAdkFOhCEhuHxrML/gu86m6s7LLcsSV/khRBdTo+nFz9szHTOCKDmCRFA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641069652; a=rsa-sha256; cv=none; b=RjTvIzUHpVDq2Htftryv6+yaqwZ3rmDeBi5Uj2qnPyNi9tju6ERnGZv3j6U6rcAkSrBH4w 9xyBphismvjYbXtvwfHMfDOn5LPQ79y7bK+zzM7fj14M3AKzb6EyQG+HA2un6ZdK5Ck10y NxxYF8JgJeosADO+I/qhOk6HSH+WtUo6HVXMsZp42JP5HPAnvdO74rkOXqHkT4Q3zS7PEl rucFOlmedSnMoxUn0g4LVDANUMUrLHR/WWrkBvWCEfd33e8YjoStRVHmJ1GM6vSW6HkR56 Ft538P9XB+/sKOJYhNR5EukBGXqYAVIvHsrvXddAHH7gjZXtOjO2pqF5axrYLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=VNadx7TY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=VNadx7TY; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D28E43AF88 X-Spam-Score: -2.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: Q7D7N1O9N0E+ From: Sarah Morgensen * guix/scripts/hash.scm (guix-hash)[vcs-file?, file-hash]: Extract logic to... * guix/hash.scm: ...here. New file. --- Makefile.am | 1 + guix/hash.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ guix/scripts/hash.scm | 18 +++------------ 3 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 guix/hash.scm diff --git a/Makefile.am b/Makefile.am index 8c5682a1c6..bc3d0087d0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,6 +99,7 @@ MODULES = \ guix/extracting-download.scm \ guix/git-download.scm \ guix/hg-download.scm \ + guix/hash.scm \ guix/swh.scm \ guix/monads.scm \ guix/monad-repl.scm \ diff --git a/guix/hash.scm b/guix/hash.scm new file mode 100644 index 0000000000..8c2ab8187f --- /dev/null +++ b/guix/hash.scm @@ -0,0 +1,51 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Sarah Morgensen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix hash) + #:use-module (gcrypt hash) + #:use-module (guix serialization) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:export (vcs-file? + file-hash*)) + +(define (vcs-file? file stat) + "Returns true if FILE is a version control system file." + (case (stat:type stat) + ((directory) + (member (basename file) '(".bzr" ".git" ".hg" ".svn" "CVS"))) + ((regular) + ;; Git sub-modules have a '.git' file that is a regular text file. + (string=? (basename file) ".git")) + (else + #f))) + +(define* (file-hash* file #:key + (algorithm (hash-algorithm sha256)) + (recursive? #t) + (select? (negate vcs-file?))) + "Compute the hash of FILE with ALGORITHM. If RECURSIVE? is true, recurse +into subdirectories of FILE, computing the combined hash of all files for +which (SELECT? FILE STAT) returns true." + (if recursive? + (let-values (((port get-hash) + (open-hash-port algorithm))) + (write-file file port #:select? select?) + (force-output port) + (get-hash)) + (file-hash algorithm file))) diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index d73e3d13dd..168450d668 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (gcrypt hash) #:use-module (guix serialization) #:use-module (guix ui) + #:use-module (guix hash) #:use-module (guix scripts) #:use-module (guix base16) #:use-module (guix base32) @@ -46,11 +48,7 @@ (define* (nar-hash file #:optional (algorithm (assoc-ref %default-options 'hash-algorithm)) select?) - (let-values (((port get-hash) - (open-hash-port algorithm))) - (write-file file port #:select? select?) - (force-output port) - (get-hash))) + (file-hash* file #:algorithm algorithm #:select? select?)) (define* (default-hash file #:optional (algorithm (assoc-ref %default-options 'hash-algorithm)) @@ -181,16 +179,6 @@ use '--serializer' instead~%")) (parse-command-line args %options (list %default-options) #:build-options? #f)) - (define (vcs-file? file stat) - (case (stat:type stat) - ((directory) - (member (basename file) '(".bzr" ".git" ".hg" ".svn" "CVS"))) - ((regular) - ;; Git sub-modules have a '.git' file that is a regular text file. - (string=? (basename file) ".git")) - (else - #f))) - (let* ((opts (parse-options)) (args (filter-map (match-lambda (('argument . value) -- 2.30.2