diff mbox series

[bug#48852] hg-download: Add helpers for defining packages.

Message ID d07bf63f579365db4618ebabc9e9e0866f02a875.1622920680.git.public@yoctocell.xyz
State Accepted
Headers show
Series [bug#48852] hg-download: Add helpers for defining packages. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Xinglu Chen June 5, 2021, 7:18 p.m. UTC 
Hg followup to commit ee17a9e06e636400e3354796a42ac445dbcc8f96.

* hg-download.scm (hg-version, hg-file-name): New procedures.
---
 guix/hg-download.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)


base-commit: 9da90938c63208b7721276f8cefcdac82ba765f2

Comments

Ludovic Courtès June 5, 2021, 9:13 p.m. UTC | #1 
Hi,

Xinglu Chen <public@yoctocell.xyz> skribis:

> Hg followup to commit ee17a9e06e636400e3354796a42ac445dbcc8f96.
>
> * hg-download.scm (hg-version, hg-file-name): New procedures.

Applied, thanks!

Ludo’.
Ludovic Courtès June 5, 2021, 9:17 p.m. UTC | #2 
I added the missing srfi-3[45] imports too.

Ludo’.
diff mbox series

Patch

diff --git a/guix/hg-download.scm b/guix/hg-download.scm
index c6cee2dbb8..9f23e4c40d 100644
--- a/guix/hg-download.scm
+++ b/guix/hg-download.scm
@@ -1,6 +1,7 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,7 +35,9 @@ 
             hg-reference-changeset
             hg-reference-recursive?
             hg-predicate
-            hg-fetch))
+            hg-fetch
+            hg-version
+            hg-file-name))
 
 ;;; Commentary:
 ;;;
@@ -102,6 +105,23 @@  HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
                       #:recursive? #t
                       #:guile-for-build guile)))
 
+(define (hg-version version revision changeset)
+  "Return the version string for packages using hg-download."
+  ;; hg-version is almost exclusively executed while modules are being loaded.
+  ;; This makes any errors hide their backtrace. Avoid the mysterious error
+  ;; "Value out of range 0 to N: 7" when the commit ID is too short, which
+  ;; can happen, for example, when the user swapped the revision and commit
+  ;; arguments by mistake.
+  (when (< (string-length changeset) 7)
+    (raise
+     (condition
+      (&message (message "hg-version: changeset ID unexpectedly short")))))
+  (string-append version "-" revision "." (string-take changeset 7)))
+
+(define (hg-file-name name version)
+  "Return the file-name for packages using hg-download."
+  (string-append name "-" version "-checkout"))
+
 (define (hg-file-list directory)
   "Evaluates to a list of files contained in the repository at path
   @var{directory}"