[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 5.8.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 5.8.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 20 May 2021 10:30:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0573167e9192
branches:  trunk
changeset: 452915:0573167e9192
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 20 09:08:27 2021 +0000

description:
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.

diffstat:

 devel/py-mercurial/Makefile                                                   |  17 ++---
 devel/py-mercurial/PLIST                                                      |   8 ++-
 devel/py-mercurial/distinfo                                                   |  14 +--
 devel/py-mercurial/patches/patch-rust_hg-core_src_lib.rs                      |  21 ------
 devel/py-mercurial/patches/patch-tests_test-convert-cvs.t                     |  16 -----
 devel/py-mercurial/patches/patch-tests_test-merge-tools.t                     |  25 -------
 devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t |  32 ----------
 devel/py-mercurial/version.mk                                                 |   4 +-
 8 files changed, 21 insertions(+), 116 deletions(-)

diffs (201 lines):

diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile       Thu May 20 08:22:45 2021 +0000
+++ b/devel/py-mercurial/Makefile       Thu May 20 09:08:27 2021 +0000
@@ -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 @@
 .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}
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/PLIST
--- a/devel/py-mercurial/PLIST  Thu May 20 08:22:45 2021 +0000
+++ b/devel/py-mercurial/PLIST  Thu May 20 09:08:27 2021 +0000
@@ -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/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/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
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Thu May 20 08:22:45 2021 +0000
+++ b/devel/py-mercurial/distinfo       Thu May 20 09:08:27 2021 +0000
@@ -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
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/patches/patch-rust_hg-core_src_lib.rs
--- a/devel/py-mercurial/patches/patch-rust_hg-core_src_lib.rs  Thu May 20 08:22:45 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-rust_hg-core_src_lib.rs,v 1.1 2020/08/05 06:24:32 wiz Exp $
-
-Allow building rust extension on non-Linux.
-
---- rust/hg-core/src/lib.rs.orig       2020-08-03 17:43:51.000000000 +0000
-+++ rust/hg-core/src/lib.rs
-@@ -26,14 +26,6 @@ pub use revlog::*;
- pub mod operations;
- pub mod utils;
- 
--// Remove this to see (potential) non-artificial compile failures. MacOS
--// *should* compile, but fail to compile tests for example as of 2020-03-06
--#[cfg(not(target_os = "linux"))]
--compile_error!(
--    "`hg-core` has only been tested on Linux and will most \
--     likely not behave correctly on other platforms."
--);
--
- use crate::utils::hg_path::{HgPathBuf, HgPathError};
- pub use filepatterns::{
-     parse_pattern_syntax, read_pattern_file, IgnorePattern,
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/patches/patch-tests_test-convert-cvs.t
--- a/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t Thu May 20 08:22:45 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-tests_test-convert-cvs.t,v 1.3 2021/04/11 22:55:42 wiz Exp $
-
-Fix python interpreter.
-https://bz.mercurial-scm.org/show_bug.cgi?id=6480
-
---- tests/test-convert-cvs.t.orig      2021-03-09 05:48:58.000000000 +0000
-+++ tests/test-convert-cvs.t
-@@ -521,7 +521,7 @@ Commit messages of version 1.2 - 1.4 use
- |cp932     |\x82\xa0      |  x      x     o    |
- 
-   $ mkdir -p cvsrepo/transcoding
--  $ python <<EOF
-+  $ $PYTHON <<EOF
-   > fp = open('cvsrepo/transcoding/file,v', 'wb')
-   > fp.write((b'''
-   > head      1.4;
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/patches/patch-tests_test-merge-tools.t
--- a/devel/py-mercurial/patches/patch-tests_test-merge-tools.t Thu May 20 08:22:45 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-tests_test-merge-tools.t,v 1.3 2021/04/11 23:07:03 wiz Exp $
-
-Fix python interpreter.
-https://bz.mercurial-scm.org/show_bug.cgi?id=6480
-
---- tests/test-merge-tools.t.orig      2021-03-09 05:48:58.000000000 +0000
-+++ tests/test-merge-tools.t
-@@ -1921,7 +1921,7 @@ Verify naming of temporary files and tha
- Binary files capability checking
- 
-   $ hg update -q -C 0
--  $ python <<EOF
-+  $ $PYTHON <<EOF
-   > with open('b', 'wb') as fp:
-   >     fp.write(b'\x00\x01\x02\x03')
-   > EOF
-@@ -1929,7 +1929,7 @@ Binary files capability checking
-   $ hg commit -qm "add binary file (#1)"
- 
-   $ hg update -q -C 0
--  $ python <<EOF
-+  $ $PYTHON <<EOF
-   > with open('b', 'wb') as fp:
-   >     fp.write(b'\x03\x02\x01\x00')
-   > EOF
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t
--- a/devel/py-mercurial/patches/patch-tests_test-transaction-rollback-on-sigpipe.t     Thu May 20 08:22:45 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-tests_test-transaction-rollback-on-sigpipe.t,v 1.1 2020/11/09 14:42:46 wiz Exp $
-
-https://bz.mercurial-scm.org/show_bug.cgi?id=6429
-
---- tests/test-transaction-rollback-on-sigpipe.t.orig  2020-11-02 19:26:18.000000000 +0000
-+++ tests/test-transaction-rollback-on-sigpipe.t
-@@ -22,14 +22,14 @@ disconnecting.
- 
-   $ killable_pipe=`pwd`/killable_pipe.sh
-   $ script $killable_pipe <<EOF
--  > #!/bin/bash
-+  > #!/usr/bin/env bash
-   > echo \$\$ >> $pidfile
-   > exec cat
-   > EOF
- 
-   $ remotecmd=`pwd`/remotecmd.sh
-   $ script $remotecmd <<EOF
--  > #!/bin/bash
-+  > #!/usr/bin/env bash
-   > hg "\$@" 1> >($killable_pipe) 2> >($killable_pipe >&2)
-   > EOF
- 
-@@ -38,7 +38,7 @@ disconnecting. Then exit nonzero, to for
- 
-   $ hook_script=`pwd`/pretxnchangegroup.sh
-   $ script $hook_script <<EOF
--  > #!/bin/bash
-+  > #!/usr/bin/env bash
-   > for pid in \$(cat $pidfile) ; do
-   >   kill \$pid
-   >   while kill -0 \$pid 2>/dev/null ; do
diff -r d415e18c416f -r 0573167e9192 devel/py-mercurial/version.mk
--- a/devel/py-mercurial/version.mk     Thu May 20 08:22:45 2021 +0000
+++ b/devel/py-mercurial/version.mk     Thu May 20 09:08:27 2021 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/libidn2 to 2.3.1
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated chat/matrix-synapse to 1.34.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/libidn2 to 2.3.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated chat/matrix-synapse to 1.34.0
Indexes:
Home | Main Index | Thread Index | Old Index