Wed Oct 13 12:35:29 2021 UTC ()
py-mercurial: update to 5.9.2.

Changes not found.

Fix four test failures while here.


(wiz)
diff -r1.59 -r1.60 pkgsrc/devel/py-mercurial/Makefile
diff -r1.107 -r1.108 pkgsrc/devel/py-mercurial/distinfo
diff -r1.26 -r1.27 pkgsrc/devel/py-mercurial/version.mk
diff -r0 -r1.1 pkgsrc/devel/py-mercurial/patches/patch-tests_test-censor.t
diff -r0 -r1.1 pkgsrc/devel/py-mercurial/patches/patch-tests_test-clone-uncompressed.t
diff -r0 -r1.1 pkgsrc/devel/py-mercurial/patches/patch-tests_test-persistent-nodemap.t
cvs diff -r1.59 -r1.60 pkgsrc/devel/py-mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Makefile 2021/09/12 10:22:57 1.59
+++ pkgsrc/devel/py-mercurial/Makefile 2021/10/13 12:35:29 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.59 2021/09/12 10:22:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.60 2021/10/13 12:35:29 wiz Exp $
2# 2#
3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew 3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
4 4
5DISTNAME= mercurial-${VERSION} 5DISTNAME= mercurial-${VERSION}
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
7CATEGORIES= devel scm 7CATEGORIES= devel scm
8MASTER_SITES= https://www.mercurial-scm.org/release/ 8MASTER_SITES= https://www.mercurial-scm.org/release/
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= https://www.mercurial-scm.org/ 11HOMEPAGE= https://www.mercurial-scm.org/
12COMMENT= Fast, lightweight source control management system 12COMMENT= Fast, lightweight source control management system
13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
14 14
@@ -21,36 +21,30 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0 @@ -21,36 +21,30 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0
21# https://bz.mercurial-scm.org/show_bug.cgi?id=4483 21# https://bz.mercurial-scm.org/show_bug.cgi?id=4483
22# https://bz.mercurial-scm.org/show_bug.cgi?id=4485 22# https://bz.mercurial-scm.org/show_bug.cgi?id=4485
23TEST_DEPENDS+= unzip-[0-9]*:../../archivers/unzip 23TEST_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
24 24
25USE_TOOLS+= gmake msgfmt 25USE_TOOLS+= gmake msgfmt
26 26
27INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 27INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
28INSTALLATION_DIRS+= share/doc/mercurial 28INSTALLATION_DIRS+= share/doc/mercurial
29 29
30.include "version.mk" 30.include "version.mk"
31.include "options.mk" 31.include "options.mk"
32 32
33USE_TOOLS+= bash:test 33USE_TOOLS+= bash:test
34# Known test failures as of 5.9.1 34# Known test failures as of 5.9.2
35# test-persistent-nodemap.t 
36# https://bz.mercurial-scm.org/show_bug.cgi?id=6523 
37# test-cloned-uncompressed 
38# https://bz.mercurial-scm.org/show_bug.cgi?id=6591 
39# test-censor.t 
40# https://bz.mercurial-scm.org/show_bug.cgi?id=6585 
41# test-removeemptydirs.t 35# test-removeemptydirs.t
42# https://bz.mercurial-scm.org/show_bug.cgi?id=6587 36# https://bz.mercurial-scm.org/show_bug.cgi?id=6587
43# 37#
44# Ran 888 tests, 97 skipped, 5 failed. 38# Ran 888 tests, 97 skipped, 1 failed.
45 39
46TEST_TARGET= tests 40TEST_TARGET= tests
47TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} 41TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
48 42
49post-install: 43post-install:
50 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 44 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
51 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 45 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
52 ${INSTALL_DATA} ${WRKSRC}/README.rst \ 46 ${INSTALL_DATA} ${WRKSRC}/README.rst \
53 ${DESTDIR}${PREFIX}/share/doc/mercurial 47 ${DESTDIR}${PREFIX}/share/doc/mercurial
54 48
55.include "../../lang/python/distutils.mk" 49.include "../../lang/python/distutils.mk"
56.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.107 -r1.108 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2021/10/07 13:43:22 1.107
+++ pkgsrc/devel/py-mercurial/distinfo 2021/10/13 12:35:29 1.108
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.107 2021/10/07 13:43:22 nia Exp $ 1$NetBSD: distinfo,v 1.108 2021/10/13 12:35:29 wiz Exp $
2 2
3RMD160 (mercurial-5.9.1.tar.gz) = d25686f9c34044b19c5dfac20a5f947d01786f06 3RMD160 (mercurial-5.9.2.tar.gz) = 29d52487d7da57c5182b6daad7e8ca73403933d7
4SHA512 (mercurial-5.9.1.tar.gz) = 2fe734ff707a73d2537af0b0c98e1142fa52b41f7ec4d5572cc5a8479f2d081e69de8b3dd136915d84cde4283f239e0519435c1dfd861824e3021c4c78cd305f 4SHA512 (mercurial-5.9.2.tar.gz) = 65002f90eb3050a0d257678f71e6f0c34b39cbb22b517ab265f25728a803012b95c6740f6cdbbabd994a2d66ca94499c4be42c882e299eb7e56412086211e861
5Size (mercurial-5.9.1.tar.gz) = 8120006 bytes 5Size (mercurial-5.9.2.tar.gz) = 8125497 bytes
 6SHA1 (patch-tests_test-censor.t) = ad5fc991072b326965d8e87ef25d08321d480af8
 7SHA1 (patch-tests_test-clone-uncompressed.t) = 58355e72b4d0b9cab2efbc16facca288bdbe4cb0
 8SHA1 (patch-tests_test-persistent-nodemap.t) = 78b2576efd5154137996c259cb1e91229b820e0e
cvs diff -r1.26 -r1.27 pkgsrc/devel/py-mercurial/version.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/version.mk 2021/09/12 10:22:57 1.26
+++ pkgsrc/devel/py-mercurial/version.mk 2021/10/13 12:35:29 1.27
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: version.mk,v 1.26 2021/09/12 10:22:57 wiz Exp $ 1# $NetBSD: version.mk,v 1.27 2021/10/13 12:35:29 wiz Exp $
2 2
3VERSION= 5.9.1 3VERSION= 5.9.2
File Added: pkgsrc/devel/py-mercurial/patches/Attic/patch-tests_test-censor.t
$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
File Added: pkgsrc/devel/py-mercurial/patches/Attic/patch-tests_test-clone-uncompressed.t
$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
File Added: pkgsrc/devel/py-mercurial/patches/Attic/patch-tests_test-persistent-nodemap.t
$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)