CVS commit: pkgsrc/devel/py-hg-evolve

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Sep 23 00:27:13 UTC 2025

Modified Files:
        pkgsrc/devel/py-hg-evolve: Makefile distinfo
Added Files:
        pkgsrc/devel/py-hg-evolve/patches: patch-tests_test-check-sdist.t
            patch-tests_test-evolve-content-divergent-case-A2.t

Log Message:
Update to hg-evolve 11.1.9 with a couple of performance improvements
from mainline developed during the repo testing.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-hg-evolve/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-check-sdist.t \
    pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-evolve-content-divergent-case-A2.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-hg-evolve/Makefile
diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.48 pkgsrc/devel/py-hg-evolve/Makefile:1.49
--- pkgsrc/devel/py-hg-evolve/Makefile:1.48     Sat Apr 12 11:18:38 2025
+++ pkgsrc/devel/py-hg-evolve/Makefile  Tue Sep 23 00:27:13 2025
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2025/04/12 11:18:38 adam Exp $
+# $NetBSD: Makefile,v 1.49 2025/09/23 00:27:13 joerg Exp $
 #
 # Release notes:
 # https://lists.mercurial-scm.org/pipermail/mercurial/
 
-DISTNAME=      hg_evolve-11.1.8
+DISTNAME=      hg_evolve-11.1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
-PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  ${MASTER_SITE_PYPI:=h/hg-evolve/}
 
@@ -14,6 +13,13 @@ HOMEPAGE=    https://www.mercurial-scm.org/
 COMMENT=       Experimental Mercurial extensions from Facebook
 LICENSE=       gnu-gpl-v2
 
+PATCH_SITES=           https://foss.heptapod.net/mercurial/evolve/-/commit/
+PATCHFILES=            \
+    8ec80fb4b0ce4247b61051014a4fb891bf327a89.diff \
+    0144bd9214df0457a966177eb7217e2b2991965a.diff \
+    1c1cd671da5c3c547184b0b13dbb59b8c848d09c.diff
+PATCH_DIST_STRIP=      -p1
+
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.4nb1:../../devel/py-mercurial
 TEST_DEPENDS+= curl-[0-9]*:../../www/curl
@@ -24,13 +30,10 @@ post-install:
        rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__init__.py*
        rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__pycache__/__init__.*
 
-# Test status as of 11.1.6
-# Failed test-amend.t: output changed
-# Failed test-check-compat-strings.t: output changed
-# Failed test-check-sdist.t: output changed
-# Failed test-evolve-content-divergent-case-A2.t: output changed
-# Failed test-version-install.t: output changed
-# Ran 234 tests, 6 skipped, 5 failed.
+# Test status as of 11.1.9
+# Failed test-check-compat-strings.t: expects hg copy is a repository
+# Failed test-check-sdist.t: missing files in upstream list
+# Failed test-version-install.t: Unexpected PIP compatibility warning
 
 .if 0
 HG_WRKSRC=     cd ../py-mercurial && ${MAKE} show-var VARNAME=WRKSRC

Index: pkgsrc/devel/py-hg-evolve/distinfo
diff -u pkgsrc/devel/py-hg-evolve/distinfo:1.33 pkgsrc/devel/py-hg-evolve/distinfo:1.34
--- pkgsrc/devel/py-hg-evolve/distinfo:1.33     Fri Mar 21 20:29:18 2025
+++ pkgsrc/devel/py-hg-evolve/distinfo  Tue Sep 23 00:27:13 2025
@@ -1,5 +1,16 @@
-$NetBSD: distinfo,v 1.33 2025/03/21 20:29:18 wiz Exp $
+$NetBSD: distinfo,v 1.34 2025/09/23 00:27:13 joerg Exp $
 
