py-mercurial: update to 5.1.

This is an overview of the 5.1 release.

1. New Features

    New config commands.commit.post-status shows status after
    successful commit.

    hg root now has templating support, including support for
    showing where a repo share's source is. See hg help -v root
    for details.

    New --force-close-branch flag for hg commit to forcibly close
    branch from a non-head changeset.

    The curses-based interface for commands like hg commit -i now
    supports a range-select mechanism. Select the first line using
    space like before, navigate to the last line, and press X
    (capital x) to set all items in the range at once. Lowercase
    x has been added as a synonym for space to help reinforce the
    mechanism, and pressing enter/return continues to be a synonym
    for "toggle the current line and move down to the next item in
    this section."

2. New Experimental Features

    New config experimental.log.topo makes hg log -G use topological
    sorting. This is especially useful for aliases since it lets
    the alias accept an -r option while still using topological
    sorting with or without the -r (unlike if you use the `sort(...,
    topo)` revset).

3. Bug Fixes

    issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}
    in template show wrong files on merged revision". See details
    in "Backwards Compatibility Changes".

4. Backwards Compatibility Changes

    Removed (experimental) support for log graph lines mixing
    parent/grandparent styles. Setting e.g. experimental.graphstyle.parent
    = ! and experimental.graphstyle.grandparent = 3. would use !
    for the first three lines of the graph and then .. This is no
    longer supported.

    If ui.origbackuppath had been (incorrectly) configured to point
    to a file, we will now replace that file by a directory and
    put backups in that directory. This is similar to how we would
    previously replace files *in* the configured directory by
    subdirectories.

    Template keyword {file_mods}, {file_adds}, and {file_dels} have
    changed behavior on merge commits. They used to be relative to
    the first parent, but they now consider both parents. {file_adds}
    shows files that exists in the commit but did not exist in
    either parent. {file_dels} shows files that do not exist in
    the commit but existed in either parent. {file_mods} show the
    remaining files from {files} that were not in the other two
    sets.

5. Internal API Changes

    Matchers are no longer iterable. Use match.files() instead.

    match.visitdir() and match.visitchildrenset() now expect the
    empty string instead of '.' to indicate the root directory.

    util.dirs() and util.finddirs() now include an entry for the
    root directory (empty string).

    shelve is no longer an extension now. it will be turned on by
    default.

    New API to manage unfinished operations: Earlier there were
    distinct APIs which dealt with unfinished states and separate
    lists maintaining them that are cmdutil.afterresolvestates,
    cmdutil.unfinishedstates and cmdutil.STATES. Now these have
    been unified to a single API which handles the various states
    and their utilities. This API has been added to state.py. Now
    instead of adding to these 3 lists independently a state for
    a new operation can be registered using addunfinished() in
    state module.

    cmdutil.checkunfinished() now includes detection for merge too.
    merge abort has been disallowed in case an operation of higher
    precedence is in progress to avoid cases of partial abort of
    operations.

    We used to automatically attempt to make extensions compatible
    with Python 3 (by translating their source code while loading
    it). We no longer do that.

4 files changed, 15 insertions, 12 deletions

diff --git a/devel/py-mercurial/Makefile b/devel/py-mercurial/Makefile
index 47808f97c89..67bce39f83d 100644
--- a/devel/py-mercurial/Makefile
+++ b/devel/py-mercurial/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/07/14 10:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/08/16 12:59:02 wiz Exp $
 
 DISTNAME=	mercurial-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -26,6 +26,8 @@ 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}
 
diff --git a/devel/py-mercurial/PLIST b/devel/py-mercurial/PLIST
index 5c2c1c4aa03..707b9d0fc4f 100644
--- a/devel/py-mercurial/PLIST
+++ b/devel/py-mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2019/05/21 20:55:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2019/08/16 12:59:02 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -391,9 +391,6 @@ ${PYSITELIB}/hgext/schemes.pyo
 ${PYSITELIB}/hgext/share.py
 ${PYSITELIB}/hgext/share.pyc
 ${PYSITELIB}/hgext/share.pyo
-${PYSITELIB}/hgext/shelve.py
-${PYSITELIB}/hgext/shelve.pyc
-${PYSITELIB}/hgext/shelve.pyo
 ${PYSITELIB}/hgext/show.py
 ${PYSITELIB}/hgext/show.pyc
 ${PYSITELIB}/hgext/show.pyo
@@ -629,6 +626,7 @@ ${PYSITELIB}/mercurial/help/internals/changegroups.txt
 ${PYSITELIB}/mercurial/help/internals/config.txt
 ${PYSITELIB}/mercurial/help/internals/extensions.txt
 ${PYSITELIB}/mercurial/help/internals/linelog.txt
+${PYSITELIB}/mercurial/help/internals/mergestate.txt
 ${PYSITELIB}/mercurial/help/internals/requirements.txt
 ${PYSITELIB}/mercurial/help/internals/revlogs.txt
 ${PYSITELIB}/mercurial/help/internals/wireprotocol.txt
@@ -874,6 +872,9 @@ ${PYSITELIB}/mercurial/server.pyo
 ${PYSITELIB}/mercurial/setdiscovery.py
 ${PYSITELIB}/mercurial/setdiscovery.pyc
 ${PYSITELIB}/mercurial/setdiscovery.pyo
+${PYSITELIB}/mercurial/shelve.py
+${PYSITELIB}/mercurial/shelve.pyc
+${PYSITELIB}/mercurial/shelve.pyo
 ${PYSITELIB}/mercurial/similar.py
 ${PYSITELIB}/mercurial/similar.pyc
 ${PYSITELIB}/mercurial/similar.pyo
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index 6c0796e6992..e501f9bbdb3 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.77 2019/07/14 10:59:35 wiz Exp $
+$NetBSD: distinfo,v 1.78 2019/08/16 12:59:02 wiz Exp $
 
-SHA1 (mercurial-5.0.2.tar.gz) = 81a7e9fd4e8ce206688a9a89cb1a066d7c8841d1
-RMD160 (mercurial-5.0.2.tar.gz) = 4c1c54e846d6cfcbe9ef0330be5f33eaee007c5f
-SHA512 (mercurial-5.0.2.tar.gz) = 8b328e2e5a2896b690492d75c055bb13cd76df6efb087ef770f60ead86e30f7d952cb3ca82a696c0c5ce7039c319bd0fc9b448a52c079653622760317d5bb315
-Size (mercurial-5.0.2.tar.gz) = 7202797 bytes
+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
diff --git a/devel/py-mercurial/version.mk b/devel/py-mercurial/version.mk
index 033f2ca2152..8b2babad76a 100644
--- a/devel/py-mercurial/version.mk
+++ b/devel/py-mercurial/version.mk
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.3 2019/07/14 10:59:35 wiz Exp $
+# $NetBSD: version.mk,v 1.4 2019/08/16 12:59:02 wiz Exp $
 
-VERSION=	5.0.2
+VERSION=	5.1
 
 PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # 5.0 has "beta" support for python 3
 # see https://www.mercurial-scm.org/wiki/Python3