CVS commit: pkgsrc/devel/py-mercurial

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May 20 09:08:27 UTC 2021

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST distinfo version.mk
Removed Files:
        pkgsrc/devel/py-mercurial/patches: patch-rust_hg-core_src_lib.rs
            patch-tests_test-convert-cvs.t patch-tests_test-merge-tools.t
            patch-tests_test-transaction-rollback-on-sigpipe.t

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/py-mercurial/patches/patch-rust_hg-core_src_lib.rs \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-tools.t

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.53 pkgsrc/devel/py-mercurial/Makefile:1.54
--- pkgsrc/devel/py-mercurial/Makefile:1.53     Sun Apr 11 23:07:03 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Thu May 20 09:08:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2021/04/11 23:07:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2021/05/20 09:08:27 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -30,17 +30,14 @@ INSTALLATION_DIRS+= share/doc/mercurial
 .include "version.mk"
 .include "options.mk"
 
-# Known test failures as of 5.7
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6429
 USE_TOOLS+=            bash:test
-# Two tests use "python":
-# test-convert-cvs.t
-# test-merge-tools.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6480
-# test-archive.t:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6499
+# Known test failures as of 5.8
+# test-persistent-nodemap.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6523
+# test-reject_new_heads.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6524
 #
-# Ran 868 tests, 80 skipped, 1 failed.
+# Ran 878 tests, 81 skipped, 2 failed.
 
 TEST_TARGET=           tests
 TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.33 pkgsrc/devel/py-mercurial/PLIST:1.34
--- pkgsrc/devel/py-mercurial/PLIST:1.33        Sat Feb  6 08:29:18 2021
+++ pkgsrc/devel/py-mercurial/PLIST     Thu May 20 09:08:27 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2021/02/06 08:29:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2021/05/20 09:08:27 wiz Exp $
 bin/hg
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/hgdemandimport/__init__.py
@@ -915,6 +915,9 @@ ${PYSITELIB}/mercurial/revlog.pyo
 ${PYSITELIB}/mercurial/revlogutils/__init__.py
 ${PYSITELIB}/mercurial/revlogutils/__init__.pyc
 ${PYSITELIB}/mercurial/revlogutils/__init__.pyo
+${PYSITELIB}/mercurial/revlogutils/concurrency_checker.py
+${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyc
+${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyo
 ${PYSITELIB}/mercurial/revlogutils/constants.py
 ${PYSITELIB}/mercurial/revlogutils/constants.pyc
 ${PYSITELIB}/mercurial/revlogutils/constants.pyo
@@ -1389,6 +1392,9 @@ ${PYSITELIB}/mercurial/utils/storageutil
 ${PYSITELIB}/mercurial/utils/stringutil.py
 ${PYSITELIB}/mercurial/utils/stringutil.pyc
 ${PYSITELIB}/mercurial/utils/stringutil.pyo
+${PYSITELIB}/mercurial/utils/urlutil.py
+${PYSITELIB}/mercurial/utils/urlutil.pyc
+${PYSITELIB}/mercurial/utils/urlutil.pyo
 ${PYSITELIB}/mercurial/verify.py
 ${PYSITELIB}/mercurial/verify.pyc
 ${PYSITELIB}/mercurial/verify.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.101 pkgsrc/devel/py-mercurial/distinfo:1.102
--- pkgsrc/devel/py-mercurial/distinfo:1.101    Sun Apr 11 23:07:03 2021
+++ pkgsrc/devel/py-mercurial/distinfo  Thu May 20 09:08:27 2021
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.101 2021/04/11 23:07:03 wiz Exp $
+$NetBSD: distinfo,v 1.102 2021/05/20 09:08:27 wiz Exp $
 
-SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178
-RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df
-SHA512 (mercurial-5.7.1.tar.gz) = d887e2525f49e6b5bbf0f898b96bf9398b69f6b379c27090606469ff716b02989a346447cb37e62ab31a93ed58013ace17ec26e05f63fce225d8d6ca6214f966
-Size (mercurial-5.7.1.tar.gz) = 7900727 bytes
+SHA1 (mercurial-5.8.tar.gz) = 7ce13257550f9d22d483b42420ecf84b1b9ac3f4
+RMD160 (mercurial-5.8.tar.gz) = fb6b7aaab30c4d82b0a04df51e5899d4acb3e4fe
+SHA512 (mercurial-5.8.tar.gz) = 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
+Size (mercurial-5.8.tar.gz) = 7985326 bytes
 SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
-SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f
-SHA1 (patch-tests_test-convert-cvs.t) = 36423cbc58f5fea71f37e3a846fb2144924f6a45
-SHA1 (patch-tests_test-merge-tools.t) = 4d5386e8c3caebc683f73fb0edd26d7c93952c79
-SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.22 pkgsrc/devel/py-mercurial/version.mk:1.23
--- pkgsrc/devel/py-mercurial/version.mk:1.22   Wed Mar 17 11:23:52 2021
+++ pkgsrc/devel/py-mercurial/version.mk        Thu May 20 09:08:27 2021
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.22 2021/03/17 11:23:52 wiz Exp $
+# $NetBSD: version.mk,v 1.23 2021/05/20 09:08:27 wiz Exp $
 
-VERSION=       5.7.1
+VERSION=       5.8