-BLAKE2s (hg_evolve-11.1.8.tar.gz) = de600f9756939cee43eadb175ffb08d4d6e1bd3df4db0ea3c2e56606e8d2629a
-SHA512 (hg_evolve-11.1.8.tar.gz) = e91d019a2e09d952b01958b33eeeaf1fe91636f0d538169a0a351e8faaab6ced2e4ad91b839f02f754ad96eca1c098e18ec38558977eb1a887462031f60a8a94
-Size (hg_evolve-11.1.8.tar.gz) = 899277 bytes
+BLAKE2s (0144bd9214df0457a966177eb7217e2b2991965a.diff) = e7744dd6d98b2e34891dc379940db6e6d1958cc47aeaa27255354741a49c0110
+SHA512 (0144bd9214df0457a966177eb7217e2b2991965a.diff) = 0222d709599c284cfc465942adcd9b0afa054137c439a2443001ca07f1c1c3d537c564e345cac4d42ba006622e28616ec39568ff5a29e0a99bb4048e6bef21e6
+Size (0144bd9214df0457a966177eb7217e2b2991965a.diff) = 1345 bytes
+BLAKE2s (1c1cd671da5c3c547184b0b13dbb59b8c848d09c.diff) = 61d503686b213b1fdd8f69309e7290d5f7db062ce945e6366415f33992540245
+SHA512 (1c1cd671da5c3c547184b0b13dbb59b8c848d09c.diff) = 4c89d1d0edccbf10133cfafe5a91fafe41e8e73bc2dd6fffa9605d3ae08f53052147587af7ec3bc0aa652135c463da00c7a470262cd5c5f5f6804920a63a2dfd
+Size (1c1cd671da5c3c547184b0b13dbb59b8c848d09c.diff) = 1290 bytes
+BLAKE2s (8ec80fb4b0ce4247b61051014a4fb891bf327a89.diff) = 1a67e3b060e7480c88094cf70d7fbb19c64e83d1aa7c8bdc3167ee789c76818c
+SHA512 (8ec80fb4b0ce4247b61051014a4fb891bf327a89.diff) = c90cf4039349e1577946777eb64852cc2ca132fe1e02d14c5ddf0376e1f7d05ce6b2baed9396783d520db130e29442a54a79043a3dfddefd3271fc24e84ec0c4
+Size (8ec80fb4b0ce4247b61051014a4fb891bf327a89.diff) = 766 bytes
+BLAKE2s (hg_evolve-11.1.9.tar.gz) = 1db1b73b575e945881140d754cb1dfe89794cd6082462a8e430db2fa3c9ab774
+SHA512 (hg_evolve-11.1.9.tar.gz) = 288d3c7e66ed523604a6ff034d27f3a245fcae674b1958831011add37ae0ac22137a7fc2f268d813795171ce1c2a09b8656381fd214c9312f96ccf968ddef1df
+Size (hg_evolve-11.1.9.tar.gz) = 899260 bytes
+SHA1 (patch-tests_test-check-sdist.t) = 5af8764ecf06714d4bf7668ea2bf9220610972fe
+SHA1 (patch-tests_test-evolve-content-divergent-case-A2.t) = 4f1fbe23bc88493180a77f3a28513ed3ad1748a6

Added files:

Index: pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-check-sdist.t
diff -u /dev/null pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-check-sdist.t:1.1
--- /dev/null   Tue Sep 23 00:27:13 2025
+++ pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-check-sdist.t    Tue Sep 23 00:27:13 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-tests_test-check-sdist.t,v 1.1 2025/09/23 00:27:13 joerg Exp $
+
+BSD wc left-pads the number.
+
+--- tests/test-check-sdist.t.orig      2025-07-25 16:21:02.000000000 +0000
++++ tests/test-check-sdist.t
+@@ -39,9 +39,9 @@ Archiving to a separate location to avoi
+   $ grep -E '^tests/test-.*\.(t|py)$' ../files > ../test-files
+   $ grep -E -v '^tests/test-.*\.(t|py)$' ../files > ../other-files
+   $ wc -l ../other-files
+-  ??? ../other-files (glob)
++  [ \t]*[0-9][0-9][0-9] ../other-files (re)
+   $ wc -l ../test-files
+-  ??? ../test-files (glob)
++  [ \t]*[0-9][0-9][0-9] ../test-files (re)
+   $ grep -F debian ../files
+   tests/test-check-debian.t
+   $ grep -F __init__.py ../files
Index: pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-evolve-content-divergent-case-A2.t
diff -u /dev/null pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-evolve-content-divergent-case-A2.t:1.1
--- /dev/null   Tue Sep 23 00:27:13 2025
+++ pkgsrc/devel/py-hg-evolve/patches/patch-tests_test-evolve-content-divergent-case-A2.t       Tue Sep 23 00:27:13 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-evolve-content-divergent-case-A2.t,v 1.1 2025/09/23 00:27:13 joerg Exp $
+
+Fix GNUism.
+
+--- tests/test-evolve-content-divergent-case-A2.t.orig 2025-07-25 16:21:02.000000000 +0000
++++ tests/test-evolve-content-divergent-case-A2.t
+@@ -55,7 +55,7 @@ initial
+   $ cd local
+   $ mkcommit A0
+   $ hg push -q
+-  $ sed -i '1ifoo' A0
++  $ sed -i '1s/^/foo\n/' A0
+   $ hg amend -m "A1"
+   $ hg log -G --hidden
+   @  2:e1f7c24563ba (draft): A1