Update py-mercurial to 3.7:

Regularly scheduled feature release. There's also an overview of new features available.

1.1. commands

    merge: don't try to merge subrepos twice (issue4988)
    pull: advance current active bookmark at pull --update correctly
    templater: abort if infinite recursion detected while evaluation (issue4758)
    annotate: add missing period to help
    annotate: mention that -n is suppressed in help
    backout: disable --merge with --no-commit (issue4874)
    bookmark: deprecate 'bmstore.write' method
    bookmarks: hoist getbkfile out of bmstore class
    bookmarks: make _readactive safe when readlines raises ENOENT
    branch: reword help text
    clone: move bookmarks and checkouts before pull help
    clonebundles: improve BUNDLESPEC documentation
    clonebundles: remove advertisement of feature
    commands.summary: switch to mergestate.read()
    commands: inline definition of localrepo.parents() and drop the method (API)
    commands: make backout acquire locks before processing
    commands: make commit acquire locks before processing (issue4368)
    commands: use context manager for opened bundle file
    commandserver: drop tell() and seek() from channels (issue5049)
    commandserver: reset state of progress bar per command
    commit: add a way to return more information from the chunkselector
    commit: add amend mode for commit -i
    commit: add some help examples (issue4963)
    commit: adjust the quoting in the examples to be Windows friendly
    commit: fix rest syntax of examples
    commit: make commit acquire store lock before processing for consistency
    commit: preserve extra when amending with commit --amend
    fileset: add missing() predicate (issue4925)
    fileset: use set instead of list to mark predicates for efficiency (API)
    graft: clarify in help that '-r' is not just optional
    graft: copy extra (except branch) when copying changesets
    graft: hook afterresolvedstates
    graft: improve --continue abort message
    help: fix quoting for bundle1 options
    import: add word to help text
    import: limit scope of msg in tryimportone
    import: reorder help text
    log: speed up single file log with hidden revs (issue4747)
    log: add 'hg log' example for full hashes
    log: help provide sort by date example
    log: mention ordering
    log: speed up hg log <file|folder>
    merge.graft: add option to keep second parent
    merge: add options to warn or ignore on colliding unknown files
    merge: move almost all change/delete conflicts to resolve phase (BC) (API)
    merge: refuse update/merge if there are unresolved conflicts (BC)
    mergestate: raise structured exception for unsupported merge records
    patch: disable nobinary when HGPLAIN=1
    pull: make a single call to obsstore.add (issue5006)
    pull: return 255 value on update failure (issue4948) (BC)
    push: specify default-push and default as fallback paths
    status: back out changeset 89f49813526c
    status: change + back out == clean (API)
    status: revert + flag-change == modified
    summary: add troubles list to the output of hg summary
    summary: mention graft
    summary: print unstable, bumped and divergent as unconditionally plural
    tags: mention --quiet switch in help (issue4920)
    verify: add a hook that can let extensions manipulate file lists
    verify: clean up weird error/warning lists
    verify: get rid of some unnecessary local variables
    verify: move checklog() onto class
    verify: move exc() function onto class
    verify: remove unreachable code to reraise KeyboardInterrupt

1.2. core

    context: don't use util.cachefunc due to cycle creation (issue5043)
    context: use a the nofsauditor when matching file in history (issue4749)
    parsers: check results of PyInt_FromLong (issue4771)
    repoview: fix corrupted hiddencache crash Mercurial (issue5042)
    revlog: avoid string slice when decompressing u* chunks
    revlog: clarify which revision is added to 'tested' when using cached delta
    revlog: don't consider nullrev when choosing delta base
    revlog: improve documentation
    revlog: make calls to _isgooddelta() consistent
    revlog: make clearcaches() more effective
    revlog: return offset from _chunkraw()
    revsetbenchmarks: support benchmarking changectx loading
    ui: optionally ignore sub-options from configitems()
    ui: support declaring path push urls as sub-options
    util: disable floating point stat times (issue4836)
    wireproto: config options to disable bundle1
    wireproto: support disabling bundle1 only if repo is generaldelta

