Tue Feb 15 10:21:30 2022 UTC ()
py-mercurial: update to 6.0.2.

Mercurial 6.0.2

* Fix hg incoming and hg outgoing with remote subrepos on Windows
* Fix Rust build on MacOS
* Fix a (15 year old?) bug where some data loss could happen in
  a very tight race window
* Remove support for running hg unamend on merge changesets at
  it was never actually implemented
* Fix stream-clone requirements filtering which caused some
  stream-clones to be unusable from an older version of Mercurial
* Rename dirstate-v2 configuration name from exp-rc-dirstate-v2
  to use-dirstate-v2. This was overlooked in 6.0, the old name
  will be kept as an alias for compatibility.
* Fix a bug where the branchmap could point to uncommitted data


(wiz)
diff -r1.66 -r1.67 pkgsrc/devel/py-mercurial/Makefile
diff -r1.112 -r1.113 pkgsrc/devel/py-mercurial/distinfo
diff -r1.30 -r1.31 pkgsrc/devel/py-mercurial/version.mk
cvs diff -r1.66 -r1.67 pkgsrc/devel/py-mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Makefile 2022/01/29 07:23:59 1.66
+++ pkgsrc/devel/py-mercurial/Makefile 2022/02/15 10:21:30 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2022/01/29 07:23:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2022/02/15 10:21:30 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
@@ -19,30 +19,45 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:.. @@ -19,30 +19,45 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:..
19TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 19TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
20 20
21USE_TOOLS+= gmake msgfmt 21USE_TOOLS+= gmake msgfmt
22 22
23INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 23INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
24INSTALLATION_DIRS+= share/doc/mercurial 24INSTALLATION_DIRS+= share/doc/mercurial
25 25
26PYTHON_SELF_CONFLICT= yes 26PYTHON_SELF_CONFLICT= yes
27 27
28.include "version.mk" 28.include "version.mk"
29.include "options.mk" 29.include "options.mk"
30 30
31USE_TOOLS+= bash:test 31USE_TOOLS+= bash:test
32# Known test failures as of 6.0.1 32# Known test failures as of 6.0.2
33# test-removeemptydirs.t 33# test-removeemptydirs.t
34# https://bz.mercurial-scm.org/show_bug.cgi?id=6587 34# https://bz.mercurial-scm.org/show_bug.cgi?id=6587
 35# test-http-bad-server.t
 36# https://bz.mercurial-scm.org/show_bug.cgi?id=6643
 37# test-wireproto-content-redirects.t
 38# test-http-protocol.t
 39# test-wireproto-command-capabilities.t
 40# test-http-api-httpv2.t
 41# https://bz.mercurial-scm.org/show_bug.cgi?id=6644
 42# test-https.t
 43# test-patchbomb-tls.t
 44# https://bz.mercurial-scm.org/show_bug.cgi?id=6645
 45# test-paths.t
 46# test-hgrc.t
 47# test-parseindex.t
 48# test-patchbomb-tls.t
 49# https://bz.mercurial-scm.org/show_bug.cgi?id=6646
35# 50#
36# Ran 899 tests, 81 skipped, 1 failed. 51# Ran 899 tests, 81 skipped, 11 failed.
37 52
38TEST_TARGET= tests 53TEST_TARGET= tests
39TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} 54TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
40 55
41post-install: 56post-install:
42 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 57 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
43 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 58 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
44 ${INSTALL_DATA} ${WRKSRC}/README.rst \ 59 ${INSTALL_DATA} ${WRKSRC}/README.rst \
45 ${DESTDIR}${PREFIX}/share/doc/mercurial 60 ${DESTDIR}${PREFIX}/share/doc/mercurial
46 61
47.include "../../lang/python/egg.mk" 62.include "../../lang/python/egg.mk"
48.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.112 -r1.113 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2022/01/16 23:51:14 1.112
+++ pkgsrc/devel/py-mercurial/distinfo 2022/02/15 10:21:30 1.113
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.112 2022/01/16 23:51:14 wiz Exp $ 1$NetBSD: distinfo,v 1.113 2022/02/15 10:21:30 wiz Exp $
2 2
3BLAKE2s (mercurial-6.0.1.tar.gz) = 369fbf489af1aea5e6bda1ebf83dadb7b92c854c9b4a7d528ebf257e5f212a78 3BLAKE2s (mercurial-6.0.2.tar.gz) = ad5729c2bdeb244212c40046bd2f4afced85668941db0b7edf64b0126c1781ff
4SHA512 (mercurial-6.0.1.tar.gz) = dae18c38e7df001177867ed9cb1c9cea6f25fff6c23fd307c56c89bba0e4641d6cf993aabefe1fcb6ab99bd32732b858411f722bea839690fbc04c0a91c1dc53 4SHA512 (mercurial-6.0.2.tar.gz) = 1591618840a3e4b862f0eb9e560d511b59eb34815de2e6e6cc1179d32f88a1e9a6f14abf3e02d76e17dbab1ffe384e52d97721e39da252ac5ba98a2233853c9a
5Size (mercurial-6.0.1.tar.gz) = 8072365 bytes 5Size (mercurial-6.0.2.tar.gz) = 8089180 bytes
cvs diff -r1.30 -r1.31 pkgsrc/devel/py-mercurial/version.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/version.mk 2022/01/16 23:51:14 1.30
+++ pkgsrc/devel/py-mercurial/version.mk 2022/02/15 10:21:30 1.31
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: version.mk,v 1.30 2022/01/16 23:51:14 wiz Exp $ 1# $NetBSD: version.mk,v 1.31 2022/02/15 10:21:30 wiz Exp $
2 2
3VERSION= 6.0.1 3VERSION= 6.0.2