pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/py-mercurial

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Sep 23 00:24:58 UTC 2025

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

Log Message:
Update Mercurial to 7.1.1

- share: add a --share-source argument to hg root
- fastexport: make it possible to ignore .gitmodules in the source repository
- python-zstandard updated to 0.23.0
- migration to PEP 517 packaging
- default TLS version of the client bumped to 1.2
- support for storing inline clone bundles outside .hg
- experimental multi-threaded writing for stream-clones
- further bug fixes for the issue6528 handling
- many bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.153 -r1.154 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-mercurial/patches/patch-setup.py

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.107 pkgsrc/devel/py-mercurial/Makefile:1.108
--- pkgsrc/devel/py-mercurial/Makefile:1.107    Sat Apr 12 12:08:13 2025
+++ pkgsrc/devel/py-mercurial/Makefile  Tue Sep 23 00:24:57 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2025/04/12 12:08:13 adam Exp $
+# $NetBSD: Makefile,v 1.108 2025/09/23 00:24:57 joerg Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 
@@ -14,6 +13,9 @@ COMMENT=      Fast, lightweight source contro
 LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
 USE_TOOLS+=    gmake msgfmt
 
@@ -27,17 +29,15 @@ PYTHON_SELF_CONFLICT=               yes
 
 .include "version.mk"
 
+
 USE_TOOLS+=            bash:test
-# Test status as of 6.9.4
-# Ran 943 tests, 81 skipped, 2 failed.
-# test-locale.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6948
-# test-revlog-mmapindex.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6899
-
-TEST_TARGET=           tests
-TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
-TEST_MAKE_FLAGS+=      CARGO=/dev/null
+# Test status as of 7.1 as !root
+# tests/test-revlog-mmapindex.t (race condition / buffer)
+
+.if make(test)
+# tries to build/install wheel
+ALLOW_NETWORK_ACCESS=
+.endif
 
 post-build:
        ${RUN} cd ${WRKSRC} && ${BUILD_MAKE_CMD} build-chg
@@ -52,7 +52,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/doc/mercurial
 
 do-test:
