From nobody Tue Mar 15 19:40:05 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D89D01A254B2; Tue, 15 Mar 2022 19:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJ3dy27Qqz3wC3; Tue, 15 Mar 2022 19:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647373206; h=from:from: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; bh=lyE/+2Q7jAw6fFSr7pyzpq6R80LJY7HRTidJoO6/lOs=; b=OcupUg01jc6dJSWRVutVfPyYyJ3AshIKZLen8PYaCz/09hw2XOHOxzqRT5dOsF3qpiJfR2 ALCjWC+wj/T88WmFtf/uJcHIceAtVHiZdbK0KBHt7WwJCC4nsa/hluMARNXW68HmN8prQO mt6bPZdOIyCwaLms2PG8s7ubD9O8RFqMhghDfa2Bv0qJAMLclle09Zi1uL7bI3aXJD8eh2 5HotRFAxpj7//P7RZoa00XBU2wFDf30DvHG9Ez63eVACavhzV8Bz510ort9UJYD9rAJvZA EdD1UCssKlTny43S+mx+dVDhNzEL7N2AKvG4emV5Ql1dEkR2NVWgynW+anI45g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B66A27D2E; Tue, 15 Mar 2022 19:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FJe5rW086020; Tue, 15 Mar 2022 19:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FJe5cV086017; Tue, 15 Mar 2022 19:40:05 GMT (envelope-from git) Date: Tue, 15 Mar 2022 19:40:05 GMT Message-Id: <202203151940.22FJe5cV086017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 7163a3858dae - main - devel/tortoisehg: Update to 6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7163a3858daeb67fb55dee1a94c2bf7487867908 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647373206; h=from:from: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; bh=lyE/+2Q7jAw6fFSr7pyzpq6R80LJY7HRTidJoO6/lOs=; b=TptgAVKD+kP/SHzZ49vOeF0VQrZOqreIU8j+PJUQFxmHDbhTXVpyDsmu3Q2K6Hnj8tZBHG /imksYa+9D8BRiCwGuwgk+NfGXbF8cs7T6NFLj8wACQAgF1nI9/LU2f70gCYrodR/2p+qt 7CLZZ0q7+Xa9OjhqmUu+zdJ/OsxAVfhb0tm/LHv4EMPYr1BAuIYMvlBZfvL0Oi8H2RJene /MyqzY0ddAkx3ky/jNYpSw2mCYKBjV1HjBCgO2prNSXTPthNVycmReCTIisU8h6kCy+bVS 0ixpHrpUGsLEEPEuC5baa99Vq2Hzph7XfZVt99fcvYfM5tPbX4VmN5sFSUYo+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647373206; a=rsa-sha256; cv=none; b=r5s95snW4zig7seRz517DNQuCIx5U0qECE7zQXpx2se0/8A3sqZ1v+l8cy1EwptGlCwgDj IVQZleHwWQu0D+fljJZWApzHG3hx4huJuZ2KufEMNg3P5hYWoyHUzjA45vnQR4bB45mLfx 4f50HjvBGfI0qvDK2cxAYtLpdsM4S/irWGwPltxuTqkYMYorA94oNM+zZA8xOgVdMLu3/m iio87cEnnNJrFVRpl6VaNaqgIGxEOXCOT2AQPL95HDwLJy7ZXy6xtpq/Bp2ejgnA5Vk2uf gF5RoQYGzU9h6dI2T3/QWPDx7uTv9xrjBSSi7CQqrCPqUJiJo7ODF+36JfrRzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7163a3858daeb67fb55dee1a94c2bf7487867908 commit 7163a3858daeb67fb55dee1a94c2bf7487867908 Author: Gleb Popov AuthorDate: 2022-03-15 19:39:07 +0000 Commit: Gleb Popov CommitDate: 2022-03-15 19:39:58 +0000 devel/tortoisehg: Update to 6.1 Reported by: portscout! --- devel/tortoisehg/Makefile | 3 +-- devel/tortoisehg/distinfo | 6 +++--- .../tortoisehg/files/patch-tortoisehg_util_hgversion.py | 17 ++++++++--------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile index f476bdc37b45..3c23de94e392 100644 --- a/devel/tortoisehg/Makefile +++ b/devel/tortoisehg/Makefile @@ -1,6 +1,5 @@ PORTNAME= tortoisehg -DISTVERSION= 6.0 -PORTREVISION= 1 +DISTVERSION= 6.1 CATEGORIES= devel MASTER_SITES= https://www.mercurial-scm.org/release/tortoisehg/targz/ diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo index 0a14b4d0b08d..e581a1384f5c 100644 --- a/devel/tortoisehg/distinfo +++ b/devel/tortoisehg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641828567 -SHA256 (tortoisehg-6.0.tar.gz) = db9b90da5945ffec2a746a6e9ff9f396f01fdbce8e2119a5654212674b331fa6 -SIZE (tortoisehg-6.0.tar.gz) = 8918041 +TIMESTAMP = 1647283148 +SHA256 (tortoisehg-6.1.tar.gz) = 506d77065158f4372c08f59a06261aeabda803789e26d4d87d79270e828d9182 +SIZE (tortoisehg-6.1.tar.gz) = 8919383 diff --git a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py index eb4fbc84fd7f..7f7cdaa8cdb4 100644 --- a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py +++ b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py @@ -1,20 +1,19 @@ ---- tortoisehg/util/hgversion.py.orig 2020-04-08 09:44:12 UTC +--- tortoisehg/util/hgversion.py.orig 2022-03-06 02:33:21 UTC +++ tortoisehg/util/hgversion.py -@@ -19,16 +19,4 @@ except AttributeError: - testedwith = b'5.2 5.3' +@@ -33,15 +33,7 @@ def checkhgversion(v): + return vers def checkhgversion(v): - """range check the Mercurial version""" - reqvers = testedwith.split() -- v = v.split(b'+')[0] -- if not v or v == b'unknown' or len(v) >= 12: -- # can't make any intelligent decisions about unknown or hashes -- return -- vers = re.split(br'\.|-|rc', v)[:2] -- if len(vers) < 2: +- vers = _splitversion(v) +- if not vers: - return - if b'.'.join(vers) in reqvers: - return - return (b'This version of TortoiseHg requires Mercurial version %s.n to ' - b'%s.n, but found %s') % (reqvers[0], reqvers[-1], v) + return + + def checkminhgversion(v): + """Check if the given Mercurial version is not lower than the minimum