[pkgsrc/trunk]: pkgsrc/devel/py-mercurial py-mercurial: update to 4.5.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b0caa69a11b
branches:  trunk
changeset: 375421:4b0caa69a11b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 11 16:04:21 2018 +0000

description:
py-mercurial: update to 4.5.

Mercurial 4.5 (2018-02-01)

1.1. New Features

1.1.1. revert --interactive

The revert command now accepts the flag --interactive to allow reverting only some of the changes to the specified files.

1.1.2. Accessing hidden changesets

Set config option 'experimental.directaccess = True' to access hidden changesets from read only commands.

1.1.3. githelp extension

The githelp extension provides the hg githelp command. This command attempts to convert a git command to its Mercurial equivalent. The extension can be useful to Git users new to Mercurial.

1.1.4. Largefiles changes

    largefiles: add a 'debuglfput' command to put largefile into the store
    largefiles: add support for 'largefiles://' url scheme
    largefiles: allow to run 'debugupgraderepo' on repo with largefiles
    largefiles: convert EOL of hgrc before appending to bytes IO
    largefiles: explicitly set the source and sink types to 'hg' for lfconvert
    largefiles: modernize how capabilities are added to the wire protocol

1.2. hgweb changes

hgweb now shows more information about commits: phase (if it's not public), obsolescence status (with a short explanation and links to the successors) and instabilities (e.g. orphan, phase-divergent 
or content-divergent).

