Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DD06884D47 for ; Sun, 10 Dec 2023 14:30:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Um_AJzeBkn99 for ; Sun, 10 Dec 2023 14:30:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3862C84CE2 for ; Sun, 10 Dec 2023 14:30:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 249FDFA42; Sun, 10 Dec 2023 14:30:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1702218612100560" MIME-Version: 1.0 Date: Sun, 10 Dec 2023 14:30:12 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/py-mercurial To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20231210143012.249FDFA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1702218612100560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Dec 10 14:30:12 UTC 2023 Modified Files: pkgsrc/devel/py-mercurial: Makefile distinfo version.mk Log Message: py-mercurial: update to 6.6.1. = Mercurial 6.6.1 = The first two patches fix aborted transactions that could happen since 6.6. * revlog: avoid exposing delayed index entry too widely in non-inline revlog * revlog: avoid wrongly updating the data file location on "divert" * tests: do not fail tests in a state with uncommitted .py file removal * perf-tags: fix the --clear-fnode-cache-rev code * perf-tags: fix clear_cache_fnodes to actually clear that cache * censor: fix things around inlining * Various Python 3 cleanups * Various Windows test suite fixes To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/py-mercurial/Makefile cvs rdiff -u -r1.140 -r1.141 pkgsrc/devel/py-mercurial/distinfo cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/py-mercurial/version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1702218612100560 Content-Disposition: inline Content-Length: 2442 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-mercurial/Makefile diff -u pkgsrc/devel/py-mercurial/Makefile:1.91 pkgsrc/devel/py-mercurial/Makefile:1.92 --- pkgsrc/devel/py-mercurial/Makefile:1.91 Thu Dec 7 09:31:36 2023 +++ pkgsrc/devel/py-mercurial/Makefile Sun Dec 10 14:30:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2023/12/07 09:31:36 wiz Exp $ +# $NetBSD: Makefile,v 1.92 2023/12/10 14:30:11 wiz Exp $ # # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew @@ -26,8 +26,11 @@ PYTHON_SELF_CONFLICT= yes .include "version.mk" USE_TOOLS+= bash:test -# Test status as of 6.6 -# Ran 931 tests, 83 skipped, 0 failed. +# Test status as of 6.6.1 +# Ran 931 tests, 83 skipped, 2 failed. +# test-censor.t#revlogv1.err +# test-censor.t#revlogv2.err +# https://bz.mercurial-scm.org/show_bug.cgi?id=6858 TEST_TARGET= tests TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} Index: pkgsrc/devel/py-mercurial/distinfo diff -u pkgsrc/devel/py-mercurial/distinfo:1.140 pkgsrc/devel/py-mercurial/distinfo:1.141 --- pkgsrc/devel/py-mercurial/distinfo:1.140 Thu Dec 7 09:31:36 2023 +++ pkgsrc/devel/py-mercurial/distinfo Sun Dec 10 14:30:11 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.140 2023/12/07 09:31:36 wiz Exp $ +$NetBSD: distinfo,v 1.141 2023/12/10 14:30:11 wiz Exp $ -BLAKE2s (mercurial-6.6.tar.gz) = 994cb75f6021f8c62c3812ba1443a5126790484302ff9cee9b24232a10541703 -SHA512 (mercurial-6.6.tar.gz) = 3451a89156b9ca697658a94610264d525e7e509e6155cdb7d8e5ad09582f8831a11c6b6430bbb4abbe863e6d4fca3708e4a0d88afc7099f35778959321b8164a -Size (mercurial-6.6.tar.gz) = 8250065 bytes +BLAKE2s (mercurial-6.6.1.tar.gz) = 12ed8896db0f38ff9a8774a55de2c305591a6db21ee36834778072aba5687365 +SHA512 (mercurial-6.6.1.tar.gz) = f16240f06a98a088e0229aa6584daa540eee92476a0a7934617c065c9f1012288cf3d6fb2d20fc7b247122bc360201f2e2c1c139c261a834f483bd09bef74d0c +Size (mercurial-6.6.1.tar.gz) = 8250933 bytes SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29 Index: pkgsrc/devel/py-mercurial/version.mk diff -u pkgsrc/devel/py-mercurial/version.mk:1.55 pkgsrc/devel/py-mercurial/version.mk:1.56 --- pkgsrc/devel/py-mercurial/version.mk:1.55 Thu Dec 7 09:31:36 2023 +++ pkgsrc/devel/py-mercurial/version.mk Sun Dec 10 14:30:11 2023 @@ -1,3 +1,3 @@ -# $NetBSD: version.mk,v 1.55 2023/12/07 09:31:36 wiz Exp $ +# $NetBSD: version.mk,v 1.56 2023/12/10 14:30:11 wiz Exp $ -VERSION= 6.6 +VERSION= 6.6.1 --_----------=_1702218612100560--