CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar  8 11:05:10 UTC 2022

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST distinfo version.mk

Log Message:
py-mercurial: update to 6.1.

New Features

    Added a way of specifying required extensions that prevent
    Mercurial from starting if they are not found. See hg help
    config.extensions.

    Merge conflict markers have been made clearer (see backwards
    compatibility below)

    Improve detailed error codes

    Added a hint about mangled whitespace on bad patch

    Explain which order the commits are presented in chistedit

    Introduce a dirstate-tracked-hint feature to help automation
    keep track of changes to tracked files. See hg help
    config.use-dirstate-tracked-hint.

    Shared repositories can be upgraded if the upgrade is specific
    to the share. For now, this only applies to dirstate-v2 and
    dirstate-tracked-hint.

    When using the narrow extension, non-conflicting changes to
    files outside of the narrow specification can now be merged.

    When cloning a repository using stream-clone, the client can
    now control the repository format variants to use as long as
    the stream content does not restrict that variant.

Default Format Change

These changes affect newly created repositories (or new clones)
done with Mercurial 6.1.

    The share-safe format variant is now enabled by default. It
    makes configuration and requirements more consistent across
    repository and their shares. This introduces a behavior change
    as shares from a repository using the new format will also use
    their main repository's configuration. See hg help
    config.format.use-share-safe for details about the feature and
    the available options for auto-upgrading existing shares.

New Experimental Features

    The pure Rust version of Mercurial called rhg added support
    for most common invocations of hg status. See hg help rust.rhg
    for details on how to try it out.

    rhg supports narrow clones and sparse checkouts.

Bug Fixes

    Obsolete revisions are skipped while computing heads. In
    conjunction with the evolve extension >= 10.5.0, this leads to
    massive exchange (push/pull) speedups in repositories with a
    lot of heads and/or obsolete revisions.

    Stream-clones now properly advertise all requirements needed.
    This can result in the stream-clone feature being disabled for
    some clients using < 6.0.2. A small bugfix patch for these
    older client is available if necessary.

    The --no-check and --no-merge flags now properly overwrite the
    behavior from commands.update.check

    rhg's fallback detection is more robust in general in the
    presence of more advanced configs

    rhg's blackbox now supports milliseconds by default and uses
    the same ISO 8601 format as the Python implementation

    Fix rhg crash on non-generaldelta revlogs

    The lfs, largefiles and sparse extensions now correctly take
    the appropriate lock before writing requirements

    The notify extension does not produce errors anymore if a
    revision is not found

    Remove unnecessary and overly strict check for divergence in
    hg fix

    Windows compatibility improvements

    Miscellaneous Python 3 and typing improvements

    Many other small or internal fixes

Backwards Compatibility Changes

    The use of share-safe, means shares (of new repositories) will
    also use their main repository's configuration see the Default
    Format Change section for details.

    The fix to stream-clone requirements advertising means some
    requirements previously (wronly) omitted are now sent. This
    can confuse client using a Mercurial version < 6.0.2. The client
    would consider these requirements unsupported even if it actually
    know them. If you encounter this, either upgrade your client
    or apply the necessary patch.

    The labels passed to merge tools have changed slightly. Merge
    tools can get labels passed to them if you include $labellocal,
    $labelbase, and/or $labelother in the merge-tool.<tool name>.args
    configuration. These labels used to have some space-padding,
    and truncation to fit within 72 columns. Both the padding and
    the truncation has been removed.

    Some of the text in labels passed to merge tools has changed.
    For example, in conflicts while running hg histedit, the labels
    used to be "local", "base", and "histedit". They are now "already
    edited", "parent of current change", and "current change",
    respectively.

    The computation of namedbranch heads now ignores obsolete
    revisions. User of the Changeset Evolution feature may see a
    change in location and numbers of heads of each named branches
    (and topic).

    The remotefilelog extension now requires an appropriate
    excludepattern for subrepositories.

    debugsparse's interface has been reworked to be more flexible.
    Since it's a debug command it is not actually a breaking change,
    but it is worth noting here.

    Temporary files for merges are now all inside a hgmerge directory
    instead of at the root of TMPDIR. The corresponding experimental
    mergetempdirprefix config option has been removed.

Internal API Changes

    The dirstate API received minor modifications.

Miscellaneous

    Removed exchange-v2. It was a prototype that had never been in
    a working state and had been left untouched since 2017.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.114 -r1.115 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.32 -r1.33 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.

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.68 pkgsrc/devel/py-mercurial/Makefile:1.69
--- pkgsrc/devel/py-mercurial/Makefile:1.68     Sun Feb 20 22:06:44 2022
+++ pkgsrc/devel/py-mercurial/Makefile  Tue Mar  8 11:05:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2022/02/20 22:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2022/03/08 11:05:09 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -29,16 +29,11 @@ PYTHON_SELF_CONFLICT=       yes
 .include "options.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 6.0.3
