[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: add an upstream patch...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d9556db2ebf
branches:  trunk
changeset: 399886:2d9556db2ebf
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Aug 18 08:35:47 2019 +0000

description:
py-mercurial: add an upstream patch that fixes a test case on *BSD.

diffstat:

 devel/py-mercurial/Makefile                                     |   4 +-
 devel/py-mercurial/distinfo                                     |   3 +-
 devel/py-mercurial/patches/patch-tests_test-merge-combination.t |  16 ++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 7e4d2b810452 -r 2d9556db2ebf devel/py-mercurial/Makefile
--- a/devel/py-mercurial/Makefile       Sun Aug 18 08:25:17 2019 +0000
+++ b/devel/py-mercurial/Makefile       Sun Aug 18 08:35:47 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/08/16 12:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/08/18 08:35:47 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -26,8 +26,6 @@
 # Known test failures:
 # test-narrow-shallow (sometimes):
 # https://bz.mercurial-scm.org/show_bug.cgi?id=6150
-# test-merge-combination:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6186
 do-test:
        cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 
diff -r 7e4d2b810452 -r 2d9556db2ebf devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Sun Aug 18 08:25:17 2019 +0000
+++ b/devel/py-mercurial/distinfo       Sun Aug 18 08:35:47 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.78 2019/08/16 12:59:02 wiz Exp $
+$NetBSD: distinfo,v 1.79 2019/08/18 08:35:47 wiz Exp $
 
 SHA1 (mercurial-5.1.tar.gz) = 516800a18bb4e81ba6e4ba5d12cc5807d51bcc0a
 RMD160 (mercurial-5.1.tar.gz) = 23f05ca435a332a9db0e1f42f4841656d463acdf
 SHA512 (mercurial-5.1.tar.gz) = cf7a64a181eeb3dc8f24067ea032fb17504358a9ed08cb50ac041e66ef20426c060d997cb5d30e7582874135b0a351b3e58d7297aaa4e009aabbf562a1ab9fae
 Size (mercurial-5.1.tar.gz) = 7283396 bytes
+SHA1 (patch-tests_test-merge-combination.t) = 3753d014c17a16c9cdc0fdb0aa11739980fc5d9f
diff -r 7e4d2b810452 -r 2d9556db2ebf devel/py-mercurial/patches/patch-tests_test-merge-combination.t
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-mercurial/patches/patch-tests_test-merge-combination.t   Sun Aug 18 08:35:47 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-merge-combination.t,v 1.1 2019/08/18 08:35:47 wiz Exp $
+
+Fix test case on *BSD.
+https://phab.mercurial-scm.org/D6729
+
+--- tests/test-merge-combination.t.orig        2019-08-01 16:14:49.000000000 +0000
++++ tests/test-merge-combination.t
+@@ -57,7 +57,7 @@ revision. "C" indicates that hg merge ha
+   >                fi
+   >           else expected=a
+   >           fi
+-  >           got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
++  >           got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
+   >           if [ "$got" = "$expected" ]
+   >           then echo "$line$conflicts: agree on \"$got\""
+   >           else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""