From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sMG1GV+hxGB5BQAAgWs5BA (envelope-from ) for ; Sat, 12 Jun 2021 13:58:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KHRUFV+hxGBUQQAAB5/wlQ (envelope-from ) for ; Sat, 12 Jun 2021 11:58:23 +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 D86D919F74 for ; Sat, 12 Jun 2021 13:58:22 +0200 (CEST) Received: from localhost ([::1]:55436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ls2HN-0006Cd-SU for larch@yhetil.org; Sat, 12 Jun 2021 07:58:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ls2H4-0006CK-5w for guix-patches@gnu.org; Sat, 12 Jun 2021 07:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ls2H3-0006m4-Po for guix-patches@gnu.org; Sat, 12 Jun 2021 07:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ls2H3-000439-QJ for guix-patches@gnu.org; Sat, 12 Jun 2021 07:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48971] [PATCH 1/2] swh: Support lookup of Hg tags. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 11:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48971 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48971@debbugs.gnu.org Received: via spool by 48971-submit@debbugs.gnu.org id=B48971.162349904915513 (code B ref 48971); Sat, 12 Jun 2021 11:58:01 +0000 Received: (at 48971) by debbugs.gnu.org; 12 Jun 2021 11:57:29 +0000 Received: from localhost ([127.0.0.1]:40450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls2GW-000429-TV for submit@debbugs.gnu.org; Sat, 12 Jun 2021 07:57:29 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:35578 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls2GU-00041p-Ov for 48971@debbugs.gnu.org; Sat, 12 Jun 2021 07:57:27 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1623499040; bh=j9TwaveoX7r8U5DkeF2faZc327V+HOSv9Ev4TGbnfpk=; h=From:To:Subject:In-Reply-To:References:Date; b=d+iCYfPTHNvg1XuZbVJc9L+oHj8EEIsRksqA/Mb+GVKUmQaixBgngC3eFzJC+y12I +gke0Bnke3Igd7WWFnJCEw50cDeGIarPJ3OSVKNGDzFwkkdeoI97IYpMm1vWVwngqk fZ4Np2n3rTiKT4R4ctgIx4vX2TfD0KKFicSroigo= In-Reply-To: References: Message-Id: Date: Sat, 12 Jun 2021 13:57:19 +0200 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623499103; 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:dkim-signature; bh=GhqanuVoZrv/KHNS/vDGl+O1ohUuGcsOQqAcw+SQvr0=; b=qzkfRVUprOJcqnKXW1o4Vi22kiPCraQniPFfpRrKu/RnhoCuEuVU+z7vJotWkc04b4mTKM YIv6xHCSzoTvQ8L6U9SWvFez97FGiLaRY6sny+tvq8nhkQXEGXLJosR3zfKdrCDkqKaCov Rpz/PkqE8IuNssOVgE+ZdZw77TkjW2FtOwuV/8V74tOnTCWn4g1eWcI/Yvrb9tDBa1Fh/5 Uon+qjeRROIZ6yJ8f+lOZ2S63/ltxoaIAzUVEZDUc0Y29OV6HpCC9g27kKHetTCfcdFZf1 JEvpC3fbI1ixZG067gz9SSuQLLJ937kvN+Mc+f7igJx8amlShAwqz9mTTi521g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623499103; a=rsa-sha256; cv=none; b=tg1CpRcvWvrxzntGJjBqosDFr37+Y8mCxuJAgf9Q5woBNG5IR51+wkXH3//RjhKN8jwz7F Mf0hPsqOZl7nyGhZA7FMaf/3XYrgk7cNMF5b986tRrGMrPDzheiTi6JoKxnjyba0G/LOFj mvgjPCgXVbNOAr/4LVVoDgSkgagEkkSs0pw1IH4zEUcn6aKtAZWTfcDTlgYZoyaW1m/OKR f+kthTaN/6hm+hlMk1gCRHoyNaL/pVNDYwidIUhaXcn4gaSrWFgNDmikAzuW8nXttUm5MM tp+efe0cEmchYm9KEtp+6/dXLW4EYoSz8OXGAx8VYl7lhAqUU0+X2qFHFf0iLw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=d+iCYfPT; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=d+iCYfPT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); 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: D86D919F74 X-Spam-Score: -0.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: h72+yXZlVM3h * guix/swh.scm (lookup-origin-revision): Support lookup of Hg tags, not just Git tags. --- I noticed that the =E2=80=98commit-id?=E2=80=99 procedure checks if REFEREN= CE is of length 40, this will result in false negatives because some packages that use =E2=80=98hg-fetch=E2=80=99 only specify the first ~10 or ~15 chara= cters of the changeset revision. We should probably fix that. guix/swh.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index f6d5241e06..b5c800011d 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2018, 2019, 2020, 2021 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -455,8 +456,13 @@ URL could not be found." ((visit . _) (let ((snapshot (visit-snapshot visit))) (match (and=3D> (find (lambda (branch) - (string=3D? (string-append "refs/tags/" t= ag) - (branch-name branch))) + (or + ;; Git specific. + (string=3D? (string-append "refs/tags/" = tag) + (branch-name branch)) + ;; Hg specific. + (string=3D? tag + (branch-name branch)))) (snapshot-branches snapshot)) branch-target) ((? release? release) --=20 2.32.0