1.3. extensions

    crecord: fix help bar display issue (issue5063)
    histedit: add progress support
    histedit: explain basics of histedit commands
    histedit: pick an appropriate base changeset by default (BC)
    largefiles: actions will now always have a file - drop check
    largefiles: fall back to the original for change/delete conflicts
    largefiles: fix commit of missing largefiles
    largefiles: make prompt order deterministic
    largefiles: specify where .orig files are kept
    largefiles: use a context manager in _getfile
    largefiles: use util.readfile in lfconvert
    largefiles: use util.readfile in overrides
    largefiles: fix an explicit largefile commit after a remove (issue4969)
    largefiles: prevent committing a missing largefile
    mq: check for reserved patch name with qimport -r (issue5033)
    mq: let the user choose where .orig files are kept
    rebase: add date parameter to concludenode function
    rebase: better error message when rebased changes are all in destination
    rebase: create a new variable to make the next patch more legible
    rebase: hook afterresolvedstates
    rebase: only clear rebase status after the rebase transaction has completed
    rebase: pass date parameter to concludenode
    rebase: prevent creating divergence
    rebase: propagate extra dict from rebase source changeset
    rebase: remove extra "if" from check of collapsing named branches
    rebase: better way to detect non-detaching revisions (issue5044)
    rebase: restore help for rebase w/o args (issue5059)
    shelve: choose where .orig file locations are kept
    shelve: execute checkunfinished inside wlock scope
    shelve: hook afterresolvedstates
    shelve: lowercase flag description
    shelve: permit shelves to contain unknown files
    shelve: remove redundant acquisition of wlock for sub commands of unshelve
    shelve: switch to mergestate.read()
    shelve: use a context manager for file I/O in listcmd
    shelve: widen wlock scope of shelve for consistency while processing
    shelve: widen wlock scope of unshelve for consistency while processing
    unshelve: add -k as short form of --keep
    unshelve: add support for custom merge tools
    unshelve: shed spurious space

1.4. hgweb

    hgweb: eliminate duck-typing to select hgweb or hgwebdir by command option
    hgweb: load server settings from --web-conf (issue4699)
    hgweb: make sure command options are set to all ui objects
    hgweb: support rendering a sub-topic
    hgweb: support rendering sub-topic indexes
    hgweb: update canvas.width before dynamically redrawing graph (issue2683)

1.5. unsorted

    addrevision: only use the incoming base if it is a good delta (issue4975)
    backout: commit changeset by default (BC)
    backout: fix --no-commit option (issue5054)
    batchget: add support for backing up files
    builddeb: add --distid option to specify Distributor ID
    changegroup: introduce cg3, which has support for exchanging treemanifests
    changelog: add a new method to get files modified by a changeset
    checkunknownfiles: make control flow clearer
    crecord: edit during hg crecord should preserve cursor position (issue5041)
    debugignore: find out why a file is being ignored (issue4856)
    demandimport: add support for PyPy
    demandimport: don't enable when running under PyPy
    destutil: use scmutil.revrange for desthistedit (issue5001)
    diff: don't crash when merged-in addition was removed (issue4786)
    discovery: properly filter changeset in 'peer.known' (issue4982)
    dispatch: copy inferrepo attribute to alias commands
    dispatch: report similar names consistently
    dispatch: use print function
    dispatch: use versiontuple()
    dockerrpm: fix CentOS 5 RPMs (issue4977)
    encoding: handle UTF-16 internal limit with fromutf8b (issue5031)
    encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
    error: add a structured exception for unsupported merge records
    extdiff: correctly handle deleted subrepositories (issue3153)
    extdiff: use @command decorator to set up diff commands
    filemerge: add a 'leave unresolved' option to change/delete prompts
    filemerge: add a 'leave unresolved' option to regular prompts
    filemerge: add support for change/delete conflicts to the ':local' merge tool
    filemerge: add support for change/delete conflicts to the ':other' merge tool
    filemerge: add support for change/delete conflicts to the ':prompt' tool
    filemerge: default change/delete conflicts to 'leave unresolved' (BC)
    filemerge: default regular prompts to 'leave unresolved' (BC)
    graphlog: make node symbol templatable by ui.graphnodetemplate option
    graphlog: rename glog function
    hghave: support HGMODULEPOLICY for pure
    localrepo: don't reference transaction from hook closure (issue5043)
    lsprof: support PyPy (issue4573)
    mac: fix percent-encoding of non-utf-8 characters (issue4999)
    match: add option to return line and lineno from readpattern
    mercurial: pass ui to extensions.load (issue5007)
    mercurial: support loading modules from zipimporter
    paths: do not process default-push as pushurl of default path (issue5000)
    posix: work around "posix" systems without os.link available (issue4974)
    run-tests: skip threading for a single test (issue5040)
    scmutil: support background file closing
    sslutil: fix reversed logic (issue5034)
    streamclone: use backgroundfilecloser (issue4889)
    streamclone: use context manager for writing files
    streamclone: use read()
    templates: make earlycommands and othercommands optional
    templates: use canvaswidth instead of fixed width for canvas (issue2683)
    test-extension: do not depend on demandimport (issue5012)
    unionrepo: fix wrong rev being checked in iscensored (issue5024)
    webcommands: get correct parents when comparing a removed file (issue4962)
    webcommands: stop using ersatz if-else ternary operator for rename variable
    webcommands: test that fctx is not None in filediff()
    zeroconf: access repo on hgweb_mod properly (issue5036)