-       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} make tests ${TEST_MAKE_FLAGS}
+       cd ${WRKSRC}/tests && ${SETENV} CARGO=/dev/null ${PYTHONBIN} run-tests.py -j${_MAKE_JOBS_N}
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.50 pkgsrc/devel/py-mercurial/PLIST:1.51
--- pkgsrc/devel/py-mercurial/PLIST:1.50        Sat Apr 12 12:08:13 2025
+++ pkgsrc/devel/py-mercurial/PLIST     Tue Sep 23 00:24:57 2025
@@ -1,11 +1,6 @@
-@comment $NetBSD: PLIST,v 1.50 2025/04/12 12:08:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.51 2025/09/23 00:24:57 joerg Exp $
 bin/chg
 bin/hg
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/licenses/COPYING
-${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
 ${PYSITELIB}/hgdemandimport/__init__.pyo
@@ -418,9 +413,6 @@ ${PYSITELIB}/hgext/sparse.pyo
 ${PYSITELIB}/hgext/split.py
 ${PYSITELIB}/hgext/split.pyc
 ${PYSITELIB}/hgext/split.pyo
-${PYSITELIB}/hgext/sqlitestore.py
-${PYSITELIB}/hgext/sqlitestore.pyc
-${PYSITELIB}/hgext/sqlitestore.pyo
 ${PYSITELIB}/hgext/strip.py
 ${PYSITELIB}/hgext/strip.pyc
 ${PYSITELIB}/hgext/strip.pyo
@@ -445,6 +437,11 @@ ${PYSITELIB}/hgext/zeroconf/__init__.pyo
 ${PYSITELIB}/hgext3rd/__init__.py
 ${PYSITELIB}/hgext3rd/__init__.pyc
 ${PYSITELIB}/hgext3rd/__init__.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/mercurial/__init__.py
 ${PYSITELIB}/mercurial/__init__.pyc
 ${PYSITELIB}/mercurial/__init__.pyo
@@ -502,11 +499,17 @@ ${PYSITELIB}/mercurial/cacheutil.pyo
 ${PYSITELIB}/mercurial/cext/__init__.py
 ${PYSITELIB}/mercurial/cext/__init__.pyc
 ${PYSITELIB}/mercurial/cext/__init__.pyo
+${PYSITELIB}/mercurial/cext/base85.pyi
 ${PYSITELIB}/mercurial/cext/base85.so
+${PYSITELIB}/mercurial/cext/bdiff.pyi
 ${PYSITELIB}/mercurial/cext/bdiff.so
+${PYSITELIB}/mercurial/cext/mpatch.pyi
 ${PYSITELIB}/mercurial/cext/mpatch.so
+${PYSITELIB}/mercurial/cext/osutil.pyi
 ${PYSITELIB}/mercurial/cext/osutil.so
+${PYSITELIB}/mercurial/cext/parsers.pyi
 ${PYSITELIB}/mercurial/cext/parsers.so
+${PYSITELIB}/mercurial/cext/py.typed
 ${PYSITELIB}/mercurial/cffi/__init__.py
 ${PYSITELIB}/mercurial/cffi/__init__.pyc
 ${PYSITELIB}/mercurial/cffi/__init__.pyo
@@ -537,6 +540,12 @@ ${PYSITELIB}/mercurial/changelog.pyo
 ${PYSITELIB}/mercurial/chgserver.py
 ${PYSITELIB}/mercurial/chgserver.pyc
 ${PYSITELIB}/mercurial/chgserver.pyo
+${PYSITELIB}/mercurial/cmd_impls/__init__.py
+${PYSITELIB}/mercurial/cmd_impls/__init__.pyc
+${PYSITELIB}/mercurial/cmd_impls/__init__.pyo
+${PYSITELIB}/mercurial/cmd_impls/graft.py
+${PYSITELIB}/mercurial/cmd_impls/graft.pyc
+${PYSITELIB}/mercurial/cmd_impls/graft.pyo
 ${PYSITELIB}/mercurial/cmdutil.py
 ${PYSITELIB}/mercurial/cmdutil.pyc
 ${PYSITELIB}/mercurial/cmdutil.pyo
@@ -559,6 +568,15 @@ ${PYSITELIB}/mercurial/configitems.py
 ${PYSITELIB}/mercurial/configitems.pyc
 ${PYSITELIB}/mercurial/configitems.pyo
 ${PYSITELIB}/mercurial/configitems.toml
+${PYSITELIB}/mercurial/configuration/__init__.py
+${PYSITELIB}/mercurial/configuration/__init__.pyc
+${PYSITELIB}/mercurial/configuration/__init__.pyo
+${PYSITELIB}/mercurial/configuration/command.py
+${PYSITELIB}/mercurial/configuration/command.pyc
+${PYSITELIB}/mercurial/configuration/command.pyo
+${PYSITELIB}/mercurial/configuration/rcutil.py
+${PYSITELIB}/mercurial/configuration/rcutil.pyc
+${PYSITELIB}/mercurial/configuration/rcutil.pyo
 ${PYSITELIB}/mercurial/context.py
 ${PYSITELIB}/mercurial/context.pyc
 ${PYSITELIB}/mercurial/context.pyo
@@ -759,18 +777,33 @@ ${PYSITELIB}/mercurial/i18n.pyo
 ${PYSITELIB}/mercurial/interfaces/__init__.py
 ${PYSITELIB}/mercurial/interfaces/__init__.pyc
 ${PYSITELIB}/mercurial/interfaces/__init__.pyo
+${PYSITELIB}/mercurial/interfaces/_basetypes.py
+${PYSITELIB}/mercurial/interfaces/_basetypes.pyc
+${PYSITELIB}/mercurial/interfaces/_basetypes.pyo
 ${PYSITELIB}/mercurial/interfaces/dirstate.py
 ${PYSITELIB}/mercurial/interfaces/dirstate.pyc
 ${PYSITELIB}/mercurial/interfaces/dirstate.pyo
+${PYSITELIB}/mercurial/interfaces/matcher.py
+${PYSITELIB}/mercurial/interfaces/matcher.pyc
+${PYSITELIB}/mercurial/interfaces/matcher.pyo
+${PYSITELIB}/mercurial/interfaces/misc.py
+${PYSITELIB}/mercurial/interfaces/misc.pyc
+${PYSITELIB}/mercurial/interfaces/misc.pyo
 ${PYSITELIB}/mercurial/interfaces/modules.py
 ${PYSITELIB}/mercurial/interfaces/modules.pyc
 ${PYSITELIB}/mercurial/interfaces/modules.pyo
 ${PYSITELIB}/mercurial/interfaces/repository.py
 ${PYSITELIB}/mercurial/interfaces/repository.pyc
 ${PYSITELIB}/mercurial/interfaces/repository.pyo
-${PYSITELIB}/mercurial/interfaces/util.py
-${PYSITELIB}/mercurial/interfaces/util.pyc
-${PYSITELIB}/mercurial/interfaces/util.pyo
+${PYSITELIB}/mercurial/interfaces/status.py
+${PYSITELIB}/mercurial/interfaces/status.pyc
+${PYSITELIB}/mercurial/interfaces/status.pyo
+${PYSITELIB}/mercurial/interfaces/transaction.py
+${PYSITELIB}/mercurial/interfaces/transaction.pyc
+${PYSITELIB}/mercurial/interfaces/transaction.pyo
+${PYSITELIB}/mercurial/interfaces/types.py
+${PYSITELIB}/mercurial/interfaces/types.pyc
+${PYSITELIB}/mercurial/interfaces/types.pyo
 ${PYSITELIB}/mercurial/keepalive.py
 ${PYSITELIB}/mercurial/keepalive.pyc
 ${PYSITELIB}/mercurial/keepalive.pyo
@@ -891,6 +924,9 @@ ${PYSITELIB}/mercurial/pure/bdiff.pyo
 ${PYSITELIB}/mercurial/pure/charencode.py
 ${PYSITELIB}/mercurial/pure/charencode.pyc
 ${PYSITELIB}/mercurial/pure/charencode.pyo
+${PYSITELIB}/mercurial/pure/deltas.py
+${PYSITELIB}/mercurial/pure/deltas.pyc
+${PYSITELIB}/mercurial/pure/deltas.pyo
 ${PYSITELIB}/mercurial/pure/mpatch.py
 ${PYSITELIB}/mercurial/pure/mpatch.pyc
 ${PYSITELIB}/mercurial/pure/mpatch.pyo
@@ -909,9 +945,6 @@ ${PYSITELIB}/mercurial/pvec.pyo
 ${PYSITELIB}/mercurial/pycompat.py
 ${PYSITELIB}/mercurial/pycompat.pyc
 ${PYSITELIB}/mercurial/pycompat.pyo
-${PYSITELIB}/mercurial/rcutil.py
-${PYSITELIB}/mercurial/rcutil.pyc
-${PYSITELIB}/mercurial/rcutil.pyo
 ${PYSITELIB}/mercurial/registrar.py
 ${PYSITELIB}/mercurial/registrar.pyc
 ${PYSITELIB}/mercurial/registrar.pyo
@@ -936,6 +969,9 @@ ${PYSITELIB}/mercurial/revlogutils/__ini
 ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.py
 ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyc
 ${PYSITELIB}/mercurial/revlogutils/concurrency_checker.pyo
+${PYSITELIB}/mercurial/revlogutils/config.py
+${PYSITELIB}/mercurial/revlogutils/config.pyc
+${PYSITELIB}/mercurial/revlogutils/config.pyo
 ${PYSITELIB}/mercurial/revlogutils/constants.py
 ${PYSITELIB}/mercurial/revlogutils/constants.pyc
 ${PYSITELIB}/mercurial/revlogutils/constants.pyo
@@ -1336,49 +1372,7 @@ ${PYSITELIB}/mercurial/thirdparty/tomli/
 ${PYSITELIB}/mercurial/thirdparty/tomli/_types.py
 ${PYSITELIB}/mercurial/thirdparty/tomli/_types.pyc
 ${PYSITELIB}/mercurial/thirdparty/tomli/_types.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/__init__.py
-${PYSITELIB}/mercurial/thirdparty/zope/__init__.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/__init__.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/__init__.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/__init__.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/__init__.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_compat.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_compat.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_compat.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_flatten.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_flatten.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_flatten.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.so
-${PYSITELIB}/mercurial/thirdparty/zope/interface/adapter.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/adapter.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/adapter.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/advice.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/advice.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/advice.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/declarations.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/declarations.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/declarations.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/document.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/document.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/document.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/exceptions.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/exceptions.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/exceptions.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interface.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interface.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interface.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interfaces.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interfaces.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/interfaces.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/registry.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/registry.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/registry.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/ro.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/ro.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/ro.pyo
-${PYSITELIB}/mercurial/thirdparty/zope/interface/verify.py
-${PYSITELIB}/mercurial/thirdparty/zope/interface/verify.pyc
-${PYSITELIB}/mercurial/thirdparty/zope/interface/verify.pyo
+${PYSITELIB}/mercurial/thirdparty/tomli/py.typed
 ${PYSITELIB}/mercurial/transaction.py
 ${PYSITELIB}/mercurial/transaction.pyc
 ${PYSITELIB}/mercurial/transaction.pyo
@@ -1430,6 +1424,9 @@ ${PYSITELIB}/mercurial/utils/cborutil.py
 ${PYSITELIB}/mercurial/utils/compression.py
 ${PYSITELIB}/mercurial/utils/compression.pyc
 ${PYSITELIB}/mercurial/utils/compression.pyo
+${PYSITELIB}/mercurial/utils/dag_util.py
+${PYSITELIB}/mercurial/utils/dag_util.pyc
+${PYSITELIB}/mercurial/utils/dag_util.pyo
 ${PYSITELIB}/mercurial/utils/dateutil.py
 ${PYSITELIB}/mercurial/utils/dateutil.pyc
 ${PYSITELIB}/mercurial/utils/dateutil.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.153 pkgsrc/devel/py-mercurial/distinfo:1.154
--- pkgsrc/devel/py-mercurial/distinfo:1.153    Fri Mar 21 20:27:12 2025
+++ pkgsrc/devel/py-mercurial/distinfo  Tue Sep 23 00:24:57 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.153 2025/03/21 20:27:12 wiz Exp $
+$NetBSD: distinfo,v 1.154 2025/09/23 00:24:57 joerg Exp $
 
-BLAKE2s (mercurial-6.9.4.tar.gz) = e284ecdd87f35fc54da367b31ab2fdeedcbf775cc84824be735863206290f43d
-SHA512 (mercurial-6.9.4.tar.gz) = 4aa6881a9044c51a2d3d421da964d9e1bcc10d794a4a299a1f22cfb59866d168eb2d3a973cf2987d613e42c1a9b4cb5fbe79e1fa1b14a37e1747f4a4d1d5a0c7
-Size (mercurial-6.9.4.tar.gz) = 8670112 bytes
-SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29
+BLAKE2s (mercurial-7.1.1.tar.gz) = b711f4a4b2fd4759fb3a988e6965f72eb549adea795343b6a9552f518dd3e02c
+SHA512 (mercurial-7.1.1.tar.gz) = 04ba564bbe664a825caa8740ab66ef973acb7795abea1786fdd0c502da7dfe14071b215c6384ac398d0f7b69d86d6da6f9a4dd7dfc9e7123b975ec1656c95092
+Size (mercurial-7.1.1.tar.gz) = 9029304 bytes
+SHA1 (patch-setup.py) = 112e63c39af177bc3051eff17a826f0ecf02659e

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.65 pkgsrc/devel/py-mercurial/version.mk:1.66
--- pkgsrc/devel/py-mercurial/version.mk:1.65   Fri Mar 21 20:27:12 2025
+++ pkgsrc/devel/py-mercurial/version.mk        Tue Sep 23 00:24:57 2025
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.65 2025/03/21 20:27:12 wiz Exp $
+# $NetBSD: version.mk,v 1.66 2025/09/23 00:24:57 joerg Exp $
 
-VERSION=       6.9.4
+VERSION=       7.1.1

Index: pkgsrc/devel/py-mercurial/patches/patch-setup.py
diff -u pkgsrc/devel/py-mercurial/patches/patch-setup.py:1.2 pkgsrc/devel/py-mercurial/patches/patch-setup.py:1.3
--- pkgsrc/devel/py-mercurial/patches/patch-setup.py:1.2        Mon Oct  2 20:37:22 2023
+++ pkgsrc/devel/py-mercurial/patches/patch-setup.py    Tue Sep 23 00:24:57 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.2 2023/10/02 20:37:22 triaxx Exp $
+$NetBSD: patch-setup.py,v 1.3 2025/09/23 00:24:57 joerg Exp $
 
 Skip existence check for Python.h so this can be cross-compiled.
 
@@ -7,7 +7,7 @@ The pkgsrc toolchain wrapper will interp
 
 --- setup.py.orig      2023-05-04 12:17:18.000000000 +0000
 +++ setup.py
-@@ -658,13 +658,6 @@ class hgbuildpy(build_py):
+@@ -485,13 +485,6 @@ class hgbuildpy(build_py):
  
                  exts.append(osutilbuild.ffi.distutils_extension())
              self.distribution.ext_modules = exts
@@ -20,4 +20,4 @@ The pkgsrc toolchain wrapper will interp
 -                )
  
      def run(self):
-         basepath = os.path.join(self.build_lib, 'mercurial')
+         rust = self.distribution.rust
Home | Main Index | Thread Index | Old Index