CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov 28 10:36:14 UTC 2021

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST distinfo version.mk
Removed Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-censor.t
            patch-tests_test-clone-uncompressed.t
            patch-tests_test-persistent-nodemap.t

Log Message:
py-mercurial: update to 6.0.

== New Features ==
  * `debugrebuildfncache` now has an option to rebuild only the index files
  * a new `bookmarks.mode` path option have been introduced to control the
    bookmark update strategy during exchange with a peer. See `hg help paths` for
    details.
  * a new `bookmarks.mirror` option has been introduced. See `hg help bookmarks`
   for details.
  * more commands support detailed exit codes when config `ui.detailed-exit-codes` is enabled

== Default Format Change ==

== New Experimental Features ==

 * '''Major feature''': version 2 of the dirstate is available (the first version is as old as Mercurial itself). It allows for much faster working copy inspection (status, diff, commit, update, 
etc.) and richer information (symlink and exec info on Windows, etc.). The format has been frozen with room for some future evolution and the current implementations (Python, Python + C, Python + 
Rust or pure Rust) should be compatible with any future change or optimization that the format allows. You can get more information 
[[https://www.mercurial-scm.org/repo/hg/file/tip/mercurial/helptext/internals/dirstate-v2.txt | in the internal documentation]]
 * Added a new `web.full-garbage-collection-rate` to control performance. See
   de2e04fe4897a554b9ef433167f11ea4feb2e09c for more information
 * Added a new `histedit.later-commits-first` option to affect the ordering of commits in `chistedit` to match the order in `hg log -G`. It will affect the text-based version before graduating from 
experimental.

== Bug Fixes ==

 * `hg fix --working-dir` now correctly works when in an uncommitted merge state
 * Unintentional duplicated calls to `hg fix`'s internals were removed, making it potentially much faster
 * `rhg cat` can be called without a revision
 * `rhg cat` can be called with the `.` revision
 * `rhg cat` is more robust than before with regards to edge cases. Some still remain like a tag or bookmark that is ambiguous with a nodeid prefix, only nodeids (prefixed or not) are supported as of 
now.
 * `rhg cat` is even faster
 * `rhg` (Rust fast-path for `hg`) now supports the full config list syntax
 * `rhg` now parses some corner-cases for revsets correctly
 * Fixed an `fsmonitor` on Python 3 during exception handling
 * Lots of Windows fixes
 * Lots of miscellaneous other fixes
 * Removed a CPython-specific compatibility hack to improve support for alternative Python implementations


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.110 -r1.111 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.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.61 pkgsrc/devel/py-mercurial/Makefile:1.62
--- pkgsrc/devel/py-mercurial/Makefile:1.61     Thu Oct 28 13:05:32 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Nov 28 10:36:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2021/10/28 13:05:32 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2021/11/28 10:36:14 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -17,10 +17,6 @@ DEPENDS+=    ${PYPKGPREFIX}-curses-[0-9]*:.
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-# with this dependency, two zip test cases start working
-# https://bz.mercurial-scm.org/show_bug.cgi?id=4483
-# https://bz.mercurial-scm.org/show_bug.cgi?id=4485
-TEST_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
 
 USE_TOOLS+=    gmake msgfmt
 
@@ -31,11 +27,13 @@ INSTALLATION_DIRS+= share/doc/mercurial
 .include "options.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 5.9.3
+# Known test failures as of 6.0
 # test-removeemptydirs.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6587
+# test-fix.t
+# https://phab.mercurial-scm.org/D11816
 #
-# Ran 888 tests, 97 skipped, 1 failed.
+# Ran 898 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.35 pkgsrc/devel/py-mercurial/PLIST:1.36
--- pkgsrc/devel/py-mercurial/PLIST:1.35        Mon Aug 30 17:55:25 2021
+++ pkgsrc/devel/py-mercurial/PLIST     Sun Nov 28 10:36:14 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2021/08/30 17:55:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2021/11/28 10:36:14 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -602,6 +602,12 @@ ${PYSITELIB}/mercurial/dirstateutils/__i
 ${PYSITELIB}/mercurial/dirstateutils/docket.py
 ${PYSITELIB}/mercurial/dirstateutils/docket.pyc
 ${PYSITELIB}/mercurial/dirstateutils/docket.pyo
+${PYSITELIB}/mercurial/dirstateutils/timestamp.py
+${PYSITELIB}/mercurial/dirstateutils/timestamp.pyc
+${PYSITELIB}/mercurial/dirstateutils/timestamp.pyo
+${PYSITELIB}/mercurial/dirstateutils/v2.py
+${PYSITELIB}/mercurial/dirstateutils/v2.pyc
+${PYSITELIB}/mercurial/dirstateutils/v2.pyo
 ${PYSITELIB}/mercurial/discovery.py
 ${PYSITELIB}/mercurial/discovery.pyc
 ${PYSITELIB}/mercurial/discovery.pyo
@@ -689,6 +695,7 @@ ${PYSITELIB}/mercurial/helptext/internal
 ${PYSITELIB}/mercurial/helptext/internals/censor.txt
 ${PYSITELIB}/mercurial/helptext/internals/changegroups.txt
 ${PYSITELIB}/mercurial/helptext/internals/config.txt
+${PYSITELIB}/mercurial/helptext/internals/dirstate-v2.txt
 ${PYSITELIB}/mercurial/helptext/internals/extensions.txt
 ${PYSITELIB}/mercurial/helptext/internals/linelog.txt
 ${PYSITELIB}/mercurial/helptext/internals/mergestate.txt

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.110 pkgsrc/devel/py-mercurial/distinfo:1.111
--- pkgsrc/devel/py-mercurial/distinfo:1.110    Thu Oct 28 11:46:42 2021
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Nov 28 10:36:14 2021
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.110 2021/10/28 11:46:42 wiz Exp $
+$NetBSD: distinfo,v 1.111 2021/11/28 10:36:14 wiz Exp $
 
-BLAKE2s (mercurial-5.9.3.tar.gz) = 2dc6fa0be6b975cd39b236b6aed3ba5d2d8bae92573b38474142d297b2366297
-SHA512 (mercurial-5.9.3.tar.gz) = d2a91cf63ca8f7621a2d36af7993c9878a2a36c7c95a027f2ff9d5ec3cdb01b9f86a60108cf3ca674b5b306488f61f749c3d8c5f814d6c90c04941d551d458dd
-Size (mercurial-5.9.3.tar.gz) = 8126023 bytes
-SHA1 (patch-tests_test-censor.t) = ad5fc991072b326965d8e87ef25d08321d480af8
-SHA1 (patch-tests_test-clone-uncompressed.t) = 58355e72b4d0b9cab2efbc16facca288bdbe4cb0
-SHA1 (patch-tests_test-persistent-nodemap.t) = 78b2576efd5154137996c259cb1e91229b820e0e
+BLAKE2s (mercurial-6.0.tar.gz) = 0f607d864974a17c9ad672d74c90d27767dc09b114b2e9e261c2a390ecae739b
+SHA512 (mercurial-6.0.tar.gz) = 342440af75b8e48b75ca604ee4f81298b652413a07f84cb475d9ed3c875a8b69bc22289c2a22d6f07c7bc54fdb1bc25a51a179eb9dcdc299b85fdd0fa4827dad
+Size (mercurial-6.0.tar.gz) = 8137797 bytes

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.28 pkgsrc/devel/py-mercurial/version.mk:1.29
--- pkgsrc/devel/py-mercurial/version.mk:1.28   Thu Oct 28 11:46:42 2021
+++ pkgsrc/devel/py-mercurial/version.mk        Sun Nov 28 10:36:14 2021
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.28 2021/10/28 11:46:42 wiz Exp $
+# $NetBSD: version.mk,v 1.29 2021/11/28 10:36:14 wiz Exp $
 
-VERSION=       5.9.3
+VERSION=       6.0