pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 6.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ae31c934b8c4
branches: trunk
changeset: 770253:ae31c934b8c4
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Nov 28 10:36:14 2021 +0000
description:
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
diffstat:
devel/py-mercurial/Makefile | 12 ++--
devel/py-mercurial/PLIST | 9 +++-
devel/py-mercurial/distinfo | 11 +--
devel/py-mercurial/patches/patch-tests_test-censor.t | 25 ----------
devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t | 16 ------
devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t | 19 -------
devel/py-mercurial/version.mk | 4 +-
7 files changed, 19 insertions(+), 77 deletions(-)
diffs (163 lines):
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile Sun Nov 28 10:17:55 2021 +0000
+++ b/devel/py-mercurial/Makefile Sun Nov 28 10:36:14 2021 +0000
@@ -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}-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 @@
.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}
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/PLIST
--- a/devel/py-mercurial/PLIST Sun Nov 28 10:17:55 2021 +0000
+++ b/devel/py-mercurial/PLIST Sun Nov 28 10:36:14 2021 +0000
@@ -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/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/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
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo Sun Nov 28 10:17:55 2021 +0000
+++ b/devel/py-mercurial/distinfo Sun Nov 28 10:36:14 2021 +0000
@@ -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
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/patches/patch-tests_test-censor.t
--- a/devel/py-mercurial/patches/patch-tests_test-censor.t Sun Nov 28 10:17:55 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-tests_test-censor.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
-
-Fix test.
-https://bz.mercurial-scm.org/show_bug.cgi?id=6585
-
---- tests/test-censor.t.orig 2021-10-05 15:47:21.000000000 +0000
-+++ tests/test-censor.t
-@@ -552,14 +552,14 @@ Make sure the last revision is a delta a
- Censor the file
-
- $ hg cat -r $B1 target | wc -l
-- 50002 (re)
-+ *50002 (re)
- $ hg censor -r $B1 target
- $ hg cat -r $B1 target | wc -l
-- 0 (re)
-+ *0 (re)
-
- Check the children is fine
-
- $ hg cat -r $B2 target | wc -l
-- 50003 (re)
-+ *50003 (re)
-
- #endif
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t
--- a/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t Sun Nov 28 10:17:55 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-tests_test-clone-uncompressed.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
-
-Fix test.
-https://bz.mercurial-scm.org/show_bug.cgi?id=6591
-
---- tests/test-clone-uncompressed.t.orig 2021-10-05 15:47:21.000000000 +0000
-+++ tests/test-clone-uncompressed.t
-@@ -96,7 +96,7 @@ Name with special characters
-
- name causing issue6581
-
-- $ mkdir --parents container/isam-build-centos7/
-+ $ mkdir -p container/isam-build-centos7/
- $ touch container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
-
- Add all that
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t
--- a/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t Sun Nov 28 10:17:55 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-tests_test-persistent-nodemap.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
-
-Fix test failure
-https://bz.mercurial-scm.org/show_bug.cgi?id=6523
-
---- tests/test-persistent-nodemap.t.orig 2021-10-05 15:47:21.000000000 +0000
-+++ tests/test-persistent-nodemap.t
-@@ -1028,9 +1028,10 @@ truncate the file
- $ datafilepath=`ls corruption-test-repo/.hg/store/00changelog*.nd`
- $ f -s $datafilepath
- corruption-test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
-- $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp status=noxfer
-+ $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp
- 10+0 records in
- 10+0 records out
-+ * bytes transferred in * (glob)
- $ mv $datafilepath-tmp $datafilepath
- $ f -s $datafilepath
- corruption-test-repo/.hg/store/00changelog-*.nd: size=10000 (glob)
diff -r 55fee60cc054 -r ae31c934b8c4 devel/py-mercurial/version.mk
--- a/devel/py-mercurial/version.mk Sun Nov 28 10:17:55 2021 +0000
+++ b/devel/py-mercurial/version.mk Sun Nov 28 10:36:14 2021 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index