CVS commit: pkgsrc/devel/py-mercurial

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/py-mercurial
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 17 Jul 2022 09:51:33 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 17 09:51:33 UTC 2022

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

Log Message:
py-mercurial: update to 6.2.

This is the first release to support Python 3.6+ only

New Features

    Introduce a way to auto-upgrade a repo for certain requirements (see hg help config.format)
    filemerge: add support for partial conflict resolution by external tool
    contrib: add a partial-merge tool for sorted lists (such as Python imports)
    revlog: reorder p1 and p2 when p1 is null and p2 is not while respecting issue6528
    rhg: add support for ignoring all extensions
    completion: install completers to conventional locations
    revert: ask user to confirm before tracking new file when interactive
    Rust implementation now uses the new dirstate API
    sslutil: be less strict about which ciphers are allowed when using --insecure
    sslutil: support TLSV1_ALERT_PROTOCOL_VERSION reason code
    absorb: make --edit-lines imply --apply-changes
    diff: add help text to highlight the ability to do merge diffs
    censor: make rhg fall back to python when encountering a censored node
    clone: use better names for temp files
    debuglock: make the command more useful in non-interactive mode
    debugdeltachain: distinct between snapshot and other diffs
    debugindex: rename to debugindex debug-revlog-index
    Make debug-revlog-index give out more information
    sparse: use the rust code even when sparse is present

Bug Fixes

    Python 3 bugfixes
    Windows bugfixes
    templates: make firstline filter not keep '\v', '\f' and similar
    rhg: sort unsupported extensions in error message
    Improve performance of all functions that extract the first line of a text
    crecord: avoid duplicating lines when reverting noeol->eol change
    Some config.path options are now discoverable via config
    mail: don't complain about a multi-word email.method
    bundlespec: do not overwrite bundlespec value with the config one
    bundlespec: do not check for - in the params portion of the bundlespec
    bundlespec: handle the presence of obsmarker part
    sparse: start moving away from the global variable for detection of usage
    rust-changelog: don't skip empty lines when iterating over changeset lines
    narrow: support debugupgraderepo
    bundle: quick fix to ludicrous performance penalty
    followlines: don't put Unicode directly into the .js file (issue6559)
    manifest: improve error message in case for tree manifest
    revlog: use %d to format int instead of %lu (issue6565)
    revlog: use appropriate format char for int ("i" instead of I")
    worker: stop relying on garbage collection to release memoryview
    worker: implement _blockingreader.readinto() (issue6444)
    worker: avoid potential partial write of pickled data

Backwards Compatibility Changes

    Removed Python 2 support: this includes a lot of cleanup in our codebase, automation, testing, etc.
    debugindex: rename to debugindex debug-revlog-index

Miscellaneous

    Fix typos and add missing items from documentation
    dirstate-tree: optimize HashMap lookups with raw_entry_mut
    Rust dependencies have been upgraded
    revlog: rank computation is done by Rust when available
    Improve discovery test tooling
    Audit the number of queries done in discovery
    Improved .hgignore of the mercurial-devel repository itself
    Improve test coverage of dirstate-v2
    rust-requirements: allow loading repos with bookmarksinstore requirement
    Various Rust refactorings to help with revlog management
    Improve debugability of Rust structs
    Improve unit testing of the Rust dirstatemap
    Improve robustness of the Rust dirstatemap to corruption
    Improve changelog-v2 upgrade system


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.119 -r1.120 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-mercurial/options.mk
cvs rdiff -u -r1.37 -r1.38 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.72 pkgsrc/devel/py-mercurial/Makefile:1.73
--- pkgsrc/devel/py-mercurial/Makefile:1.72     Sun Jul  3 17:52:41 2022
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Jul 17 09:51:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/07/03 17:52:41 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2022/07/17 09:51:33 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -23,35 +23,32 @@ USE_TOOLS+= gmake msgfmt
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=    share/doc/mercurial
 
-PYTHON_SELF_CONFLICT=  yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_SELF_CONFLICT=          yes
 
 .include "version.mk"
 .include "options.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 6.1.4
+# Known test failures as of 6.2
 # 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-https.t
-# test-patchbomb-tls.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6645
-# test-paths.t
-# test-hgrc.t
-# test-parseindex.t
-# test-patchbomb-tls.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6646
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6726
 # test-removeemptydirs.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6587
-# test-revlog.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6716
 # test-status-tracked-key.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6662
+# test-revlog.t
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6716
+# test-patchbomb-tls.t:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
 # test-demandimport.py:
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6680
 #
-# Ran 885 tests, 82 skipped, 11 failed.
+# Ran 889 tests, 83 skipped, 8 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.41 pkgsrc/devel/py-mercurial/PLIST:1.42
--- pkgsrc/devel/py-mercurial/PLIST:1.41        Tue Mar  8 11:05:09 2022
+++ pkgsrc/devel/py-mercurial/PLIST     Sun Jul 17 09:51:33 2022
@@ -1,11 +1,8 @@
-@comment $NetBSD: PLIST,v 1.41 2022/03/08 11:05:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.42 2022/07/17 09:51:33 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
 ${PYSITELIB}/hgdemandimport/__init__.pyo
-${PYSITELIB}/hgdemandimport/demandimportpy2.py
-${PYSITELIB}/hgdemandimport/demandimportpy2.pyc
-${PYSITELIB}/hgdemandimport/demandimportpy2.pyo
 ${PYSITELIB}/hgdemandimport/demandimportpy3.py
 ${PYSITELIB}/hgdemandimport/demandimportpy3.pyc
 ${PYSITELIB}/hgdemandimport/demandimportpy3.pyo
@@ -172,24 +169,24 @@ ${PYSITELIB}/hgext/fsmonitor/state.pyo
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.py
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyc
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/__init__.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/__init__.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/__init__.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/dirstate.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/dirstate.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/dirstate.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitlog.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitlog.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitlog.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitutil.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitutil.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/gitutil.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/index.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/index.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/index.pyo
-${PLIST.py3x}${PYSITELIB}/hgext/git/manifest.py
-${PLIST.py3x}${PYSITELIB}/hgext/git/manifest.pyc
-${PLIST.py3x}${PYSITELIB}/hgext/git/manifest.pyo
+${PYSITELIB}/hgext/git/__init__.py
+${PYSITELIB}/hgext/git/__init__.pyc
+${PYSITELIB}/hgext/git/__init__.pyo
+${PYSITELIB}/hgext/git/dirstate.py
+${PYSITELIB}/hgext/git/dirstate.pyc
+${PYSITELIB}/hgext/git/dirstate.pyo
+${PYSITELIB}/hgext/git/gitlog.py
+${PYSITELIB}/hgext/git/gitlog.pyc
+${PYSITELIB}/hgext/git/gitlog.pyo
+${PYSITELIB}/hgext/git/gitutil.py
+${PYSITELIB}/hgext/git/gitutil.pyc
+${PYSITELIB}/hgext/git/gitutil.pyo
+${PYSITELIB}/hgext/git/index.py
+${PYSITELIB}/hgext/git/index.pyc
+${PYSITELIB}/hgext/git/index.pyo
+${PYSITELIB}/hgext/git/manifest.py
+${PYSITELIB}/hgext/git/manifest.pyc
+${PYSITELIB}/hgext/git/manifest.pyo
 ${PYSITELIB}/hgext/githelp.py
 ${PYSITELIB}/hgext/githelp.pyc
 ${PYSITELIB}/hgext/githelp.pyo
@@ -463,11 +460,10 @@ ${PYSITELIB}/hgext/zeroconf/__init__.pyo
 ${PYSITELIB}/hgext3rd/__init__.py
 ${PYSITELIB}/hgext3rd/__init__.pyc
 ${PYSITELIB}/hgext3rd/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}
