CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct 13 12:35:29 UTC 2021

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo version.mk
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-censor.t
            patch-tests_test-clone-uncompressed.t
            patch-tests_test-persistent-nodemap.t

Log Message:
py-mercurial: update to 5.9.2.

Changes not found.

Fix four test failures while here.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-mercurial/version.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.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.59 pkgsrc/devel/py-mercurial/Makefile:1.60
--- pkgsrc/devel/py-mercurial/Makefile:1.59     Sun Sep 12 10:22:57 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Wed Oct 13 12:35:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2021/09/12 10:22:57 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2021/10/13 12:35:29 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -31,17 +31,11 @@ INSTALLATION_DIRS+= share/doc/mercurial
 .include "options.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 5.9.1
-# test-persistent-nodemap.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6523
-# test-cloned-uncompressed
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6591
-# test-censor.t
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6585
+# Known test failures as of 5.9.2
 # test-removeemptydirs.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6587
 #
-# Ran 888 tests, 97 skipped, 5 failed.
+# Ran 888 tests, 97 skipped, 1 failed.
 
 TEST_TARGET=           tests
 TEST_MAKE_FLAGS+=      PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.107 pkgsrc/devel/py-mercurial/distinfo:1.108
--- pkgsrc/devel/py-mercurial/distinfo:1.107    Thu Oct  7 13:43:22 2021
+++ pkgsrc/devel/py-mercurial/distinfo  Wed Oct 13 12:35:29 2021
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.107 2021/10/07 13:43:22 nia Exp $
+$NetBSD: distinfo,v 1.108 2021/10/13 12:35:29 wiz Exp $
 
-RMD160 (mercurial-5.9.1.tar.gz) = d25686f9c34044b19c5dfac20a5f947d01786f06
-SHA512 (mercurial-5.9.1.tar.gz) = 2fe734ff707a73d2537af0b0c98e1142fa52b41f7ec4d5572cc5a8479f2d081e69de8b3dd136915d84cde4283f239e0519435c1dfd861824e3021c4c78cd305f
-Size (mercurial-5.9.1.tar.gz) = 8120006 bytes
+RMD160 (mercurial-5.9.2.tar.gz) = 29d52487d7da57c5182b6daad7e8ca73403933d7
+SHA512 (mercurial-5.9.2.tar.gz) = 65002f90eb3050a0d257678f71e6f0c34b39cbb22b517ab265f25728a803012b95c6740f6cdbbabd994a2d66ca94499c4be42c882e299eb7e56412086211e861
+Size (mercurial-5.9.2.tar.gz) = 8125497 bytes
+SHA1 (patch-tests_test-censor.t) = ad5fc991072b326965d8e87ef25d08321d480af8
+SHA1 (patch-tests_test-clone-uncompressed.t) = 58355e72b4d0b9cab2efbc16facca288bdbe4cb0
+SHA1 (patch-tests_test-persistent-nodemap.t) = 78b2576efd5154137996c259cb1e91229b820e0e

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.26 pkgsrc/devel/py-mercurial/version.mk:1.27
--- pkgsrc/devel/py-mercurial/version.mk:1.26   Sun Sep 12 10:22:57 2021
+++ pkgsrc/devel/py-mercurial/version.mk        Wed Oct 13 12:35:29 2021
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.26 2021/09/12 10:22:57 wiz Exp $
+# $NetBSD: version.mk,v 1.27 2021/10/13 12:35:29 wiz Exp $
 
-VERSION=       5.9.1
+VERSION=       5.9.2

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t:1.1
--- /dev/null   Wed Oct 13 12:35:29 2021
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t Wed Oct 13 12:35:29 2021
@@ -0,0 +1,25 @@
+$NetBSD: patch-tests_test-censor.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
+
+Fix test.
+https://bz.mercurial-scm.org/show_bug.cgi?id=6585
+
+--- tests/test-censor.t.orig   2021-10-05 15:47:21.000000000 +0000
++++ tests/test-censor.t
+@@ -552,14 +552,14 @@ Make sure the last revision is a delta a
+ Censor the file
+ 
+   $ hg cat -r $B1 target | wc -l
+-  50002 (re)
++   *50002 (re)
+   $ hg censor -r $B1 target
+   $ hg cat -r $B1 target | wc -l
+-  0 (re)
++   *0 (re)
+ 
+ Check the children is fine
+ 
+   $ hg cat -r $B2 target | wc -l
+-  50003 (re)
++   *50003 (re)
+ 
+ #endif
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t:1.1
--- /dev/null   Wed Oct 13 12:35:29 2021
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t     Wed Oct 13 12:35:29 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-clone-uncompressed.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
+
+Fix test.
+https://bz.mercurial-scm.org/show_bug.cgi?id=6591
+
+--- tests/test-clone-uncompressed.t.orig       2021-10-05 15:47:21.000000000 +0000
++++ tests/test-clone-uncompressed.t
+@@ -96,7 +96,7 @@ Name with special characters
+ 
+ name causing issue6581
+ 
+-  $ mkdir --parents container/isam-build-centos7/
++  $ mkdir -p container/isam-build-centos7/
+   $ touch container/isam-build-centos7/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4f6057904d44399bd666faba9e7f40686.patch
+ 
+ Add all that
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t:1.1
--- /dev/null   Wed Oct 13 12:35:29 2021
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t     Wed Oct 13 12:35:29 2021
@@ -0,0 +1,19 @@
+$NetBSD: patch-tests_test-persistent-nodemap.t,v 1.1 2021/10/13 12:35:29 wiz Exp $
+
+Fix test failure
+https://bz.mercurial-scm.org/show_bug.cgi?id=6523
+
+--- tests/test-persistent-nodemap.t.orig       2021-10-05 15:47:21.000000000 +0000
++++ tests/test-persistent-nodemap.t
+@@ -1028,9 +1028,10 @@ truncate the file
+   $ datafilepath=`ls corruption-test-repo/.hg/store/00changelog*.nd`
+   $ f -s $datafilepath
+   corruption-test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
+-  $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp status=noxfer
++  $ dd if=$datafilepath bs=1000 count=10 of=$datafilepath-tmp
+   10+0 records in
+   10+0 records out
++  * bytes transferred in * (glob)
+   $ mv $datafilepath-tmp $datafilepath
+   $ f -s $datafilepath
+   corruption-test-repo/.hg/store/00changelog-*.nd: size=10000 (glob)