CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 10 19:32:13 UTC 2018

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile Makefile.version distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_list-tree.py
            patch-tests_test-largefiles-misc.t

Log Message:
py-mercurial: update to 4.4.2.

Add upstream patch to fix a test case.

Mercurial 4.4.2 (2017-12-01)

This is a regularly-scheduled bugfix release.

1.1. Notable changes

1.1.1. Stricter command option parsing

Mercurial can now optionally parse "early" options (-R/--repository,
--cwd, --config, --debugger, and --profile) more strictly, for more
secure integration with tools that invoke 'hg' commands. Setting
HGPLAIN=+strictflags will parse these options more strictly, which
prevents them from being injected as arguments to other flags.

1.2. Bug fixes

    'hg amend' now correctly handles deleted and removed files, as
    well as subrepos. (issue5732, issue5677)
    largefiles now correctly handles dropped standin files when
    updating largefiles.

    Fixed an issue with deleting symlinks to directories when
    ui.origbackuppath is set. (issue5731)

1.3. Performance improvements

    Improved performance in path conflict checking introduced in
    Mercurial 4.4. (issue5716)


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/py-mercurial/Makefile.version
cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_list-tree.py \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-largefiles-misc.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.19 pkgsrc/devel/py-mercurial/Makefile:1.20
--- pkgsrc/devel/py-mercurial/Makefile:1.19     Fri Dec  8 21:24:26 2017
+++ pkgsrc/devel/py-mercurial/Makefile  Wed Jan 10 19:32:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/12/08 21:24:26 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/10 19:32:13 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -24,10 +24,10 @@ INSTALLATION_DIRS+= share/doc/mercurial
 .include "Makefile.version"
 
 # Known test failures:
-# test-status-color.t:
-# https://bz.mercurial-scm.org/show_bug.cgi?id=5698
 # test-run-tests.t:
 # https://bz.mercurial-scm.org/show_bug.cgi?id=5735
+# test-status-color.t:
+# https://bz.mercurial-scm.org/show_bug.cgi?id=5698
 do-test:
        cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
 

Index: pkgsrc/devel/py-mercurial/Makefile.version
diff -u pkgsrc/devel/py-mercurial/Makefile.version:1.54 pkgsrc/devel/py-mercurial/Makefile.version:1.55
--- pkgsrc/devel/py-mercurial/Makefile.version:1.54     Thu Nov 23 20:44:47 2017
+++ pkgsrc/devel/py-mercurial/Makefile.version  Wed Jan 10 19:32:13 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.version,v 1.54 2017/11/23 20:44:47 wiz Exp $
+# $NetBSD: Makefile.version,v 1.55 2018/01/10 19:32:13 wiz Exp $
 
-VERSION=       4.4.1
+VERSION=       4.4.2
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 3.9
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 4.3
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions
-# 3.x support is not planned for the near future
 #
 # the following setup argument was requested when compiling
 # for python-3.x

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.56 pkgsrc/devel/py-mercurial/distinfo:1.57
--- pkgsrc/devel/py-mercurial/distinfo:1.56     Thu Nov 23 20:44:47 2017
+++ pkgsrc/devel/py-mercurial/distinfo  Wed Jan 10 19:32:13 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.56 2017/11/23 20:44:47 wiz Exp $
+$NetBSD: distinfo,v 1.57 2018/01/10 19:32:13 wiz Exp $
 
-SHA1 (mercurial-4.4.1.tar.gz) = 99fedcebccdb53f67aefaba5cdade9e84d79cf7e
-RMD160 (mercurial-4.4.1.tar.gz) = 7f7affb0e86e096f60a8cdec1fd16ac2037e9087
-SHA512 (mercurial-4.4.1.tar.gz) = 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8
-Size (mercurial-4.4.1.tar.gz) = 5636532 bytes
+SHA1 (mercurial-4.4.2.tar.gz) = df543ee5bfef9ac224e2b3c108d3d2df234b043f
+RMD160 (mercurial-4.4.2.tar.gz) = 34c671ff1f2034c548c65a293fa563013a79482e
+SHA512 (mercurial-4.4.2.tar.gz) = 3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993
+Size (mercurial-4.4.2.tar.gz) = 5647013 bytes
+SHA1 (patch-tests_list-tree.py) = be9749aa09490efa28cb7cc9231fa3acf85afc7d
+SHA1 (patch-tests_test-largefiles-misc.t) = f05ab87c76b51fe2a784a86d872d8e19bde30193

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_list-tree.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_list-tree.py:1.1
--- /dev/null   Wed Jan 10 19:32:13 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_list-tree.py  Wed Jan 10 19:32:13 2018
@@ -0,0 +1,35 @@
+$NetBSD: patch-tests_list-tree.py,v 1.1 2018/01/10 19:32:13 wiz Exp $
+
+From upstream:
+tests: write and use a custom helper script to avoid find's -printf.
+
+--- tests/list-tree.py.orig    2018-01-10 14:21:58.440677374 +0000
++++ tests/list-tree.py
+@@ -0,0 +1,27 @@
++from __future__ import (
++    absolute_import,
++    print_function,
++)
++
++import argparse
++import os
++
++ap = argparse.ArgumentParser()
++ap.add_argument('path', nargs='+')
++opts = ap.parse_args()
++
++def gather():
++    for p in opts.path:
++        if not os.path.exists(p):
++            return
++        if os.path.isdir(p):
++            yield p + os.path.sep
++            for dirpath, dirs, files in os.walk(p):
++                for d in dirs:
++                    yield os.path.join(dirpath, d) + os.path.sep
++                for f in files:
++                    yield os.path.join(dirpath, f)
++        else:
++            yield p
++
++print('\n'.join(sorted(gather())))
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-largefiles-misc.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-largefiles-misc.t:1.1
--- /dev/null   Wed Jan 10 19:32:13 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-largefiles-misc.t        Wed Jan 10 19:32:13 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-tests_test-largefiles-misc.t,v 1.1 2018/01/10 19:32:13 wiz Exp $
+
+From upstream:
+tests: write and use a custom helper script to avoid find's -printf.
+
+--- tests/test-largefiles-misc.t.orig  2017-12-01 19:49:46.000000000 +0000
++++ tests/test-largefiles-misc.t
+@@ -1095,8 +1095,7 @@ largefiles (issue4547)
+ Move (and then undo) a directory move with only largefiles.
+ 
+   $ listtree() {
+-  >   find $@ \( -type d -printf "%p/\n" -o -type f -printf "%p\n" \) \
+-  >           -a -name .hg -prune | sort
++  >   $PYTHON $TESTDIR/list-tree.py $@
+   > }
+ 
+   $ cd subrepo-root