Sun Dec 10 14:30:12 2023 UTC (169d)
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


(wiz)
diff -r1.91 -r1.92 pkgsrc/devel/py-mercurial/Makefile
diff -r1.140 -r1.141 pkgsrc/devel/py-mercurial/distinfo
diff -r1.55 -r1.56 pkgsrc/devel/py-mercurial/version.mk
cvs diff -r1.91 -r1.92 pkgsrc/devel/py-mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Makefile 2023/12/07 09:31:36 1.91
+++ pkgsrc/devel/py-mercurial/Makefile 2023/12/10 14:30:11 1.92
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.91 2023/12/07 09:31:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.92 2023/12/10 14:30:11 wiz Exp $
2# 2#
3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew 3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
4 4
5DISTNAME= mercurial-${VERSION} 5DISTNAME= mercurial-${VERSION}
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
7CATEGORIES= devel scm 7CATEGORIES= devel scm
8MASTER_SITES= https://www.mercurial-scm.org/release/ 8MASTER_SITES= https://www.mercurial-scm.org/release/
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= https://www.mercurial-scm.org/ 11HOMEPAGE= https://www.mercurial-scm.org/
12COMMENT= Fast, lightweight source control management system 12COMMENT= Fast, lightweight source control management system
13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
14 14
@@ -16,28 +16,31 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools @@ -16,28 +16,31 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools
16TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel 16TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
17 17
18USE_TOOLS+= gmake msgfmt 18USE_TOOLS+= gmake msgfmt
19 19
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
21INSTALLATION_DIRS+= share/doc/mercurial 21INSTALLATION_DIRS+= share/doc/mercurial
22 22
23PYTHON_VERSIONS_INCOMPATIBLE= 27 23PYTHON_VERSIONS_INCOMPATIBLE= 27
24PYTHON_SELF_CONFLICT= yes 24PYTHON_SELF_CONFLICT= yes
25 25
26.include "version.mk" 26.include "version.mk"
27 27
28USE_TOOLS+= bash:test 28USE_TOOLS+= bash:test
29# Test status as of 6.6 29# Test status as of 6.6.1
30# Ran 931 tests, 83 skipped, 0 failed. 30# Ran 931 tests, 83 skipped, 2 failed.
 31# test-censor.t#revlogv1.err
 32# test-censor.t#revlogv2.err
 33# https://bz.mercurial-scm.org/show_bug.cgi?id=6858
31 34
32TEST_TARGET= tests 35TEST_TARGET= tests
33TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} 36TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
34 37
35post-install: 38post-install:
36 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 39 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
37 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 40 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
38 ${INSTALL_DATA} ${WRKSRC}/README.rst \ 41 ${INSTALL_DATA} ${WRKSRC}/README.rst \
39 ${DESTDIR}${PREFIX}/share/doc/mercurial 42 ${DESTDIR}${PREFIX}/share/doc/mercurial
40 43
41do-test: 44do-test:
42 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} make tests ${TEST_MAKE_FLAGS} 45 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} make tests ${TEST_MAKE_FLAGS}
43 46
cvs diff -r1.140 -r1.141 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2023/12/07 09:31:36 1.140
+++ pkgsrc/devel/py-mercurial/distinfo 2023/12/10 14:30:11 1.141
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.140 2023/12/07 09:31:36 wiz Exp $ 1$NetBSD: distinfo,v 1.141 2023/12/10 14:30:11 wiz Exp $
2 2
3BLAKE2s (mercurial-6.6.tar.gz) = 994cb75f6021f8c62c3812ba1443a5126790484302ff9cee9b24232a10541703 3BLAKE2s (mercurial-6.6.1.tar.gz) = 12ed8896db0f38ff9a8774a55de2c305591a6db21ee36834778072aba5687365
4SHA512 (mercurial-6.6.tar.gz) = 3451a89156b9ca697658a94610264d525e7e509e6155cdb7d8e5ad09582f8831a11c6b6430bbb4abbe863e6d4fca3708e4a0d88afc7099f35778959321b8164a 4SHA512 (mercurial-6.6.1.tar.gz) = f16240f06a98a088e0229aa6584daa540eee92476a0a7934617c065c9f1012288cf3d6fb2d20fc7b247122bc360201f2e2c1c139c261a834f483bd09bef74d0c
5Size (mercurial-6.6.tar.gz) = 8250065 bytes 5Size (mercurial-6.6.1.tar.gz) = 8250933 bytes
6SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29 6SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29
cvs diff -r1.55 -r1.56 pkgsrc/devel/py-mercurial/version.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/version.mk 2023/12/07 09:31:36 1.55
+++ pkgsrc/devel/py-mercurial/version.mk 2023/12/10 14:30:11 1.56
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: version.mk,v 1.55 2023/12/07 09:31:36 wiz Exp $ 1# $NetBSD: version.mk,v 1.56 2023/12/10 14:30:11 wiz Exp $
2 2
3VERSION= 6.6 3VERSION= 6.6.1