CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 18 08:35:47 UTC 2019

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-combination.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.32 pkgsrc/devel/py-mercurial/Makefile:1.33
--- pkgsrc/devel/py-mercurial/Makefile:1.32     Fri Aug 16 12:59:02 2019
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Aug 18 08:35:47 2019
@@ -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 @@ INSTALLATION_DIRS+=   share/doc/mercurial
 # 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}
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.78 pkgsrc/devel/py-mercurial/distinfo:1.79
--- pkgsrc/devel/py-mercurial/distinfo:1.78     Fri Aug 16 12:59:02 2019
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Aug 18 08:35:47 2019
@@ -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

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-combination.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-combination.t:1.1
--- /dev/null   Sun Aug 18 08:35:47 2019
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-merge-combination.t      Sun Aug 18 08:35:47 2019
@@ -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\""