3 files changed, 38 insertions, 11 deletions

diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 7f0291ca49e..06a6f3d6ddf 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.28 2016/01/03 16:53:30 wiz Exp $
+# $NetBSD: Makefile.version,v 1.29 2016/02/03 17:40:10 wiz Exp $
 
-VERSION=	3.6.3
+VERSION=	3.7
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 3.4.1
 # see also http://mercurial.selenic.com/wiki/SupportedPythonVersions
diff --git a/devel/py-mercurial/PLIST b/devel/py-mercurial/PLIST
index 9e0b63066e7..7b2c244acc5 100644
--- a/devel/py-mercurial/PLIST
+++ b/devel/py-mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/11/02 10:28:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/02/03 17:40:10 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -15,6 +15,9 @@ ${PYSITELIB}/hgext/bugzilla.pyo
 ${PYSITELIB}/hgext/censor.py
 ${PYSITELIB}/hgext/censor.pyc
 ${PYSITELIB}/hgext/censor.pyo
+${PYSITELIB}/hgext/chgserver.py
+${PYSITELIB}/hgext/chgserver.pyc
+${PYSITELIB}/hgext/chgserver.pyo
 ${PYSITELIB}/hgext/children.py
 ${PYSITELIB}/hgext/children.pyc
 ${PYSITELIB}/hgext/children.pyo
@@ -153,9 +156,6 @@ ${PYSITELIB}/hgext/pager.pyo
 ${PYSITELIB}/hgext/patchbomb.py
 ${PYSITELIB}/hgext/patchbomb.pyc
 ${PYSITELIB}/hgext/patchbomb.pyo
-${PYSITELIB}/hgext/progress.py
-${PYSITELIB}/hgext/progress.pyc
-${PYSITELIB}/hgext/progress.pyo
 ${PYSITELIB}/hgext/purge.py
 ${PYSITELIB}/hgext/purge.pyc
 ${PYSITELIB}/hgext/purge.pyo
@@ -325,6 +325,9 @@ ${PYSITELIB}/mercurial/help/hgignore.5.txt
 ${PYSITELIB}/mercurial/help/hgignore.txt
 ${PYSITELIB}/mercurial/help/hgrc.5.txt
 ${PYSITELIB}/mercurial/help/hgweb.txt
