Fri Sep 9 17:24:41 2022 UTC ()
py-mercurial: update to 6.2.2.

Mercurial 6.2.2

    fsmonitor: restore functionality by moving to new dirstate APIs
    dirstate-v2: fix data file transaction handling (issue6730)
    rust: fix behavior when matching files with multiple includes
    rust: widen range of compatible crates to help with packaging
    rust-status: ignored directories are now correctly only listed if opted into
    automation: improve Windows packaging tooling
    contrib: update Mercurial install in bootstrap environment
    Remove flakiness in some tests
    Improve portability of certain tar uses in tests


(wiz)
diff -r1.73 -r1.74 pkgsrc/devel/py-mercurial/Makefile
diff -r1.121 -r1.122 pkgsrc/devel/py-mercurial/distinfo
diff -r1.39 -r1.40 pkgsrc/devel/py-mercurial/version.mk
cvs diff -r1.73 -r1.74 pkgsrc/devel/py-mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Makefile 2022/07/17 09:51:33 1.73
+++ pkgsrc/devel/py-mercurial/Makefile 2022/09/09 17:24:40 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.73 2022/07/17 09:51:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.74 2022/09/09 17:24:40 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
@@ -20,44 +20,47 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0 @@ -20,44 +20,47 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0
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_VERSIONS_INCOMPATIBLE= 27 26PYTHON_VERSIONS_INCOMPATIBLE= 27
27PYTHON_SELF_CONFLICT= yes 27PYTHON_SELF_CONFLICT= yes
28 28
29.include "version.mk" 29.include "version.mk"
30.include "options.mk" 30.include "options.mk"
31 31
32USE_TOOLS+= bash:test 32USE_TOOLS+= bash:test
33# Known test failures as of 6.2 33# Known test failures as of 6.2.2
34# test-run-tests.t 34# test-run-tests.t
35# https://bz.mercurial-scm.org/show_bug.cgi?id=6661 35# https://bz.mercurial-scm.org/show_bug.cgi?id=6661
36# test-http-bad-server.t 36# test-http-bad-server.t
37# https://bz.mercurial-scm.org/show_bug.cgi?id=6643 37# https://bz.mercurial-scm.org/show_bug.cgi?id=6643
38# test-https.t 38# test-https.t
39# https://bz.mercurial-scm.org/show_bug.cgi?id=6726 39# https://bz.mercurial-scm.org/show_bug.cgi?id=6726
 40# test-issue6528.t
 41# test-revlog.t
 42# https://bz.mercurial-scm.org/show_bug.cgi?id=6740
 43# test-hgrc.t
 44# https://bz.mercurial-scm.org/show_bug.cgi?id=6741
40# test-removeemptydirs.t 45# test-removeemptydirs.t
41# https://bz.mercurial-scm.org/show_bug.cgi?id=6587 46# https://bz.mercurial-scm.org/show_bug.cgi?id=6587
42# test-status-tracked-key.t 47# test-status-tracked-key.t
43# https://bz.mercurial-scm.org/show_bug.cgi?id=6662 48# https://bz.mercurial-scm.org/show_bug.cgi?id=6662
44# test-revlog.t 
45# https://bz.mercurial-scm.org/show_bug.cgi?id=6716 
46# test-patchbomb-tls.t: 49# test-patchbomb-tls.t:
47# https://bz.mercurial-scm.org/show_bug.cgi?id=6727 50# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
48# test-demandimport.py: 51# test-demandimport.py:
49# https://bz.mercurial-scm.org/show_bug.cgi?id=6680 52# https://bz.mercurial-scm.org/show_bug.cgi?id=6680
50# 53#
51# Ran 889 tests, 83 skipped, 8 failed. 54# Ran 890 tests, 83 skipped, 10 failed.
52 55
53TEST_TARGET= tests 56TEST_TARGET= tests
54TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} 57TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
55 58
56post-install: 59post-install:
57 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 60 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
58 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 61 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
59 ${INSTALL_DATA} ${WRKSRC}/README.rst \ 62 ${INSTALL_DATA} ${WRKSRC}/README.rst \
60 ${DESTDIR}${PREFIX}/share/doc/mercurial 63 ${DESTDIR}${PREFIX}/share/doc/mercurial
61 64
62.include "../../lang/python/egg.mk" 65.include "../../lang/python/egg.mk"
63.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"
cvs diff -r1.121 -r1.122 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2022/07/31 10:50:11 1.121
+++ pkgsrc/devel/py-mercurial/distinfo 2022/09/09 17:24:40 1.122
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.121 2022/07/31 10:50:11 wiz Exp $ 1$NetBSD: distinfo,v 1.122 2022/09/09 17:24:40 wiz Exp $
2 2
3BLAKE2s (mercurial-6.2.1.tar.gz) = fd0eed715a16d8dc2f13568136c410b930d97f313e5817a7cbf55dffa6d75222 3BLAKE2s (mercurial-6.2.2.tar.gz) = a9f19be96cf0cc332fbb3722c404e70efe7f94f1a8fbbd5279dc3fa91915f727
4SHA512 (mercurial-6.2.1.tar.gz) = 4fd383870e5e5e684d4a74eef461c5b5fbf3c2fb1b62696edeadd3870ca5de1f7dfc9d2fc86a5022c36486640520ab0c8c23e099e08a38497b8345149b2aff37 4SHA512 (mercurial-6.2.2.tar.gz) = b5a89588146b58c8552c20f24a472098c6fbb9863c59571d0e70b1d4cc5ea6d4a29e9660a26dfc87aa5124df9b65182a7c65b8558a21acf0164d0d90358addbd
5Size (mercurial-6.2.1.tar.gz) = 8055451 bytes 5Size (mercurial-6.2.2.tar.gz) = 8057375 bytes
cvs diff -r1.39 -r1.40 pkgsrc/devel/py-mercurial/version.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/version.mk 2022/07/31 10:50:11 1.39
+++ pkgsrc/devel/py-mercurial/version.mk 2022/09/09 17:24:40 1.40
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: version.mk,v 1.39 2022/07/31 10:50:11 wiz Exp $ 1# $NetBSD: version.mk,v 1.40 2022/09/09 17:24:40 wiz Exp $
2 2
3VERSION= 6.2.1 3VERSION= 6.2.2