py-mercurial: update to 5.8. == New Features == * `hg purge` is now a core command using `--confirm` by default. * The `rev-branch-cache` is now updated incrementally whenever changesets are added. * The new options `experimental.bundlecompthreads` and `experimental.bundlecompthreads.<engine>` can be used to instruct the compression engines for bundle operations to use multiple threads for compression. The default is single threaded operation. Currently only supported for zstd. == Default Format Change == These changes affects newly created repositories (or new clone) done with Mercurial 5.8. * The `ZSTD` compression will now be used by default for new repositories when available. This compression format was introduced in Mercurial 5.0, released in May 2019. See `hg help config.format.revlog-compression` for details. * Mercurial installation built with the Rust parts will now use the "persistent nodemap" feature by default. This feature was introduced in Mercurial 5.4 (May 2020). However Mercurial installation built without the fast Rust implementation will refuse to interact with them by default. This restriction can be lifted through configuration. See `hg help config.format.use-persistent-nodemap` for details == New Experimental Features == * There's a new `diff.merge` config option to show the changes relative to an automerge for merge changesets. This makes it easier to detect and review manual changes performed in merge changesets. It is supported by `hg diff --change`, `hg log -p` `hg incoming -p`, and `hg outgoing -p` so far. == Bug Fixes == * gracefully recover from inconsistent persistent-nodemap data from disk. == Backwards Compatibility Changes == * In normal repositories, the first parent of a changeset is not null, unless both parents are null (like the first changeset). Some legacy repositories violate this condition. The revlog code will now silentely swap the parents if this condition is tested. This can change the output of `hg log` when explicitly asking for first or second parent. The changesets "nodeid" are not affected.diff -r1.53 -r1.54 pkgsrc/devel/py-mercurial/Makefile
(wiz)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.53 2021/04/11 23:07:03 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.54 2021/05/20 09:08:27 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 | |||
5 | DISTNAME= mercurial-${VERSION} | 5 | DISTNAME= mercurial-${VERSION} | |
6 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 6 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
7 | CATEGORIES= devel scm | 7 | CATEGORIES= devel scm | |
8 | MASTER_SITES= https://www.mercurial-scm.org/release/ | 8 | MASTER_SITES= https://www.mercurial-scm.org/release/ | |
9 | 9 | |||
10 | MAINTAINER= wiz@NetBSD.org | 10 | MAINTAINER= wiz@NetBSD.org | |
11 | HOMEPAGE= https://www.mercurial-scm.org/ | 11 | HOMEPAGE= https://www.mercurial-scm.org/ | |
12 | COMMENT= Fast, lightweight source control management system | 12 | COMMENT= Fast, lightweight source control management system | |
13 | LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer | 13 | LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer | |
14 | 14 | |||
@@ -20,36 +20,33 @@ DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:. | @@ -20,36 +20,33 @@ DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:. | |||
20 | # via xmlrpc from python itself, used in mercurial/pycompat.py | 20 | # via xmlrpc from python itself, used in mercurial/pycompat.py | |
21 | DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat | 21 | DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat | |
22 | 22 | |||
23 | TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 | 23 | TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 | |
24 | 24 | |||
25 | USE_TOOLS+= gmake msgfmt | 25 | USE_TOOLS+= gmake msgfmt | |
26 | 26 | |||
27 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 | 27 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 | |
28 | INSTALLATION_DIRS+= share/doc/mercurial | 28 | INSTALLATION_DIRS+= share/doc/mercurial | |
29 | 29 | |||
30 | .include "version.mk" | 30 | .include "version.mk" | |
31 | .include "options.mk" | 31 | .include "options.mk" | |
32 | 32 | |||
33 | # Known test failures as of 5.7 | |||
34 | # https://bz.mercurial-scm.org/show_bug.cgi?id=6429 | |||
35 | USE_TOOLS+= bash:test | 33 | USE_TOOLS+= bash:test | |
36 | # Two tests use "python": | 34 | # Known test failures as of 5.8 | |
37 | # test-convert-cvs.t | 35 | # test-persistent-nodemap.t | |
38 | # test-merge-tools.t | 36 | # https://bz.mercurial-scm.org/show_bug.cgi?id=6523 | |
39 | # https://bz.mercurial-scm.org/show_bug.cgi?id=6480 | 37 | # test-reject_new_heads.t | |
40 | # test-archive.t: | 38 | # https://bz.mercurial-scm.org/show_bug.cgi?id=6524 | |
41 | # https://bz.mercurial-scm.org/show_bug.cgi?id=6499 | |||
42 | # | 39 | # | |
43 | # Ran 868 tests, 80 skipped, 1 failed. | 40 | # Ran 878 tests, 81 skipped, 2 failed. | |
44 | 41 | |||
45 | TEST_TARGET= tests | 42 | TEST_TARGET= tests | |
46 | TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} | 43 | TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} | |
47 | 44 | |||
48 | post-install: | 45 | post-install: | |
49 | ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 46 | ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
50 | ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 | 47 | ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 | |
51 | ${INSTALL_DATA} ${WRKSRC}/README.rst \ | 48 | ${INSTALL_DATA} ${WRKSRC}/README.rst \ | |
52 | ${DESTDIR}${PREFIX}/share/doc/mercurial | 49 | ${DESTDIR}${PREFIX}/share/doc/mercurial | |
53 | 50 | |||
54 | .include "../../lang/python/distutils.mk" | 51 | .include "../../lang/python/distutils.mk" | |
55 | .include "../../mk/bsd.pkg.mk" | 52 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.33 2021/02/06 08:29:18 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.34 2021/05/20 09:08:27 wiz Exp $ | |
2 | bin/hg | 2 | bin/hg | |
3 | ${PYSITELIB}/${EGG_FILE} | 3 | ${PYSITELIB}/${EGG_FILE} | |
4 | ${PYSITELIB}/hgdemandimport/__init__.py | 4 | ${PYSITELIB}/hgdemandimport/__init__.py | |
5 | ${PYSITELIB}/hgdemandimport/__init__.pyc | 5 | ${PYSITELIB}/hgdemandimport/__init__.pyc | |
6 | ${PYSITELIB}/hgdemandimport/__init__.pyo | 6 | ${PYSITELIB}/hgdemandimport/__init__.pyo | |
7 | ${PYSITELIB}/hgdemandimport/demandimportpy2.py | 7 | ${PYSITELIB}/hgdemandimport/demandimportpy2.py | |
8 | ${PYSITELIB}/hgdemandimport/demandimportpy2.pyc | 8 | ${PYSITELIB}/hgdemandimport/demandimportpy2.pyc | |
9 | ${PYSITELIB}/hgdemandimport/demandimportpy2.pyo | 9 | ${PYSITELIB}/hgdemandimport/demandimportpy2.pyo | |
10 | ${PYSITELIB}/hgdemandimport/demandimportpy3.py | 10 | ${PYSITELIB}/hgdemandimport/demandimportpy3.py | |
11 | ${PYSITELIB}/hgdemandimport/demandimportpy3.pyc | 11 | ${PYSITELIB}/hgdemandimport/demandimportpy3.pyc | |
12 | ${PYSITELIB}/hgdemandimport/demandimportpy3.pyo | 12 | ${PYSITELIB}/hgdemandimport/demandimportpy3.pyo | |
13 | ${PYSITELIB}/hgdemandimport/tracing.py | 13 | ${PYSITELIB}/hgdemandimport/tracing.py | |
14 | ${PYSITELIB}/hgdemandimport/tracing.pyc | 14 | ${PYSITELIB}/hgdemandimport/tracing.pyc | |
@@ -905,26 +905,29 @@ ${PYSITELIB}/mercurial/repocache.pyc | @@ -905,26 +905,29 @@ ${PYSITELIB}/mercurial/repocache.pyc | |||
905 | ${PYSITELIB}/mercurial/repocache.pyo | 905 | ${PYSITELIB}/mercurial/repocache.pyo | |
906 | ${PYSITELIB}/mercurial/repoview.py | 906 | ${PYSITELIB}/mercurial/repoview.py | |
907 | ${PYSITELIB}/mercurial/repoview.pyc | 907 | ${PYSITELIB}/mercurial/repoview.pyc | |
908 | ${PYSITELIB}/mercurial/repoview.pyo | 908 | ${PYSITELIB}/mercurial/repoview.pyo | |
909 | ${PYSITELIB}/mercurial/requirements.py | 909 | ${PYSITELIB}/mercurial/requirements.py | |
910 | ${PYSITELIB}/mercurial/requirements.pyc | 910 | ${PYSITELIB}/mercurial/requirements.pyc | |
911 | ${PYSITELIB}/mercurial/requirements.pyo | 911 | ${PYSITELIB}/mercurial/requirements.pyo | |
912 | ${PYSITELIB}/mercurial/revlog.py | 912 | ${PYSITELIB}/mercurial/revlog.py | |
913 | ${PYSITELIB}/mercurial/revlog.pyc | 913 | ${PYSITELIB}/mercurial/revlog.pyc | |
914 | ${PYSITELIB}/mercurial/revlog.pyo | 914 | ${PYSITELIB}/mercurial/revlog.pyo | |
915 | ${PYSITELIB}/mercurial/revlogutils/__init__.py | 915 | ${PYSITELIB}/mercurial/revlogutils/__init__.py | |
916 | ${PYSITELIB}/mercurial/revlogutils/__init__.pyc | 916 | ${PYSITELIB}/mercurial/revlogutils/__init__.pyc | |
917 | ${PYSITELIB}/mercurial/revlogutils/__init__.pyo | 917 | ${PYSITELIB}/mercurial/revlogutils/__init__.pyo | |
918 | ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.py | |||
919 | ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyc | |||
920 | ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyo | |||
918 | ${PYSITELIB}/mercurial/revlogutils/constants.py | 921 | ${PYSITELIB}/mercurial/revlogutils/constants.py | |
919 | ${PYSITELIB}/mercurial/revlogutils/constants.pyc | 922 | ${PYSITELIB}/mercurial/revlogutils/constants.pyc | |
920 | ${PYSITELIB}/mercurial/revlogutils/constants.pyo | 923 | ${PYSITELIB}/mercurial/revlogutils/constants.pyo | |
921 | ${PYSITELIB}/mercurial/revlogutils/deltas.py | 924 | ${PYSITELIB}/mercurial/revlogutils/deltas.py | |
922 | ${PYSITELIB}/mercurial/revlogutils/deltas.pyc | 925 | ${PYSITELIB}/mercurial/revlogutils/deltas.pyc | |
923 | ${PYSITELIB}/mercurial/revlogutils/deltas.pyo | 926 | ${PYSITELIB}/mercurial/revlogutils/deltas.pyo | |
924 | ${PYSITELIB}/mercurial/revlogutils/flagutil.py | 927 | ${PYSITELIB}/mercurial/revlogutils/flagutil.py | |
925 | ${PYSITELIB}/mercurial/revlogutils/flagutil.pyc | 928 | ${PYSITELIB}/mercurial/revlogutils/flagutil.pyc | |
926 | ${PYSITELIB}/mercurial/revlogutils/flagutil.pyo | 929 | ${PYSITELIB}/mercurial/revlogutils/flagutil.pyo | |
927 | ${PYSITELIB}/mercurial/revlogutils/nodemap.py | 930 | ${PYSITELIB}/mercurial/revlogutils/nodemap.py | |
928 | ${PYSITELIB}/mercurial/revlogutils/nodemap.pyc | 931 | ${PYSITELIB}/mercurial/revlogutils/nodemap.pyc | |
929 | ${PYSITELIB}/mercurial/revlogutils/nodemap.pyo | 932 | ${PYSITELIB}/mercurial/revlogutils/nodemap.pyo | |
930 | ${PYSITELIB}/mercurial/revlogutils/sidedata.py | 933 | ${PYSITELIB}/mercurial/revlogutils/sidedata.py | |
@@ -1379,26 +1382,29 @@ ${PYSITELIB}/mercurial/utils/procutil.py | @@ -1379,26 +1382,29 @@ ${PYSITELIB}/mercurial/utils/procutil.py | |||
1379 | ${PYSITELIB}/mercurial/utils/procutil.pyo | 1382 | ${PYSITELIB}/mercurial/utils/procutil.pyo | |
1380 | ${PYSITELIB}/mercurial/utils/repoviewutil.py | 1383 | ${PYSITELIB}/mercurial/utils/repoviewutil.py | |
1381 | ${PYSITELIB}/mercurial/utils/repoviewutil.pyc | 1384 | ${PYSITELIB}/mercurial/utils/repoviewutil.pyc | |
1382 | ${PYSITELIB}/mercurial/utils/repoviewutil.pyo | 1385 | ${PYSITELIB}/mercurial/utils/repoviewutil.pyo | |
1383 | ${PYSITELIB}/mercurial/utils/resourceutil.py | 1386 | ${PYSITELIB}/mercurial/utils/resourceutil.py | |
1384 | ${PYSITELIB}/mercurial/utils/resourceutil.pyc | 1387 | ${PYSITELIB}/mercurial/utils/resourceutil.pyc | |
1385 | ${PYSITELIB}/mercurial/utils/resourceutil.pyo | 1388 | ${PYSITELIB}/mercurial/utils/resourceutil.pyo | |
1386 | ${PYSITELIB}/mercurial/utils/storageutil.py | 1389 | ${PYSITELIB}/mercurial/utils/storageutil.py | |
1387 | ${PYSITELIB}/mercurial/utils/storageutil.pyc | 1390 | ${PYSITELIB}/mercurial/utils/storageutil.pyc | |
1388 | ${PYSITELIB}/mercurial/utils/storageutil.pyo | 1391 | ${PYSITELIB}/mercurial/utils/storageutil.pyo | |
1389 | ${PYSITELIB}/mercurial/utils/stringutil.py | 1392 | ${PYSITELIB}/mercurial/utils/stringutil.py | |
1390 | ${PYSITELIB}/mercurial/utils/stringutil.pyc | 1393 | ${PYSITELIB}/mercurial/utils/stringutil.pyc | |
1391 | ${PYSITELIB}/mercurial/utils/stringutil.pyo | 1394 | ${PYSITELIB}/mercurial/utils/stringutil.pyo | |
1395 | ${PYSITELIB}/mercurial/utils/urlutil.py | |||
1396 | ${PYSITELIB}/mercurial/utils/urlutil.pyc | |||
1397 | ${PYSITELIB}/mercurial/utils/urlutil.pyo | |||
1392 | ${PYSITELIB}/mercurial/verify.py | 1398 | ${PYSITELIB}/mercurial/verify.py | |
1393 | ${PYSITELIB}/mercurial/verify.pyc | 1399 | ${PYSITELIB}/mercurial/verify.pyc | |
1394 | ${PYSITELIB}/mercurial/verify.pyo | 1400 | ${PYSITELIB}/mercurial/verify.pyo | |
1395 | ${PYSITELIB}/mercurial/vfs.py | 1401 | ${PYSITELIB}/mercurial/vfs.py | |
1396 | ${PYSITELIB}/mercurial/vfs.pyc | 1402 | ${PYSITELIB}/mercurial/vfs.pyc | |
1397 | ${PYSITELIB}/mercurial/vfs.pyo | 1403 | ${PYSITELIB}/mercurial/vfs.pyo | |
1398 | ${PYSITELIB}/mercurial/win32.py | 1404 | ${PYSITELIB}/mercurial/win32.py | |
1399 | ${PYSITELIB}/mercurial/win32.pyc | 1405 | ${PYSITELIB}/mercurial/win32.pyc | |
1400 | ${PYSITELIB}/mercurial/win32.pyo | 1406 | ${PYSITELIB}/mercurial/win32.pyo | |
1401 | ${PYSITELIB}/mercurial/windows.py | 1407 | ${PYSITELIB}/mercurial/windows.py | |
1402 | ${PYSITELIB}/mercurial/windows.pyc | 1408 | ${PYSITELIB}/mercurial/windows.pyc | |
1403 | ${PYSITELIB}/mercurial/windows.pyo | 1409 | ${PYSITELIB}/mercurial/windows.pyo | |
1404 | ${PYSITELIB}/mercurial/wireprotoframing.py | 1410 | ${PYSITELIB}/mercurial/wireprotoframing.py |
@@ -1,11 +1,7 @@ | @@ -1,11 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.101 2021/04/11 23:07:03 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.102 2021/05/20 09:08:27 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178 | 3 | SHA1 (mercurial-5.8.tar.gz) = 7ce13257550f9d22d483b42420ecf84b1b9ac3f4 | |
4 | RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df | 4 | RMD160 (mercurial-5.8.tar.gz) = fb6b7aaab30c4d82b0a04df51e5899d4acb3e4fe | |
5 | SHA512 (mercurial-5.7.1.tar.gz) = d887e2525f49e6b5bbf0f898b96bf9398b69f6b379c27090606469ff716b02989a346447cb37e62ab31a93ed58013ace17ec26e05f63fce225d8d6ca6214f966 | 5 | SHA512 (mercurial-5.8.tar.gz) = 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979 | |
6 | Size (mercurial-5.7.1.tar.gz) = 7900727 bytes | 6 | Size (mercurial-5.8.tar.gz) = 7985326 bytes | |
7 | SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9 | 7 | SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9 | |
8 | SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f | |||
9 | SHA1 (patch-tests_test-convert-cvs.t) = 36423cbc58f5fea71f37e3a846fb2144924f6a45 | |||
10 | SHA1 (patch-tests_test-merge-tools.t) = 4d5386e8c3caebc683f73fb0edd26d7c93952c79 | |||
11 | SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5 |
@@ -1,3 +1,3 @@ | @@ -1,3 +1,3 @@ | |||
1 | # $NetBSD: version.mk,v 1.22 2021/03/17 11:23:52 wiz Exp $ | 1 | # $NetBSD: version.mk,v 1.23 2021/05/20 09:08:27 wiz Exp $ | |
2 | 2 | |||
3 | VERSION= 5.7.1 | 3 | VERSION= 5.8 |