+${PYSITELIB}/mercurial/help/internals/bundles.txt
+${PYSITELIB}/mercurial/help/internals/changegroups.txt
+${PYSITELIB}/mercurial/help/internals/revlogs.txt
 ${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
@@ -467,6 +470,27 @@ ${PYSITELIB}/mercurial/posix.pyo
 ${PYSITELIB}/mercurial/progress.py
 ${PYSITELIB}/mercurial/progress.pyc
 ${PYSITELIB}/mercurial/progress.pyo
+${PYSITELIB}/mercurial/pure/__init__.py
+${PYSITELIB}/mercurial/pure/__init__.pyc
+${PYSITELIB}/mercurial/pure/__init__.pyo
+${PYSITELIB}/mercurial/pure/base85.py
+${PYSITELIB}/mercurial/pure/base85.pyc
+${PYSITELIB}/mercurial/pure/base85.pyo
+${PYSITELIB}/mercurial/pure/bdiff.py
+${PYSITELIB}/mercurial/pure/bdiff.pyc
+${PYSITELIB}/mercurial/pure/bdiff.pyo
+${PYSITELIB}/mercurial/pure/diffhelpers.py
+${PYSITELIB}/mercurial/pure/diffhelpers.pyc
+${PYSITELIB}/mercurial/pure/diffhelpers.pyo
+${PYSITELIB}/mercurial/pure/mpatch.py
+${PYSITELIB}/mercurial/pure/mpatch.pyc
+${PYSITELIB}/mercurial/pure/mpatch.pyo
+${PYSITELIB}/mercurial/pure/osutil.py
+${PYSITELIB}/mercurial/pure/osutil.pyc
+${PYSITELIB}/mercurial/pure/osutil.pyo
+${PYSITELIB}/mercurial/pure/parsers.py
+${PYSITELIB}/mercurial/pure/parsers.pyc
+${PYSITELIB}/mercurial/pure/parsers.pyo
 ${PYSITELIB}/mercurial/pushkey.py
 ${PYSITELIB}/mercurial/pushkey.pyc
 ${PYSITELIB}/mercurial/pushkey.pyo
@@ -476,6 +500,9 @@ ${PYSITELIB}/mercurial/pvec.pyo
 ${PYSITELIB}/mercurial/py3kcompat.py
 ${PYSITELIB}/mercurial/py3kcompat.pyc
 ${PYSITELIB}/mercurial/py3kcompat.pyo
+${PYSITELIB}/mercurial/registrar.py
+${PYSITELIB}/mercurial/registrar.pyc
+${PYSITELIB}/mercurial/registrar.pyo
 ${PYSITELIB}/mercurial/repair.py
 ${PYSITELIB}/mercurial/repair.pyc
 ${PYSITELIB}/mercurial/repair.pyo
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index 0e8cde5d477..aee8642dfee 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2016/01/03 16:53:30 wiz Exp $
+$NetBSD: distinfo,v 1.30 2016/02/03 17:40:10 wiz Exp $
 
-SHA1 (mercurial-3.6.3.tar.gz) = c0d04574dde8df133d990c61274e419f4208a05a
-RMD160 (mercurial-3.6.3.tar.gz) = 087fe8f521f6c17e097895b64601c0755f0344ba
-SHA512 (mercurial-3.6.3.tar.gz) = e5b39e5456a35e19f2ac02838946305023de957590c5aa2828f7c37e9b5f6f2e6376526d0845ebd1ca198860425d11e208b3c36e12e189e0b02871e9c91aad9a
-Size (mercurial-3.6.3.tar.gz) = 4521749 bytes
+SHA1 (mercurial-3.7.tar.gz) = e46bbd9a093a21e83ea20aa52da935f44ad186a5
+RMD160 (mercurial-3.7.tar.gz) = ac10cd87008ff35a23ce8af3a1b18156ffe4b796
+SHA512 (mercurial-3.7.tar.gz) = ecb95555471274105a309940b4c0a82aba308deea4662a79e4e2ca9caf8965a5b01a9684d5adf3ecd767a7da71b61fc2322f3f7e1a9e95894cc8320836e7b3d2
+Size (mercurial-3.7.tar.gz) = 4630279 bytes