-${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.py3x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/mercurial/__init__.py
 ${PYSITELIB}/mercurial/__init__.pyc
 ${PYSITELIB}/mercurial/__init__.pyo
@@ -709,8 +705,8 @@ ${PYSITELIB}/mercurial/helptext/merge-to
 ${PYSITELIB}/mercurial/helptext/pager.txt
 ${PYSITELIB}/mercurial/helptext/patterns.txt
 ${PYSITELIB}/mercurial/helptext/phases.txt
-${PYSITELIB}/mercurial/helptext/rust.txt
 ${PYSITELIB}/mercurial/helptext/revisions.txt
+${PYSITELIB}/mercurial/helptext/rust.txt
 ${PYSITELIB}/mercurial/helptext/scripting.txt
 ${PYSITELIB}/mercurial/helptext/subrepos.txt
 ${PYSITELIB}/mercurial/helptext/templates.txt
@@ -940,6 +936,9 @@ ${PYSITELIB}/mercurial/revlogutils/concu
 ${PYSITELIB}/mercurial/revlogutils/constants.py
 ${PYSITELIB}/mercurial/revlogutils/constants.pyc
 ${PYSITELIB}/mercurial/revlogutils/constants.pyo
+${PYSITELIB}/mercurial/revlogutils/debug.py
+${PYSITELIB}/mercurial/revlogutils/debug.pyc
+${PYSITELIB}/mercurial/revlogutils/debug.pyo
 ${PYSITELIB}/mercurial/revlogutils/deltas.py
 ${PYSITELIB}/mercurial/revlogutils/deltas.pyc
 ${PYSITELIB}/mercurial/revlogutils/deltas.pyo
@@ -973,7 +972,6 @@ ${PYSITELIB}/mercurial/revsetlang.pyo
 ${PYSITELIB}/mercurial/rewriteutil.py
 ${PYSITELIB}/mercurial/rewriteutil.pyc
 ${PYSITELIB}/mercurial/rewriteutil.pyo
-${PLIST.rust}${PYSITELIB}/mercurial/rustext.so
 ${PYSITELIB}/mercurial/scmposix.py
 ${PYSITELIB}/mercurial/scmposix.pyc
 ${PYSITELIB}/mercurial/scmposix.pyo
@@ -1292,24 +1290,6 @@ ${PYSITELIB}/mercurial/thirdparty/attr/f
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.py
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.pyc
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.pyo
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/__init__.py
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/__init__.py
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/_base.py
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/_base.pyc
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/_base.pyo
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/process.py
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/process.pyc
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/process.pyo
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/thread.py
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/thread.pyc
-${PLIST.py2x}${PYSITELIB}/mercurial/thirdparty/concurrent/futures/thread.pyo
-${PYSITELIB}/mercurial/thirdparty/selectors2.py
-${PYSITELIB}/mercurial/thirdparty/selectors2.pyc
-${PYSITELIB}/mercurial/thirdparty/selectors2.pyo
 ${PYSITELIB}/mercurial/thirdparty/sha1dc.so
 ${PYSITELIB}/mercurial/thirdparty/zope/__init__.py
 ${PYSITELIB}/mercurial/thirdparty/zope/__init__.pyc
@@ -1378,6 +1358,9 @@ ${PYSITELIB}/mercurial/upgrade_utils/__i
 ${PYSITELIB}/mercurial/upgrade_utils/actions.py
 ${PYSITELIB}/mercurial/upgrade_utils/actions.pyc
 ${PYSITELIB}/mercurial/upgrade_utils/actions.pyo
+${PYSITELIB}/mercurial/upgrade_utils/auto_upgrade.py
+${PYSITELIB}/mercurial/upgrade_utils/auto_upgrade.pyc
+${PYSITELIB}/mercurial/upgrade_utils/auto_upgrade.pyo
 ${PYSITELIB}/mercurial/upgrade_utils/engine.py
 ${PYSITELIB}/mercurial/upgrade_utils/engine.pyc
 ${PYSITELIB}/mercurial/upgrade_utils/engine.pyo
@@ -1460,4 +1443,6 @@ ${PYSITELIB}/mercurial/zstd.so
 man/man1/hg.1
 man/man5/hgignore.5
 man/man5/hgrc.5
+share/bash-completion/completions/hg
 share/doc/mercurial/README.rst
+share/zsh/site-functions/_hg

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.119 pkgsrc/devel/py-mercurial/distinfo:1.120
--- pkgsrc/devel/py-mercurial/distinfo:1.119    Sun Jul  3 17:52:41 2022
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Jul 17 09:51:33 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.119 2022/07/03 17:52:41 wiz Exp $
+$NetBSD: distinfo,v 1.120 2022/07/17 09:51:33 wiz Exp $
 
-BLAKE2s (mercurial-6.1.4.tar.gz) = 0809f4c2d32ec30d2fc1fd7f4b2d0cb68bc12dfa262f7fdf6689ccac8419a08c
-SHA512 (mercurial-6.1.4.tar.gz) = b43221c078efd4978fd47414d9442f423a97660e1f4c10d704a8d3403051778d2a25a0b4be6315d0a2126d01c14910ccbe9a5be6242b561a2bea0c522f54b731
-Size (mercurial-6.1.4.tar.gz) = 8070694 bytes
+BLAKE2s (mercurial-6.2.tar.gz) = f9350c968d2b73a46a2228bf1cb59f674c451c1d7018b0e5eb5217793cda0f83
+SHA512 (mercurial-6.2.tar.gz) = 0c988a558e60ba456196420dcf720558f6ce63fcc42bf43a8f6af16289b5f2a81738a4c038a620040394215e3e57ba254ee56fa072962f7bd0b3b191d8334fef
+Size (mercurial-6.2.tar.gz) = 8053713 bytes

Index: pkgsrc/devel/py-mercurial/options.mk
diff -u pkgsrc/devel/py-mercurial/options.mk:1.5 pkgsrc/devel/py-mercurial/options.mk:1.6
--- pkgsrc/devel/py-mercurial/options.mk:1.5    Sun Dec  6 11:37:33 2020
+++ pkgsrc/devel/py-mercurial/options.mk        Sun Jul 17 09:51:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/12/06 11:37:33 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2022/07/17 09:51:33 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mercurial
 # 5.6.1 needs some "*-pre" crates that are not available
@@ -8,10 +8,10 @@ PKG_SUGGESTED_OPTIONS=                #rust
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   rust
+#PLIST_VARS+=  rust
 
 .if !empty(PKG_OPTIONS:Mrust)
-PLIST.rust=    yes
+#PLIST.rust=   yes
 PYSETUPARGS+=  --rust
 # for python3-sys
 MAKE_ENV+=     PYTHON_SYS_EXECUTABLE=${PYTHONBIN}

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.37 pkgsrc/devel/py-mercurial/version.mk:1.38
--- pkgsrc/devel/py-mercurial/version.mk:1.37   Sun Jul  3 17:52:41 2022
+++ pkgsrc/devel/py-mercurial/version.mk        Sun Jul 17 09:51:33 2022
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.37 2022/07/03 17:52:41 wiz Exp $
+# $NetBSD: version.mk,v 1.38 2022/07/17 09:51:33 wiz Exp $
 
-VERSION=       6.1.4
+VERSION=       6.2

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index