From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4PahLLkJa2VxqwAAauVa8A:P1 (envelope-from ) for ; Sat, 02 Dec 2023 11:40:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4PahLLkJa2VxqwAAauVa8A (envelope-from ) for ; Sat, 02 Dec 2023 11:40:57 +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 966085CDBB for ; Sat, 2 Dec 2023 11:40:57 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=g4+muwNt; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701513657; 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=G4l7j17nYBM/41gHsfECD98oi6qjv9zNIvoBL9R0KKo=; b=Pm0FLhz1IX/d9Cm9DhnpixqzBqGQEwJ+0ogR3ShT1k4anxn+zAdfPaLrzkYz9Lm3JfQsnG X1XR55q2jiWxCOT7wZw4Q/oY+ymaHLLhY9+QlZuqpd25hNphlRqWTPHWZl0D7HNaaS08qx bZgp+JcWZBRF3X/wuNbZ5psO+IAluc1Iacezw18l3VvYzu6ovKorAqk3TgHF0ql0WJLCP6 7Opo8nVmKaunGFrrjTWvISH/kci79XLZAeFISzsFYsaLf7jHc+EgZy7GymgFELHYzP8Xso SiwPYdxTchdhlSt3fI74Rlcr31Qpi35pcWh+sUZFfO/lZR+aHHKWvFaWRy3Lsw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=g4+muwNt; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701513657; a=rsa-sha256; cv=none; b=k0DHIj1PtHVen+HK0um8A1a5k5qqH/YoWkPCbA1eCfCMt6sGplu3n0TZydNYtiLE/GGkSi RQ8RDi4DjrRp9DjugrgVlZPRMFh8JVkGOXOKkeju4bP7BZvoEDG9etBTAceYnFYQgby7MW UsZ4JPTo9XRv9yoXQ16dsCUJpCF6Uo4Z3s0v5+Y+8A/Fo6c5AkoreskgiPapFX3MaxW1Wh EZDc9eLUJwdVg1ZRd1VnuwYosyfNt+1qxoXSYJSAUvaz5TknoajlJ3b6XMu+SVXFqOLXXJ LlL1v5F63MFq4LRfcNpAWrTz/o0IS73BgIeiA4583Q5ztYchqe5gslKfNe9ehg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9NQc-0004MI-IH; Sat, 02 Dec 2023 05:40:54 -0500 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 1r9NQb-0004M1-Aj for guix-patches@gnu.org; Sat, 02 Dec 2023 05:40:53 -0500 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 1r9NQb-0005bW-29 for guix-patches@gnu.org; Sat, 02 Dec 2023 05:40:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9NQk-00038D-7L for guix-patches@gnu.org; Sat, 02 Dec 2023 05:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66961] [PATCH v3] scripts: hash: Handle repository with different VCS folders. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 10:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66961 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Simon Tournier Cc: Josselin Poiret , Mathieu Othacehe , Tobias Geerinckx-Rice , 66961@debbugs.gnu.org, Ricardo Wurmus , Christopher Baines Received: via spool by 66961-submit@debbugs.gnu.org id=B66961.170151361211961 (code B ref 66961); Sat, 02 Dec 2023 10:41:02 +0000 Received: (at 66961) by debbugs.gnu.org; 2 Dec 2023 10:40:12 +0000 Received: from localhost ([127.0.0.1]:56716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9NPv-00036r-T3 for submit@debbugs.gnu.org; Sat, 02 Dec 2023 05:40:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9NPu-00036W-LR for 66961@debbugs.gnu.org; Sat, 02 Dec 2023 05:40:10 -0500 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 1r9NPe-0004FO-Tx; Sat, 02 Dec 2023 05:39:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=G4l7j17nYBM/41gHsfECD98oi6qjv9zNIvoBL9R0KKo=; b=g4+muwNtXNfVsc0Tr6E+ IqpAsqaBUMVZU8dJle159ak4Qgg+QM3SPRGwUb19/NG+K1SREyvpffQ46fMgFR7RaNOvx2nVCTrYe +1l2K6i7wDENmsf6dtrDzTry/FAoesVNlqomkvOg5j0nRrL2FPOOBZ29qccOm6ltt3vIzDhNZ8x2K 4draED4TdmMnWTrStvNx5kQbw2vM8wVmucEWRh7QE38mHEl7e44sHU5MxQHP5bij0Ac9fOr00fF8Z rvGkmbwnRYDkvUc/QbGOHmgMnCB7PrmGjKqy7XSq+9d4zCsJ2oZ1L3aCxybk8ULVIG80W4dKjSbQr T4epPS7X38hh/Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <6a560e37ba23e43d35c0b62c1ee860b4341c263c.1701290895.git.zimon.toutoune@gmail.com> (Simon Tournier's message of "Wed, 29 Nov 2023 21:54:03 +0100") References: <4be63ddf12bd6143b43e87951e164dc93c585bb8.1699225200.git.zimon.toutoune@gmail.com> <6a560e37ba23e43d35c0b62c1ee860b4341c263c.1701290895.git.zimon.toutoune@gmail.com> Date: Sat, 02 Dec 2023 11:39:51 +0100 Message-ID: <87ttp0hoqw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 966085CDBB X-Spam-Score: -3.85 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.85 X-TUID: ZgpMz21qf8B9 Hi, Simon Tournier skribis: > Fixes . > Reported by Simon Tournier > > * guix/hash.scm (%vcs-directories): New variable. > (vcs-file?): Add optional argument for passing VCS kind of the > file/repository. > (file-hash*): Adjust accordingly. > (vcs-exclude?): New procedure and export it. > * guix/scripts/hash.scm (guix-hash)[file-hash]: Use it. > > Change-Id: I8e286c3426ddefd664dc3a471d5a09e309824faa [...] > +(define (vcs-exclude? directory) > + "Return a procedure excluding content if DIRECTORY contains supported = VCS." Nitpick: I would call it =E2=80=98vcs-file-predicate=E2=80=99 for consisten= cy, with a docstring along these lines: Return a two-argument procedure that returns true for version-control metadata directories such as '.git' found in DIRECTORY. > + (lambda (file stat) > + (not (vcs-file? file stat vcs-directories)))) =E2=80=A6 and thus removing =E2=80=98not=E2=80=99 here > + (let ((select? (if (assq-ref opts 'exclude-vcs?) > + (vcs-exclude? file) =E2=80=A6 and changing the above to (negate (vcs-file-predicate file)). (=E2=80=9CReturn #t for VCS files=E2=80=9D sounds clearer to me than =E2=80= =9Creturn true except for VCS files=E2=80=9D in terms of API design.) OK with these changes! Thanks, Ludo=E2=80=99.