-# test-removeemptydirs.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6587
+# Known test failures as of 6.1
+# test-run-tests.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6661
 # test-http-bad-server.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6643
-# test-wireproto-content-redirects.t
-# test-http-protocol.t
-# test-wireproto-command-capabilities.t
-# test-http-api-httpv2.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6644
 # test-https.t
 # test-patchbomb-tls.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6645
@@ -47,8 +42,12 @@ USE_TOOLS+=          bash:test
 # test-parseindex.t
 # test-patchbomb-tls.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6646
+# test-removeemptydirs.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6587
+# test-status-tracked-key.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6662
 #
-# Ran 899 tests, 81 skipped, 11 failed.
+# Ran 883 tests, 82 skipped, 9 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.40 pkgsrc/devel/py-mercurial/PLIST:1.41
--- pkgsrc/devel/py-mercurial/PLIST:1.40        Sat Jan 22 15:25:59 2022
+++ pkgsrc/devel/py-mercurial/PLIST     Tue Mar  8 11:05:09 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2022/01/22 15:25:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2022/03/08 11:05:09 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -628,9 +628,6 @@ ${PYSITELIB}/mercurial/error.pyo
 ${PYSITELIB}/mercurial/exchange.py
 ${PYSITELIB}/mercurial/exchange.pyc
 ${PYSITELIB}/mercurial/exchange.pyo
-${PYSITELIB}/mercurial/exchangev2.py
-${PYSITELIB}/mercurial/exchangev2.pyc
-${PYSITELIB}/mercurial/exchangev2.pyo
 ${PYSITELIB}/mercurial/extensions.py
 ${PYSITELIB}/mercurial/extensions.pyc
 ${PYSITELIB}/mercurial/extensions.pyo
@@ -1456,12 +1453,6 @@ ${PYSITELIB}/mercurial/wireprotov1peer.p
 ${PYSITELIB}/mercurial/wireprotov1server.py
 ${PYSITELIB}/mercurial/wireprotov1server.pyc
 ${PYSITELIB}/mercurial/wireprotov1server.pyo
-${PYSITELIB}/mercurial/wireprotov2peer.py
-${PYSITELIB}/mercurial/wireprotov2peer.pyc
-${PYSITELIB}/mercurial/wireprotov2peer.pyo
-${PYSITELIB}/mercurial/wireprotov2server.py
-${PYSITELIB}/mercurial/wireprotov2server.pyc
-${PYSITELIB}/mercurial/wireprotov2server.pyo
 ${PYSITELIB}/mercurial/worker.py
 ${PYSITELIB}/mercurial/worker.pyc
 ${PYSITELIB}/mercurial/worker.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.114 pkgsrc/devel/py-mercurial/distinfo:1.115
--- pkgsrc/devel/py-mercurial/distinfo:1.114    Sun Feb 20 22:06:44 2022
+++ pkgsrc/devel/py-mercurial/distinfo  Tue Mar  8 11:05:09 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.114 2022/02/20 22:06:44 wiz Exp $
+$NetBSD: distinfo,v 1.115 2022/03/08 11:05:09 wiz Exp $
 
-BLAKE2s (mercurial-6.0.3.tar.gz) = 2a3cae15e2d44948d19ec19c8fb529e8418b5a41f274edc6849b1de777b81f04
-SHA512 (mercurial-6.0.3.tar.gz) = 46f5262a364ae03515015fc0319e0b4a43a1434672b8c4c8a4ad9297d5c78fbb9d76173e835a87a9718a047c2067204ca8334d39bfa92f565d7c0a75a7b63467
-Size (mercurial-6.0.3.tar.gz) = 8089359 bytes
+BLAKE2s (mercurial-6.1.tar.gz) = 17e4f3b712b46f989a01bb58f9699bd30610328d91e8ee0bc6e9aea7c431994a
+SHA512 (mercurial-6.1.tar.gz) = 489b2c893bcfd243d9825cd78f1d8b6e0eddccdf92d16cbdbdb2ade40150b599a6d5df213e06d50c31489ee6c5203e35f21892b6439d9190757d5a36c6422338
+Size (mercurial-6.1.tar.gz) = 8061104 bytes

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.32 pkgsrc/devel/py-mercurial/version.mk:1.33
--- pkgsrc/devel/py-mercurial/version.mk:1.32   Sun Feb 20 22:06:44 2022
+++ pkgsrc/devel/py-mercurial/version.mk        Tue Mar  8 11:05:09 2022
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.32 2022/02/20 22:06:44 wiz Exp $
+# $NetBSD: version.mk,v 1.33 2022/03/08 11:05:09 wiz Exp $
 
-VERSION=       6.0.3
+VERSION=       6.1