CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct  9 19:01:03 UTC 2023

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-remotefilelog-gc.t

Log Message:
py-mercurial: add test failure fix patch from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.137 -r1.138 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.87 pkgsrc/devel/py-mercurial/Makefile:1.88
--- pkgsrc/devel/py-mercurial/Makefile:1.87     Sat Aug 26 13:20:07 2023
+++ pkgsrc/devel/py-mercurial/Makefile  Mon Oct  9 19:01:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2023/08/26 13:20:07 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2023/10/09 19:01:03 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -29,7 +29,8 @@ PYTHON_SELF_CONFLICT=         yes
 .include "version.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 6.5.1
+# 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.

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.137 pkgsrc/devel/py-mercurial/distinfo:1.138
--- pkgsrc/devel/py-mercurial/distinfo:1.137    Mon Oct  2 20:37:21 2023
+++ pkgsrc/devel/py-mercurial/distinfo  Mon Oct  9 19:01:03 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.137 2023/10/02 20:37:21 triaxx Exp $
+$NetBSD: distinfo,v 1.138 2023/10/09 19:01:03 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
 SHA1 (patch-setup.py) = 2f5e1f619af50cc0976ce6b229e4ce9cc3492c29
+SHA1 (patch-tests_test-remotefilelog-gc.t) = 5cf739ec7d5aa5fb35ba5c27e4b0fba7d7ea0ca7

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-remotefilelog-gc.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-remotefilelog-gc.t:1.1
--- /dev/null   Mon Oct  9 19:01:03 2023
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-remotefilelog-gc.t       Mon Oct  9 19:01:03 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-tests_test-remotefilelog-gc.t,v 1.1 2023/10/09 19:01:03 wiz Exp $
+
+Test fix from upstream
+https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/675/
+
+--- tests/test-remotefilelog-gc.t.orig 2023-09-06 16:11:09.000000000 +0000
++++ tests/test-remotefilelog-gc.t
+@@ -106,11 +106,6 @@
+ # Test that warning is displayed when the repo path is malformed
+ 
+   $ printf "asdas\0das" >> $CACHEDIR/repos
+-#if py311
+-  $ hg gc
+-  finished: removed 0 of 4 files (0.00 GB to 0.00 GB)
+-#else
+   $ hg gc
+   abort: invalid path asdas\x00da: .*(null|NULL).* (re)
+   [255]
+-#endif