From 979fff677b8bc92611655c68f9a6e4f1a1a88f42 Mon Sep 17 00:00:00 2001 From: SpacemacsBot Date: Sun, 15 Dec 2024 20:37:15 +0000 Subject: [PATCH] [bot] "built_in_updates" Sun Dec 15 20:37:14 UTC 2024 --- core/libs/package-build.el | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/libs/package-build.el b/core/libs/package-build.el index 7e5fbdeca573..f7afec1fc7c1 100644 --- a/core/libs/package-build.el +++ b/core/libs/package-build.el @@ -424,8 +424,15 @@ or snapshots are build.") "--abbrev=12" "--match" tag rev)) (car (process-lines "git" "rev-parse" "--short=12" rev)))) -(cl-defmethod package-build--revdesc ((_rcp package-hg-recipe) rev &optional _tag) - rev) +(cl-defmethod package-build--revdesc ((_rcp package-hg-recipe) rev &optional tag) + ;; Cannot use "{shortest(node, minlength=12)}" because that results + ;; in "hg: parse error: can't use a key-value pair in this context". + (car (process-lines + "hg" "id" "--id" "--rev" rev "--template" + (if tag + (format "{latesttag('%s') %% '{tag}-{distance}-m{short(node)}'}\n" + tag) + "{short(node)}\n")))) ;;;; Tag @@ -458,7 +465,7 @@ Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING REVDESC TAG) or nil." (process-lines "git" "tag" "--list")) (cl-defmethod package-build--list-tags ((_rcp package-hg-recipe)) - (process-lines "hg" "tags" "--quiet")) + (delete "tip" (process-lines "hg" "tags" "--quiet"))) (define-obsolete-function-alias 'package-build-get-tag-version 'package-build-tag-version "Package-Build 5.0.0")