CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov 13 14:36:55 UTC 2023

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST distinfo version.mk
Removed Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-remotefilelog-gc.t

Log Message:
py-mercurial: update to 6.5.3.

Mercurial 6.5.3

    "hgweb: pass strings in WSGI environment correctly from wsgicgi"
    "perf: introduce more cache invalidation option in perf::tags"
    "perf: add a --clear-fnode-cache-rev argument to perf::tags"
    "perf: add a --update-last flag to perf::tags"
    "blackbox: add a option to duplicate output to stderr too"
    "tags: avoid expensive access to repo.changelog in a loop"
    "revlog: fix a bug where NULL_NODE failed to be resolved to NULL_REV"
    "httppeer: fix static-http: scheme autodetection (issue6833)"
    "tests: backed out changeset 8037ddacad47"
    "stream-clone: fix a crash when a repo with an empty revlog is cloned"
    "censor: accept censored revision during upgrade"
    "revlog: avoid opening and closing the file for each cloned revision"


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-mercurial/PLIST
cvs rdiff -u -r1.138 -r1.139 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-remotefilelog-gc.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.89 pkgsrc/devel/py-mercurial/Makefile:1.90
--- pkgsrc/devel/py-mercurial/Makefile:1.89     Mon Oct 23 06:37:41 2023
+++ pkgsrc/devel/py-mercurial/Makefile  Mon Nov 13 14:36:55 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2023/10/23 06:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2023/11/13 14:36:55 wiz 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/
 
@@ -13,6 +12,9 @@ HOMEPAGE=     https://www.mercurial-scm.org/
 COMMENT=       Fast, lightweight source control management system
 LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
 USE_TOOLS+=    gmake msgfmt
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
@@ -24,11 +26,8 @@ PYTHON_SELF_CONFLICT=                yes
 .include "version.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 6.5.2
-# Fixed in pkgsrc:
-# test-remotefilelog-gc.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6843
-# Ran 931 tests, 83 skipped, 1 failed.
+# Test status as of 6.5.3
+# Ran 932 tests, 83 skipped, 0 failed.
 
 TEST_TARGET=           tests
 TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
@@ -39,6 +38,9 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.rst  \
                ${DESTDIR}${PREFIX}/share/doc/mercurial
 
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} make tests ${TEST_MAKE_FLAGS}
+
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.44 pkgsrc/devel/py-mercurial/PLIST:1.45
--- pkgsrc/devel/py-mercurial/PLIST:1.44        Wed Jul 19 14:40:50 2023
+++ pkgsrc/devel/py-mercurial/PLIST     Mon Nov 13 14:36:55 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2023/07/19 14:40:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.45 2023/11/13 14:36:55 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -460,10 +460,11 @@ ${PYSITELIB}/hgext/zeroconf/__init__.pyo
 ${PYSITELIB}/hgext3rd/__init__.py
 ${PYSITELIB}/hgext3rd/__init__.pyc
 ${PYSITELIB}/hgext3rd/__init__.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/mercurial/__init__.py
 ${PYSITELIB}/mercurial/__init__.pyc
 ${PYSITELIB}/mercurial/__init__.pyo

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.138 pkgsrc/devel/py-mercurial/distinfo:1.139
--- pkgsrc/devel/py-mercurial/distinfo:1.138    Mon Oct  9 19:01:03 2023
+++ pkgsrc/devel/py-mercurial/distinfo  Mon Nov 13 14:36:55 2023
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.138 2023/10/09 19:01:03 wiz Exp $
+$NetBSD: distinfo,v 1.139 2023/11/13 14:36:55 wiz Exp $
 
-BLAKE2s (mercurial-6.5.2.tar.gz) = 9238e38082f78f19f9b339df550a1de72120895d94d71c69e082a33a84ca0f60
-SHA512 (mercurial-6.5.2.tar.gz) = 200c4efb8e07c23c0c699f782cd40b2d966fa51c05b8cdd8d4066538fff90de2e94b760007eafd305391cb8c626c52b2466d0ae87a3ec17803cbaa3cb75706db
-Size (mercurial-6.5.2.tar.gz) = 8233023 bytes
+BLAKE2s (mercurial-6.5.3.tar.gz) = b033e7315275442938b9b5c9f20f308041e079079a16fbf17dda29ebd8b81a68
+SHA512 (mercurial-6.5.3.tar.gz) = af90ec414fbf9da518ce0de5b855b5dd6e4141f838ab0da54a40f31aa00245d21f14f1352fe537744fb6ae5a3e4f2723076f4773fafac649b8483fefd002b510
+Size (mercurial-6.5.3.tar.gz) = 8235306 bytes
 SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29
-SHA1 (patch-tests_test-remotefilelog-gc.t) = 5cf739ec7d5aa5fb35ba5c27e4b0fba7d7ea0ca7

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.53 pkgsrc/devel/py-mercurial/version.mk:1.54
--- pkgsrc/devel/py-mercurial/version.mk:1.53   Mon Oct  2 20:37:21 2023
+++ pkgsrc/devel/py-mercurial/version.mk        Mon Nov 13 14:36:55 2023
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.53 2023/10/02 20:37:21 triaxx Exp $
+# $NetBSD: version.mk,v 1.54 2023/11/13 14:36:55 wiz Exp $
 
-VERSION=       6.5.2
+VERSION=       6.5.3