Date: Tue, 15 Mar 2022 19:40:05 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7163a3858dae - main - devel/tortoisehg: Update to 6.1 Message-ID: <202203151940.22FJe5cV086017@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7163a3858daeb67fb55dee1a94c2bf7487867908 commit 7163a3858daeb67fb55dee1a94c2bf7487867908 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2022-03-15 19:39:07 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203151940.22FJe5cV086017>