From patchwork Tue Jun 18 08:30:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 65451 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 8C5C727BBEA; Tue, 18 Jun 2024 09:40:16 +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 A02D127BBE2 for ; Tue, 18 Jun 2024 09:40:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJUNo-0004ES-Fl; Tue, 18 Jun 2024 04: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 1sJUNm-0004EC-H9 for guix-patches@gnu.org; Tue, 18 Jun 2024 04: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 1sJUNm-0002zJ-6b; Tue, 18 Jun 2024 04:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJUNm-00016m-En; Tue, 18 Jun 2024 04:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71371] [PATCH v2] gnu: svn-fetch: Allow specifying revisions as strings. References: In-Reply-To: Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, pelzflorian@pelzflorian.de, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 18 Jun 2024 08:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71371@debbugs.gnu.org Cc: Nicolas Goaziou , Christopher Baines , Florian Pelz , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Matthew Trzcinski , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Florian Pelz , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Matthew Trzcinski , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 71371-submit@debbugs.gnu.org id=B71371.17186999424168 (code B ref 71371); Tue, 18 Jun 2024 08:40:02 +0000 Received: (at 71371) by debbugs.gnu.org; 18 Jun 2024 08:39:02 +0000 Received: from localhost ([127.0.0.1]:41639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJUMo-000150-8R for submit@debbugs.gnu.org; Tue, 18 Jun 2024 04:39:02 -0400 Received: from msg-4.mailo.com ([213.182.54.15]:38598 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJUMm-00014c-JK for 71371@debbugs.gnu.org; Tue, 18 Jun 2024 04:39:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1718699930; bh=4QMEG/qMiuD3QkGYOIxiqIt6eMlmYyQKAC+lnWwAlA0=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding; b=Xfu6xcphGwaRMGo3tF0jEe7SEYZb+AszwP0MGKy1JLQT3BdlRV9+5Grpb1xXTU9YA 3/gpVKdGRKe5V4vGorI+hsYgYvEza4o9ZchS3h3ea59D4QfDXrsuEhLQE6aQzj2ruZ /L2F6Q9zkmEjrB5Svngs3NWJy1a6KVmdJxGhLGqw= Received: by b221-7.in.mailobj.net [192.168.90.27] with ESMTP via ip-20.mailobj.net [213.182.54.20] Tue, 18 Jun 2024 10:38:50 +0200 (CEST) X-EA-Auth: pwvtsl39DJMV5KbYbgUxD1RNUDIYKhkPlg3t8xIrpWwJEtV+diGlGVSD/+qwBw9H1yduXo/6H6yCR/pjzorqCyBACIJqm7blgObFH7DHC2c= Date: Tue, 18 Jun 2024 10:30:10 +0200 Message-ID: <4885bc5c95529991846db147ca58f7445d3cd864.1718699410.git.mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.45.1 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: , Reply-to: Nicolas Goaziou X-ACL-Warn: , Nicolas Goaziou via Guix-patches X-Patchwork-Original-From: Nicolas Goaziou via Guix-patches via From: Nicolas Goaziou 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/svn-download.scm (): (svn-fetch): (svn-multi-fetch): * guix/build/svn.scm (svn-fetch): Revision can also be a string, not only a number. * doc/guix.texi (origin Reference): Document changes about REVISION field. Change-Id: Ibb17b539575fdf3daf895bd1ce39a40dd9b495cb --- v2: No longer ignore "-r" argument. Instead, allow strings, such as "HEAD". Yes, in practice, it means this relies on the tag being stable, which is the same assumption as for, e.g., tarballs. WDYT? doc/guix.texi | 2 +- guix/build/svn.scm | 7 ++++++- guix/svn-download.scm | 20 ++++++++++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) base-commit: 30dbc8e7b0d94c0e38e8b7380260450e20035c58 diff --git a/doc/guix.texi b/doc/guix.texi index 0102fd0fad..0b30ed0a72 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8283,7 +8283,7 @@ origin Reference The URL of the Subversion repository to clone. @item @code{revision} -This string denotes revision to fetch specified as a number. +This string or number denotes revision to fetch. @item @code{recursive?} (default: @code{#f}) This Boolean indicates whether to recursively fetch Subversion diff --git a/guix/build/svn.scm b/guix/build/svn.scm index 875d3c50ca..58b74fd37a 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -46,7 +46,12 @@ (define* (svn-fetch url revision directory ;; Trust the server certificate. This is OK as we ;; verify the checksum later. This can be removed when ;; ca-certificates package is added. - "--trust-server-cert" "-r" (number->string revision) + "--trust-server-cert" + + ;; Revision. It can be a number or a string. + "-r" (if (number? revision) + (number->string revision) + revision) ;assume string ;; Disable keyword substitutions (keywords are CVS-like strings ;; like "$Date$", "$Id$", and so on) for two reasons: (1) some diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 62649e4374..e21091defc 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -64,7 +64,7 @@ (define-record-type* svn-reference make-svn-reference svn-reference? (url svn-reference-url) ; string - (revision svn-reference-revision) ; number + (revision svn-reference-revision) ; number|string (recursive? svn-reference-recursive? (default #f)) (user-name svn-reference-user-name (default #f)) (password svn-reference-password (default #f))) @@ -113,7 +113,8 @@ (define (svn-fetch-builder svn hash-algo) (or (and (download-method-enabled? 'upstream) (svn-fetch (getenv "svn url") - (string->number (getenv "svn revision")) + (let ((r (getenv "svn revision"))) + (or (string->number r) r)) #$output #:svn-command #+(file-append svn "/bin/svn") #:recursive? (match (getenv "svn recursive?") @@ -152,7 +153,10 @@ (define* (svn-fetch ref hash-algo hash #:env-vars `(("svn url" . ,(svn-reference-url ref)) ("svn revision" - . ,(number->string (svn-reference-revision ref))) + . ,(let ((revision (svn-reference-revision ref))) + (if (number? revision) + (number->string revision) + revision))) ,@(if (svn-reference-recursive? ref) `(("svn recursive?" . "yes")) '()) @@ -187,7 +191,7 @@ (define-record-type* svn-multi-reference make-svn-multi-reference svn-multi-reference? (url svn-multi-reference-url) ; string - (revision svn-multi-reference-revision) ; number + (revision svn-multi-reference-revision) ; number|string (locations svn-multi-reference-locations) ; list of strings (recursive? svn-multi-reference-recursive? (default #f)) (user-name svn-multi-reference-user-name (default #f)) @@ -240,7 +244,8 @@ (define (svn-multi-fetch-builder svn hash-algo) (mkdir-p (string-append #$output "/" (dirname location)))) (and (download-method-enabled? 'upstream) (svn-fetch (string-append (getenv "svn url") "/" location) - (string->number (getenv "svn revision")) + (let ((r (getenv "svn revision"))) + (or (string->number r) r)) (if (string-suffix? "/" location) (string-append #$output "/" location) (string-append #$output "/" (dirname location))) @@ -292,7 +297,10 @@ (define* (svn-multi-fetch ref hash-algo hash ("svn locations" . ,(object->string (svn-multi-reference-locations ref))) ("svn revision" - . ,(number->string (svn-multi-reference-revision ref))) + . ,(let ((revision (svn-multi-reference-revision ref))) + (if (number? revision) + (number->string revision) + revision))) ,@(if (svn-multi-reference-recursive? ref) `(("svn recursive?" . "yes")) '())