Client-side graph code has been simplified by delegating more work to the backend, so /graph page is now more in sync with /log page, visually and feature-wise. Unfortunately, this code change means 
that 3rd-party themes for 4.5+ are required to have graphentry.tmpl template available (copy it from the base theme if you don't use %include and then reference it in map file) and render entries in 
graph.tmpl -- look at one of the core themes to see what it needs to look like. JS functions that create graph vertices and edges are now available in Graph.prototype, making it possible to call the 
original functions from custom theme-specific functions if needed.

Graph now shows different symbols for normal, branch-closing, obsolete and unstable commits, and marks currently checked out commit with a circle around its graph node.

There's also now json-graph API endpoint that can be used for rendering commit graph in 3rd-party applications.

1.2.1. Other Changes

    When interactive revert is run against a revision other than the working directory parent, the diff shown is the diff to <em>apply</em> to the working directory, rather than the diff to 
<em>discard</em> from the working copy. This is in line with related user experiences with 'git' and appears to be less confusing with 'ui.interface=curses'.
    Let 'hg rebase' avoid content-divergence by skipping obsolete changesets (and their descendants) when they are present in the rebase set along with one of their successors but none of their 
successors is in destination.
    A new experimental config flag, 'rebase.experimental.inmemory', makes rebase perform an in-memory merge instead of doing it on-disk in the working copy.

    The HGPLAINEXCEPT environment variable can now include color to allow automatic output colorization in otherwise automated environments.
    A new unamend command in uncommit extension which undoes the effect of the amend command by creating a new changeset which was there before amend and moving the changes that were amended to the 
working directory.
    A '--abort' flag to merge command to abort the ongoing merge.
    An experimental flag '--rev' to 'hg branch' which can be used to change branch of changesets.
    bundle2 read I/O significantly improved
    bundle2 memory use significantly reduced during read
    clonebundle: it is now possible to serve the clonebundle using a git-lfs compatible server.

    templatefilters: add slashpath() to convert path separator to slash (issue5572)
    A new experimental config flag, 'inline-color-diff', adds within-line color diff capacity
    histedit: add support to output nodechanges using formatter to help with editor integrations

1.3. Backwards Compatibility Changes

    log --follow-first -rREV, which is deprecated, now follows the first parent of merge revisions from the specified REV just like log --follow -rREV.

    log --follow -rREV FILE.. now follows file history across copies and renames.
    transaction: register summary callbacks only at start of transaction

    hgweb's graph view no longer supports browsers that lack <canvas> support
    hgweb: only include graph-related data in jsdata variable on /graph pages

    graphlog: add another graph node type, unstable, using character *
    remove: print message for each file in verbose mode only while using '-A'

1.4. Bug Fixes

    Bookmark, whose name is longer than 255, can again be exchanged again between 4.4+ client and servers (issue5165)

    The convert extension works with bzr < 2.6.0 again (issue5733)

    Mercurial will now attempt to use hardlinks on NTFS on Windows (issue4580)

    The revset x^:: is now correctly parsed as (x^):: instead of being an error (issue5764)

    Setting the diff.noprefix configuration option no longer breaks the --stat flag on hg diff (issue5759)

    hg outgoing now honors :pushurl paths from hgrc (issue5365)

    log: translate column labels at once (issue5750)

    patch: improve heuristics to not take the word diff as header (issue1879)

    templater: look up symbols/resources as if they were separated (issue5699)
    http and ssh: support for emitting extra debug logs about requests as they happen

1.5. API Changes

    bundlerepo.bundlerepository.bundle and bundlerepo.bundlerepository.bundlefile are now prefixed with an underscore.
    Rename bundlerepo.bundlerepository.bundlefilespos to _cgfilespos.
    dirstate no longer provides a 'dirs()' method. To test for the existence of a directory in the dirstate, use 'dirstate.hasdir(dirname)'.
    mapping does not contain all template resources. use context.resource() in template functions.

    text=False|True option is dropped from the vfs interface because of Python 3 compatibility issue. Use util.tonativeeol/fromnativeeol() to convert EOL manually.

    wireproto.streamres.__init__ no longer accepts a reader argument. Use the gen argument instead.
    exchange.getbundlechunks() now returns a 2-tuple instead of just an iterator.
    bundle2 parts are no longer seekable by default
    memfilectx: the changectx argument is now mandatory in constructor

diffstat:

 devel/py-mercurial/Makefile.version                           |   4 +-
 devel/py-mercurial/PLIST                                      |  45 +++++-
 devel/py-mercurial/distinfo                                   |  13 +-
 devel/py-mercurial/patches/patch-tests_list-tree.py           |  35 ----
 devel/py-mercurial/patches/patch-tests_run-tests.py           |  86 -----------
 devel/py-mercurial/patches/patch-tests_test-largefiles-misc.t |  17 --
 6 files changed, 47 insertions(+), 153 deletions(-)

diffs (truncated from 344 to 300 lines):

diff -r b730d2dbb972 -r 4b0caa69a11b devel/py-mercurial/Makefile.version
--- a/devel/py-mercurial/Makefile.version       Sun Feb 11 15:55:25 2018 +0000
+++ b/devel/py-mercurial/Makefile.version       Sun Feb 11 16:04:21 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.55 2018/01/10 19:32:13 wiz Exp $
+# $NetBSD: Makefile.version,v 1.56 2018/02/11 16:04:21 wiz Exp $
 
-VERSION=       4.4.2
+VERSION=       4.5
 
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 4.3
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions
diff -r b730d2dbb972 -r 4b0caa69a11b devel/py-mercurial/PLIST
--- a/devel/py-mercurial/PLIST  Sun Feb 11 15:55:25 2018 +0000
+++ b/devel/py-mercurial/PLIST  Sun Feb 11 16:04:21 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/11/07 13:16:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/02/11 16:04:21 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -127,6 +127,9 @@
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.py
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyc
 ${PYSITELIB}/hgext/fsmonitor/watchmanclient.pyo
+${PYSITELIB}/hgext/githelp.py
+${PYSITELIB}/hgext/githelp.pyc
+${PYSITELIB}/hgext/githelp.pyo
 ${PYSITELIB}/hgext/gpg.py
 ${PYSITELIB}/hgext/gpg.pyc
 ${PYSITELIB}/hgext/gpg.pyo
@@ -187,6 +190,18 @@
 ${PYSITELIB}/hgext/largefiles/wirestore.py
 ${PYSITELIB}/hgext/largefiles/wirestore.pyc
 ${PYSITELIB}/hgext/largefiles/wirestore.pyo
+${PYSITELIB}/hgext/lfs/__init__.py
+${PYSITELIB}/hgext/lfs/__init__.pyc
+${PYSITELIB}/hgext/lfs/__init__.pyo
+${PYSITELIB}/hgext/lfs/blobstore.py
+${PYSITELIB}/hgext/lfs/blobstore.pyc
+${PYSITELIB}/hgext/lfs/blobstore.pyo
+${PYSITELIB}/hgext/lfs/pointer.py
+${PYSITELIB}/hgext/lfs/pointer.pyc
+${PYSITELIB}/hgext/lfs/pointer.pyo
+${PYSITELIB}/hgext/lfs/wrapper.py
+${PYSITELIB}/hgext/lfs/wrapper.pyc
+${PYSITELIB}/hgext/lfs/wrapper.pyo
 ${PYSITELIB}/hgext/logtoprocess.py
 ${PYSITELIB}/hgext/logtoprocess.pyc
 ${PYSITELIB}/hgext/logtoprocess.pyo
@@ -232,6 +247,9 @@
 ${PYSITELIB}/hgext/sparse.py
 ${PYSITELIB}/hgext/sparse.pyc
 ${PYSITELIB}/hgext/sparse.pyo
+${PYSITELIB}/hgext/split.py
+${PYSITELIB}/hgext/split.pyc
+${PYSITELIB}/hgext/split.pyo
 ${PYSITELIB}/hgext/strip.py
 ${PYSITELIB}/hgext/strip.pyc
 ${PYSITELIB}/hgext/strip.pyo
@@ -287,6 +305,9 @@
 ${PYSITELIB}/mercurial/byterange.py
 ${PYSITELIB}/mercurial/byterange.pyc
 ${PYSITELIB}/mercurial/byterange.pyo
+${PYSITELIB}/mercurial/cacheutil.py
+${PYSITELIB}/mercurial/cacheutil.pyc
+${PYSITELIB}/mercurial/cacheutil.pyo
 ${PYSITELIB}/mercurial/cext/__init__.py
 ${PYSITELIB}/mercurial/cext/__init__.pyc
 ${PYSITELIB}/mercurial/cext/__init__.pyo
@@ -427,6 +448,7 @@
 ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
 ${PYSITELIB}/mercurial/help/filesets.txt
+${PYSITELIB}/mercurial/help/flags.txt
 ${PYSITELIB}/mercurial/help/glossary.txt
 ${PYSITELIB}/mercurial/help/hg-ssh.8.txt
 ${PYSITELIB}/mercurial/help/hg.1.txt
@@ -522,6 +544,9 @@
 ${PYSITELIB}/mercurial/lock.py
 ${PYSITELIB}/mercurial/lock.pyc
 ${PYSITELIB}/mercurial/lock.pyo
+${PYSITELIB}/mercurial/logexchange.py
+${PYSITELIB}/mercurial/logexchange.pyc
+${PYSITELIB}/mercurial/logexchange.pyo
 ${PYSITELIB}/mercurial/lsprof.py
 ${PYSITELIB}/mercurial/lsprof.pyc
 ${PYSITELIB}/mercurial/lsprof.pyo
@@ -546,6 +571,9 @@
 ${PYSITELIB}/mercurial/mergeutil.py
 ${PYSITELIB}/mercurial/mergeutil.pyc
 ${PYSITELIB}/mercurial/mergeutil.pyo
+${PYSITELIB}/mercurial/minifileset.py
+${PYSITELIB}/mercurial/minifileset.pyc
+${PYSITELIB}/mercurial/minifileset.pyo
 ${PYSITELIB}/mercurial/minirst.py
 ${PYSITELIB}/mercurial/minirst.pyc
 ${PYSITELIB}/mercurial/minirst.pyo
@@ -645,6 +673,9 @@
 ${PYSITELIB}/mercurial/revsetlang.py
 ${PYSITELIB}/mercurial/revsetlang.pyc
 ${PYSITELIB}/mercurial/revsetlang.pyo
+${PYSITELIB}/mercurial/rewriteutil.py
+${PYSITELIB}/mercurial/rewriteutil.pyc
+${PYSITELIB}/mercurial/rewriteutil.pyo
 ${PYSITELIB}/mercurial/scmposix.py
 ${PYSITELIB}/mercurial/scmposix.pyc
 ${PYSITELIB}/mercurial/scmposix.pyo
@@ -654,9 +685,6 @@
 ${PYSITELIB}/mercurial/scmwindows.py
 ${PYSITELIB}/mercurial/scmwindows.pyc
 ${PYSITELIB}/mercurial/scmwindows.pyo
-${PYSITELIB}/mercurial/selectors2.py
-${PYSITELIB}/mercurial/selectors2.pyc
-${PYSITELIB}/mercurial/selectors2.pyo
 ${PYSITELIB}/mercurial/server.py
 ${PYSITELIB}/mercurial/server.pyc
 ${PYSITELIB}/mercurial/server.pyo
@@ -741,6 +769,7 @@
 ${PYSITELIB}/mercurial/templates/gitweb/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/footer.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/graph.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/graphentry.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/header.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/help.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/helptopics.tmpl
@@ -753,6 +782,7 @@
 ${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
 ${PYSITELIB}/mercurial/templates/json/changelist.tmpl
+${PYSITELIB}/mercurial/templates/json/graph.tmpl
 ${PYSITELIB}/mercurial/templates/json/map
 ${PYSITELIB}/mercurial/templates/map-cmdline.bisect
 ${PYSITELIB}/mercurial/templates/map-cmdline.changelog
@@ -775,6 +805,7 @@
 ${PYSITELIB}/mercurial/templates/monoblue/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/footer.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/graph.tmpl
+${PYSITELIB}/mercurial/templates/monoblue/graphentry.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/header.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/help.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/helptopics.tmpl
@@ -799,6 +830,7 @@
 ${PYSITELIB}/mercurial/templates/paper/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/paper/footer.tmpl
 ${PYSITELIB}/mercurial/templates/paper/graph.tmpl
+${PYSITELIB}/mercurial/templates/paper/graphentry.tmpl
 ${PYSITELIB}/mercurial/templates/paper/header.tmpl
 ${PYSITELIB}/mercurial/templates/paper/help.tmpl
 ${PYSITELIB}/mercurial/templates/paper/helptopics.tmpl
@@ -849,6 +881,7 @@
 ${PYSITELIB}/mercurial/templates/spartan/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/footer.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/graph.tmpl
+${PYSITELIB}/mercurial/templates/spartan/graphentry.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/header.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/index.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/manifest.tmpl
@@ -861,7 +894,6 @@
 ${PYSITELIB}/mercurial/templates/static/background.png
 ${PYSITELIB}/mercurial/templates/static/coal-file.png
 ${PYSITELIB}/mercurial/templates/static/coal-folder.png
-${PYSITELIB}/mercurial/templates/static/excanvas.js
 ${PYSITELIB}/mercurial/templates/static/feed-icon-14x14.png
 ${PYSITELIB}/mercurial/templates/static/followlines.js
 ${PYSITELIB}/mercurial/templates/static/hgicon.png
@@ -902,6 +934,9 @@
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.py
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.pyc
 ${PYSITELIB}/mercurial/thirdparty/attr/validators.pyo
+${PYSITELIB}/mercurial/thirdparty/selectors2.py
+${PYSITELIB}/mercurial/thirdparty/selectors2.pyc
+${PYSITELIB}/mercurial/thirdparty/selectors2.pyo
 ${PYSITELIB}/mercurial/transaction.py
 ${PYSITELIB}/mercurial/transaction.pyc
 ${PYSITELIB}/mercurial/transaction.pyo
diff -r b730d2dbb972 -r 4b0caa69a11b devel/py-mercurial/distinfo
--- a/devel/py-mercurial/distinfo       Sun Feb 11 15:55:25 2018 +0000
+++ b/devel/py-mercurial/distinfo       Sun Feb 11 16:04:21 2018 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.58 2018/01/16 09:24:56 wiz Exp $
+$NetBSD: distinfo,v 1.59 2018/02/11 16:04:21 wiz Exp $
 
-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_run-tests.py) = 1cc2d09a5493467e12aa1c753f331a7fe9d04a64
-SHA1 (patch-tests_test-largefiles-misc.t) = f05ab87c76b51fe2a784a86d872d8e19bde30193
+SHA1 (mercurial-4.5.tar.gz) = eb50bc81430fb34c11d32a8fbe6860b3d3a87de9
+RMD160 (mercurial-4.5.tar.gz) = 646b6f06a793320db6a84d53749fc53906c3db38
+SHA512 (mercurial-4.5.tar.gz) = 5d1192d96432f4d5de6548553260d1a32ffb7786ef5f982485c74a7c389fa55fb3a1f17765ce641a82958c65a29288657aaac9d465b6382913d27e70e0d5c941
+Size (mercurial-4.5.tar.gz) = 5876130 bytes
diff -r b730d2dbb972 -r 4b0caa69a11b devel/py-mercurial/patches/patch-tests_list-tree.py
--- a/devel/py-mercurial/patches/patch-tests_list-tree.py       Sun Feb 11 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$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())))
diff -r b730d2dbb972 -r 4b0caa69a11b devel/py-mercurial/patches/patch-tests_run-tests.py
--- a/devel/py-mercurial/patches/patch-tests_run-tests.py       Sun Feb 11 15:55:25 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-$NetBSD: patch-tests_run-tests.py,v 1.1 2018/01/16 09:24:56 wiz Exp $
-
-# HG changeset patch
-# User Jun Wu <quark%fb.com@localhost>
-# Date 1515456471 28800
-# Node ID 87676e8ee05692bda0144e29b0478f2cc339aa4d
-# Parent  f948c5b3f5c98815befc91b48aaf88e114c0b8aa
-test-run-tests: stabilize the test (issue5735)
-
-Previously there is a race condition because things happen in this order:
-
-  1. Check shouldStop
-  2. If shouldStop is false, print the diff
-  3. Call fail() -> set shouldStop
-
-The check and set should really happen in a same critical section.
-
-This patch adds a lock to address the issue.
-
-Test Plan:
-Run `run-tests.py -l test-run-tests.t` 20 times on gcc112 and the race
-condition does not reproduce.
-
-Differential Revision: https://phab.mercurial-scm.org/D1830
-
---- tests/run-tests.py.orig    2017-12-01 19:49:45.000000000 +0000
-+++ tests/run-tests.py
-@@ -659,6 +659,7 @@ class Test(unittest.TestCase):
- 
-     def __init__(self, path, outputdir, tmpdir, keeptmpdir=False,
-                  debug=False,
-+                 first=False,
-                  timeout=None,
-                  startport=None, extraconfigopts=None,
-                  py3kwarnings=False, shell=None, hgcommand=None,
-@@ -711,6 +712,7 @@ class Test(unittest.TestCase):
-         self._threadtmp = tmpdir
-         self._keeptmpdir = keeptmpdir
-         self._debug = debug
-+        self._first = first
-         self._timeout = timeout
-         self._slowtimeout = slowtimeout
-         self._startport = startport
-@@ -896,9 +898,13 @@ class Test(unittest.TestCase):
-                 f.close()
- 
-             # The result object handles diff calculation for us.
--            if self._result.addOutputMismatch(self, ret, out, self._refout):
--                # change was accepted, skip failing
--                return
-+            with firstlock:
-+                if self._result.addOutputMismatch(self, ret, out, self._refout):
-+                    # change was accepted, skip failing
-+                    return
-+                if self._first:
-+                    global firsterror
-+                    firsterror = True
- 
-             if ret:
-                 msg = 'output changed and ' + describe(ret)
-@@ -1620,6 +1626,8 @@ class TTest(Test):
-         return TTest.ESCAPESUB(TTest._escapef, s)
-