Updated py-mercurial to 4.0.

1. Features

    The following commands now also have experimental formatter support: 'hg version', 'hg grep' and 'hg config'
    New template keywords and functions: termwidth, mod(a, b), relpath(path)
    Basic arithmetic operations in template such as termwidth - 10
    follow() revset takes new startrev parameter
    Bash completion now allows skipping potentially expensive status call for completing 'hg status' arguments, using $HGCOMPLETE_NOSTATUS environment variable

2. Improvements

    A number of changes were made to move and copy tracking, to make sure move and copy information is not lost during commands like 'hg graft'
    Compound revset expression is now properly ordered
    Python 3 support has received a lot of improvements (but will take a lot of additional work)
    zlib performance in hgweb is improved, and it's possible to control zlib compression level using server.zliblevel option

Detailed changelog:

1.1. commands

    annotate: calculate line count correctly
    branchmap: acquires lock before writting the rev branch cache
    clone: set default path correctly when doing a clone+share (issue5378)
    copy: distinguish "file exists" cases and add a hint (BC)
    commit: return 1 for interactive commit with no changes (issue5397)
    config: add template support
    debugobsolete: add formatter support (issue5134)
    files: change documentation to match its behaviour (issue5276)
    grep: add formatter support
    help: show content for explicitly disabled extension (issue5228)
    import: abort instead of crashing when copy source does not exist (issue5375)
    import: report directory-relative paths in error messages (issue5224)
    log: copy the way of ancestor traversal to --follow matcher (issue5376)
    log: preserve topo sort in graph even if additional filter options specified
    merge: add conflict labels to merge command
    merge: avoid superfluous filemerges when grafting through renames (issue5407)
    strip: report both bundle files in case of exception (issue5368)
    tag: clarify warning about making a tag on a branch head
    version: add formatter support
    flags: allow specifying --no-boolean-flag on the command line (BC)

1.2. core

    changelog: disable delta chains
    copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
    formatter: add function to convert list to appropriate format (issue5217)
    lock: show more detail for new-style locks in lock waiting message (issue4752)
    revset: do not rewrite ':y' to '0:y' (issue5385)
    revset: fix order of nested '_(|int|hex)list' expression (BC)
    revset: fix order of nested 'or' expression (BC)
    revset: fix order of nested 'range' expression (BC)
    revset: make reverse() and sort() no-ops when ordering requirement allows (BC)
    revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)
    templater: provide a termwidth keyword (issue5395)
    templater: add inheritance support to style maps
    templater: add relpath() to convert repo path to relative path (issue5394)
    templater: make pad() evaluate boolean argument (BC)
    wireproto: unescape argument names in batch command (BC)

1.3. extensions

    journal: properly check for held lock (issue5349)
    journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
    journal: use fm.formatlist() to pass hashes in appropriate type (BC)
    journal: use fm.hexfunc() to get full hash in JSON/template output (BC)
    largefiles: fix 'deleted' files sometimes persistently appearing with R status
    largefiles: handle that a found standin file doesn't exist when removing it
    largefiles: more safe handling of interruptions while updating modifications
    largefiles: when setting/clearing x bit on largefiles, don't change other bits
    mq: release lock after transaction in qrefresh
    mq: take wlock when 'qqueue' is doing write operations
    rebase: properly calculate total commits to rebase (issue5347)
    rebase: rebase changesets in topo order (issue5370) (BC)

1.4. hgweb

    hgweb: avoid line wrap between revision and annotate-info (issue5398)
    hgweb: config option to control zlib compression level

3 files changed, 12 insertions, 8 deletions

diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 6e5eae28c8e..27650fe8ca2 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.40 2016/10/02 22:17:07 wiz Exp $
+# $NetBSD: Makefile.version,v 1.41 2016/11/03 11:13:36 wiz Exp $
 
-VERSION=	3.9.2
+VERSION=	4.0
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 3.9
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions
diff --git a/devel/py-mercurial/PLIST b/devel/py-mercurial/PLIST
index 51bd035e74b..4dc0c29a8d2 100644
--- a/devel/py-mercurial/PLIST
+++ b/devel/py-mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2016/08/02 23:30:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/11/03 11:13:36 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -364,6 +364,7 @@ ${PYSITELIB}/mercurial/help/internals/bundles.txt
 ${PYSITELIB}/mercurial/help/internals/changegroups.txt
 ${PYSITELIB}/mercurial/help/internals/requirements.txt
 ${PYSITELIB}/mercurial/help/internals/revlogs.txt
+${PYSITELIB}/mercurial/help/internals/wireprotocol.txt
 ${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
@@ -503,6 +504,9 @@ ${PYSITELIB}/mercurial/policy.pyo
 ${PYSITELIB}/mercurial/posix.py
 ${PYSITELIB}/mercurial/posix.pyc
 ${PYSITELIB}/mercurial/posix.pyo
+${PYSITELIB}/mercurial/profiling.py
+${PYSITELIB}/mercurial/profiling.pyc
+${PYSITELIB}/mercurial/profiling.pyo
 ${PYSITELIB}/mercurial/progress.py
 ${PYSITELIB}/mercurial/progress.pyc
 ${PYSITELIB}/mercurial/progress.pyo
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index afe560969d4..213beec05e5 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.41 2016/10/02 22:17:07 wiz Exp $
+$NetBSD: distinfo,v 1.42 2016/11/03 11:13:36 wiz Exp $
 
-SHA1 (mercurial-3.9.2.tar.gz) = 2463499c7c8e416c5044cc168a421fcbbdd2da09
-RMD160 (mercurial-3.9.2.tar.gz) = 9d36ac2caa701c79648e841f301e8e3f35530a7d
-SHA512 (mercurial-3.9.2.tar.gz) = 2217b492216bc640366bf4bfa65bb50d2b7f384d70c59fd1fb138482cbee4768c83a444233958a7ad95e9cd0dcbe3e676d7ff4a8a4019b9773205f8f2500235e
-Size (mercurial-3.9.2.tar.gz) = 4798958 bytes
+SHA1 (mercurial-4.0.tar.gz) = 6d213973e4ea136391818dba0f1f8a88da1a8c24
+RMD160 (mercurial-4.0.tar.gz) = a087ce4a2372aca0e7fbda3336d8d50a9388db33
+SHA512 (mercurial-4.0.tar.gz) = 8c1974a00efc4d0bcdaca1ce86a172528de58857ac0a78d8cac5c1182dcdd340c7f0f680c8dba82d384ffd3557abbfbdc2e473b5b0b8f05160bd6dbb915e76e4
+Size (mercurial-4.0.tar.gz) = 4850316 bytes