From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WGJINNDvNWHSCAAAgWs5BA (envelope-from ) for ; Mon, 06 Sep 2021 12:39:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CO1SMNDvNWGHYwAA1q6Kng (envelope-from ) for ; Mon, 06 Sep 2021 10:39:12 +0000 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 1688211FDC for ; Mon, 6 Sep 2021 12:39:12 +0200 (CEST) Received: from localhost ([::1]:38432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNC1u-0001td-RN for larch@yhetil.org; Mon, 06 Sep 2021 06:39:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNC1m-0001su-9C for guix-patches@gnu.org; Mon, 06 Sep 2021 06:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNC1l-0001tA-UJ for guix-patches@gnu.org; Mon, 06 Sep 2021 06:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNC1l-0002lW-Rt for guix-patches@gnu.org; Mon, 06 Sep 2021 06:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50377] [PATCH v3 1/2] git: 'resolve-reference' handles 'git describe'-style commit IDs. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Sep 2021 10:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50377 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50377@debbugs.gnu.org Received: via spool by 50377-submit@debbugs.gnu.org id=B50377.163092474010623 (code B ref 50377); Mon, 06 Sep 2021 10:39:01 +0000 Received: (at 50377) by debbugs.gnu.org; 6 Sep 2021 10:39:00 +0000 Received: from localhost ([127.0.0.1]:52058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNC1k-0002lH-Dv for submit@debbugs.gnu.org; Mon, 06 Sep 2021 06:39:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNC1j-0002l3-GF for 50377@debbugs.gnu.org; Mon, 06 Sep 2021 06:39:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35076) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNC1e-0001nU-9p for 50377@debbugs.gnu.org; Mon, 06 Sep 2021 06:38:54 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:38042 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNC1d-0008F8-Ml for 50377@debbugs.gnu.org; Mon, 06 Sep 2021 06:38:54 -0400 From: Marius Bakke Date: Mon, 6 Sep 2021 12:38:45 +0200 Message-Id: <20210906103846.14941-2-marius@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210906103846.14941-1-marius@gnu.org> References: <20210906103846.14941-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630924752; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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; bh=FeP8jfxgAEKYrw0oeIfjhkS1F3Hve3NBafF6sJqxnxU=; b=JnXFnCjUVuPLoFlIjyQEi4rm2mjpcYZ/G9m0WIE8tFg+GJIuUhxf6Co2Qh0Gas54MQShyL e+KdSSnty9kdWQ+ePePqlZfz4LJFd8pDNJ7cbI3qwUh1P9m3wuAHmCYrD3OHXBYRrZGq2V VRMVViD+d6cD2nUA1Ochq4oRZKg0931qNsw9RWbe87iAFy3s3/6xVz2XkOSVH/L8o8Z0qG 7FexFsBCrFl0fP7lowBCPNVKtpM8SKhqSRGrFlcFQCQOTjMfYFZIMWnqnhQMMguf3Xv6gU V8+a21y6t9KQIbXdJSSFti5yGKM+NTysUQDZ/563yBWIS4RZZG64R1pgYja2/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630924752; a=rsa-sha256; cv=none; b=qN592RcoMM4q/JO43b4NQtm0LARvh1waLTV38T7VSXCd1RNLp/Z/IfVssNvXo5ZJkcEfx0 ZYRPhBUggneY8YfZRcsrx4nsH4rqOyxHqSKWxCHOGgOHROJ89oE1LKM6N/zlld++RR0UVK 2TPgjh6ybZMs38l9Pvcl7qMyoYZLho9mW2BQ+X0eY8Wn52kGgiN6okOAHrn0TTHENCZDsT qiOSHpjt6FhjI16KZunVZdLG04atBq/wIjQ27RMsTNxz+459MhVxRVBWiFmQuGLebhLAoa is+HwpK4GhQyRdSpw9MTvmWnpr9Yep9A4Kis8oYbSiTNsMq13McJJY/RE8OHUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.91 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1688211FDC X-Spam-Score: -1.91 X-Migadu-Scanner: scn1.migadu.com X-TUID: m2F4omU8iqjy * guix/git.scm (resolve-reference): Rewrite tag-or-commit case to recognize 'git describe' style identifiers and resolve them as commits. --- guix/git.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 9c6f326c36..621de0e925 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2021 Kyle Meyer +;;; Copyright © 2021 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -223,15 +224,29 @@ corresponding Git object." (object-lookup-prefix repository (string->oid commit) len) (object-lookup repository (string->oid commit))))) (('tag-or-commit . str) - (if (or (> (string-length str) 40) - (not (string-every char-set:hex-digit str))) - (resolve `(tag . ,str)) ;definitely a tag - (catch 'git-error - (lambda () - (resolve `(tag . ,str))) - (lambda _ - ;; There's no such tag, so it must be a commit ID. - (resolve `(commit . ,str)))))) + (cond ((and (string-contains str "-g") + (match (string-split str #\-) + ((version ... revision g+commit) + (if (and (> (string-length g+commit) 4) + (string-every char-set:digit revision) + (string-every char-set:hex-digit + (string-drop g+commit 1))) + (string-drop g+commit 1) + #f)) + (_ #f))) + ;; Looks like a 'git describe' style ID, like + ;; v1.3.0-7-gaa34d4d28d. + => (lambda (commit) (resolve `(commit . ,commit)))) + ((or (> (string-length str) 40) + (not (string-every char-set:hex-digit str))) + (resolve `(tag . ,str))) ;definitely a tag + (else + (catch 'git-error + (lambda () + (resolve `(tag . ,str))) + (lambda _ + ;; There's no such tag, so it must be a commit ID. + (resolve `(commit . ,str))))))) (('tag . tag) (let ((oid (reference-name->oid repository (string-append "refs/tags/" tag)))) -- 2.31.1