CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 20 22:14:01 UTC 2022

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo version.mk

Log Message:
py-mercurial: update to 6.1.1.

= Mercurial 6.1.1 =

 * Fix Rust compilation on `aarcch64`
 * Fix Rust compilation on architectures where `char` is unsigned
 * When the merge tool uses `$output`, don't leave markers in `$local`
 * Improve test suite support on big-endian platforms
 * Cap the number of concurrent threads to 16 in Rust `hg status` to prevent huge speed regression at higher thread counts
 * Fix `amend` with copies in extras
 * Abort if commit we're trying to `unamend` was not created by `hg [un]amend`
 * Fix file name in the pullbundle help text
 * Fix an issue with data not being correctly reset in the C implementation of dirstate-v2
 * Fix issue6673 where some tags were missing from cache after a merge
 * Fix stream-cloning a repo with empty requirements
 * Fix a false warning about content-divergence creation
 * Fix silly blackbox entries when hg is interrupted
 * Fix unsoundness (no known exploits) in Rust extensions (see cfd270d83169 and dd6b67d5c256)
 * Fix Rust dirstate counters not being updated correctly leading to some potential bugs (none known)
 * Stop relying on a compiler implementation detail in Rust HgPath


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-mercurial/version.mk

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.69 pkgsrc/devel/py-mercurial/Makefile:1.70
--- pkgsrc/devel/py-mercurial/Makefile:1.69     Tue Mar  8 11:05:09 2022
+++ pkgsrc/devel/py-mercurial/Makefile  Wed Apr 20 22:14:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2022/03/08 11:05:09 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2022/04/20 22:14:01 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -29,7 +29,7 @@ PYTHON_SELF_CONFLICT= yes
 .include "options.mk"
 
 USE_TOOLS+=            bash:test
-# Known test failures as of 6.1
+# Known test failures as of 6.1.1
 # test-run-tests.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6661
 # test-http-bad-server.t
@@ -46,8 +46,10 @@ USE_TOOLS+=          bash:test
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6587
 # test-status-tracked-key.t
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6662
+# test-demandimport.py:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=6680
 #
-# Ran 883 tests, 82 skipped, 9 failed.
+# Ran 883 tests, 82 skipped, 10 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.115 pkgsrc/devel/py-mercurial/distinfo:1.116
--- pkgsrc/devel/py-mercurial/distinfo:1.115    Tue Mar  8 11:05:09 2022
+++ pkgsrc/devel/py-mercurial/distinfo  Wed Apr 20 22:14:01 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.115 2022/03/08 11:05:09 wiz Exp $
+$NetBSD: distinfo,v 1.116 2022/04/20 22:14:01 wiz Exp $
 
-BLAKE2s (mercurial-6.1.tar.gz) = 17e4f3b712b46f989a01bb58f9699bd30610328d91e8ee0bc6e9aea7c431994a
-SHA512 (mercurial-6.1.tar.gz) = 489b2c893bcfd243d9825cd78f1d8b6e0eddccdf92d16cbdbdb2ade40150b599a6d5df213e06d50c31489ee6c5203e35f21892b6439d9190757d5a36c6422338
-Size (mercurial-6.1.tar.gz) = 8061104 bytes
+BLAKE2s (mercurial-6.1.1.tar.gz) = 24ea22c9b1db688abd5e4200d391dbec740ee0f62de5c372d0ab9bca6461c822
+SHA512 (mercurial-6.1.1.tar.gz) = 644c65b2eadf3d4ea4b7c52188f548d86a584d0aa85615d872b05bf0eeee6f65d014934dda0e04c6820d0cf347f491386385e67c98839ada7b2b4038a1190d16
+Size (mercurial-6.1.1.tar.gz) = 8063346 bytes

Index: pkgsrc/devel/py-mercurial/version.mk
diff -u pkgsrc/devel/py-mercurial/version.mk:1.33 pkgsrc/devel/py-mercurial/version.mk:1.34
--- pkgsrc/devel/py-mercurial/version.mk:1.33   Tue Mar  8 11:05:09 2022
+++ pkgsrc/devel/py-mercurial/version.mk        Wed Apr 20 22:14:01 2022
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.33 2022/03/08 11:05:09 wiz Exp $
+# $NetBSD: version.mk,v 1.34 2022/04/20 22:14:01 wiz Exp $
 
-VERSION=       6.1
+VERSION=       6.1.1