CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 11 22:55:42 UTC 2021

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

Log Message:
py-mercurial: add a patch to fix a self-test.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.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.51 pkgsrc/devel/py-mercurial/Makefile:1.52
--- pkgsrc/devel/py-mercurial/Makefile:1.51     Wed Mar 17 11:23:52 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Apr 11 22:55:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2021/03/17 11:23:52 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2021/04/11 22:55:42 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, 3 failed.
+# Ran 868 tests, 80 skipped, 2 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.99 pkgsrc/devel/py-mercurial/distinfo:1.100
--- pkgsrc/devel/py-mercurial/distinfo:1.99     Wed Mar 17 11:23:52 2021
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Apr 11 22:55:42 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2021/03/17 11:23:52 wiz Exp $
+$NetBSD: distinfo,v 1.100 2021/04/11 22:55:42 wiz Exp $
 
 SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178
 RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df
@@ -6,4 +6,5 @@ SHA512 (mercurial-5.7.1.tar.gz) = d887e2
 Size (mercurial-5.7.1.tar.gz) = 7900727 bytes
 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-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t:1.3
--- /dev/null   Sun Apr 11 22:55:42 2021
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t    Sun Apr 11 22:55:42 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-convert-cvs.t,v 1.3 2021/04/11 22:55:42 wiz Exp $
+
+Fix python interpreter.
+https://bz.mercurial-scm.org/show_bug.cgi?id=6480
+
+--- tests/test-convert-cvs.t.orig      2021-03-09 05:48:58.000000000 +0000
++++ tests/test-convert-cvs.t
+@@ -521,7 +521,7 @@ Commit messages of version 1.2 - 1.4 use
+ |cp932     |\x82\xa0      |  x      x     o    |
+ 
+   $ mkdir -p cvsrepo/transcoding
+-  $ python <<EOF
++  $ $PYTHON <<EOF
+   > fp = open('cvsrepo/transcoding/file,v', 'wb')
+   > fp.write((b'''
+   > head      1.4;