CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 11 23:07:03 UTC 2021

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_test-merge-tools.t

Log Message:
py-mercurial: add patch fixing another test case.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-tools.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.52 pkgsrc/devel/py-mercurial/Makefile:1.53
--- pkgsrc/devel/py-mercurial/Makefile:1.52     Sun Apr 11 22:55:42 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Apr 11 23:07:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2021/04/11 22:55:42 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2021/04/11 23:07:03 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -40,7 +40,7 @@ USE_TOOLS+=           bash:test
 # test-archive.t:
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6499
 #
-# Ran 868 tests, 80 skipped, 2 failed.
+# Ran 868 tests, 80 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.100 pkgsrc/devel/py-mercurial/distinfo:1.101
--- pkgsrc/devel/py-mercurial/distinfo:1.100    Sun Apr 11 22:55:42 2021
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Apr 11 23:07:03 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2021/04/11 22:55:42 wiz Exp $
+$NetBSD: distinfo,v 1.101 2021/04/11 23:07:03 wiz Exp $
 
 SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178
 RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df
@@ -7,4 +7,5 @@ Size (mercurial-5.7.1.tar.gz) = 7900727 
 SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
 SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f
 SHA1 (patch-tests_test-convert-cvs.t) = 36423cbc58f5fea71f37e3a846fb2144924f6a45
+SHA1 (patch-tests_test-merge-tools.t) = 4d5386e8c3caebc683f73fb0edd26d7c93952c79
 SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-tools.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-tools.t:1.3
--- /dev/null   Sun Apr 11 23:07:03 2021
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-tools.t    Sun Apr 11 23:07:03 2021
@@ -0,0 +1,25 @@
+$NetBSD: patch-tests_test-merge-tools.t,v 1.3 2021/04/11 23:07:03 wiz Exp $
+
+Fix python interpreter.
+https://bz.mercurial-scm.org/show_bug.cgi?id=6480
+
+--- tests/test-merge-tools.t.orig      2021-03-09 05:48:58.000000000 +0000
++++ tests/test-merge-tools.t
+@@ -1921,7 +1921,7 @@ Verify naming of temporary files and tha
+ Binary files capability checking
+ 
+   $ hg update -q -C 0
+-  $ python <<EOF
++  $ $PYTHON <<EOF
+   > with open('b', 'wb') as fp:
+   >     fp.write(b'\x00\x01\x02\x03')
+   > EOF
+@@ -1929,7 +1929,7 @@ Binary files capability checking
+   $ hg commit -qm "add binary file (#1)"
+ 
+   $ hg update -q -C 0
+-  $ python <<EOF
++  $ $PYTHON <<EOF
+   > with open('b', 'wb') as fp:
+   >     fp.write(b'\x03\x02\x01\x00')
+   > EOF