Update py-mercurial to 3.6:

Mercurial 3.6 (2015-11-1)

Regularly scheduled feature release.

1.1. commands

    bookmark: do not crash when active bookmark is forward and --date is used
    bookmarks: don't deactivate on no-op update (issue4901)
    clone: fix updaterev to update to latest branch changeset (issue4528)
    clonebundles: support for seeding clones from pre-generated bundles
    commit: abort when a committemplate is not changed (BC)
    help: distinguish sections when multiple match (issue4802)
    help: pass around ui to doc loader (API)
    help: pass around ui to rewriter hooks (API)
    merge: perform all premerges before any merges (BC)
    merge: abort on file/directory case folding collisions (issue4892)
    phases: return zero for no-op operations (issue4751) (BC)
    resolve: perform all premerges before performing any file merges (BC)

1.2. core

    cmdutil: make in-memory changes visible to external editor (issue4378)
    cmdutil: stop tryimportone from using dirstateguard (BC)
    context: don't hex encode all unknown 20 char revision specs (issue4890)
    dirstate: batch calls to statfiles (issue4878)
    parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
    revlog: add an aggressivemergedelta option
    revlog: change generaldelta delta parent heuristic
    revset: do not fall through to revspec for literal: branch (issue4838)
    revsets: makes follow() supports file patterns (issue4757) (BC)
    templater: add new docheader/footer components for XML (issue4135)
    templater: create string unescape helper (issue4798)
    templater: do not pre-evaluate generator keyword at runsymbol (issue4868)
    templater: introduce {latesttag()} function to match a pattern (issue4184)
    templater: switch ctx of list expression to rev of revset() (BC)
    ui: change default path fallback mechanism (issue4796)
    util: use tuple accessor to get accurate st_mtime value (issue4836)
    wireproto: properly parse false boolean args (BC)

1.3. extensions

    histedit: use one editor when multiple folds happen in a row (issue3524) (BC)
    largefiles: better handling of merge of largefiles that are not available
    mq: generate patch names from first line of description
    rebase: avoid losing branch commits with --keepbranch (issue4835)
    rebase: fix warning about ignoring tool option on rebase continue (issue4698)
    rebase: fix wrong 'no changes to commit' when using --collapse
    rebase: on abort delete rebase state file no matter what
    rebase: properly abort when destination is public (issue4896)
    rebase: properly handle chains of markers with missing nodes
    shelve: bundle using bundle2 if repository is general delta (issue4862)
    shelve: delete shelve statefile on any exception during abort
    shelve: restore shelved dirstate explicitly after aborting transaction
    shelve: restore unshelved dirstate explicitly after aborting transaction

1.4. hgweb

    hgweb: consume generator inside context manager (issue4756)
    hgweb: ensure both foreground and background colors are specified (issue4872)
    hgweb: overwrite cwd to resolve file patterns relative to repo (issue4568)

1.5. unsorted

    builddeb: actually run make when building the deb (issue4778)
    buildrpm: mkdir -p two needed directories (issue4779)
    bundle2: don't try to recover from a GeneratorExit (issue4785)
    bundle: extend the format of --type to support version and compression
    debian: install bash completion as hg and not mercurial (issue4900)
    debian: install hgk as part of mercurial-common (issue4829)
    dispatch: error out on invalid -R path even if optionalrepo (issue4805) (BC)
    dispatch: stop warning about EPIPE in --debug mode
    graphmod: compute slow revset query once prior to reachableroots (issue4782)
    highlight: add highlightfiles config option which takes a fileset (issue3005)
    highlight: add option to prevent content-only based fallback
    highlight: exit early on textual and unknown files (issue3005)
    incoming: request a bundle2 when possible (BC)
    localrepo: recreate phasecache if changelog was modified (issue4855)
    lock: loop a finite number of times in trylock (issue4787)
    mercurial: add debugextensions command (issue4676)
    minirst: don't treat top level item as children of last item (issue4803)
    notify: fix fromauthor setting for 'incoming' hook type (issue4194)
    posix: shellquote do not require quoting for "+" (issue4818)
    reachableroots: verify integer range of heads argument (issue4775)
    revpair: restrict odd-range handling to top-level x:y expression (issue4774)
    revrange: drop old-style parser in favor of revset (API)
    test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
    traceback: allow providing a local support contact point
    treemanifest: rework lazy-copying code (issue4840)
    windows: read all global config files, not just the first (issue4491) (BC)
    worker: restore old countcpus code (issue4869)

3 files changed, 18 insertions, 9 deletions

diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 9be9b702341..b9f27783c3d 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.23 2015/10/15 10:34:52 wiz Exp $
+# $NetBSD: Makefile.version,v 1.24 2015/11/02 10:28:29 wiz Exp $
 
-VERSION=	3.5.2
+VERSION=	3.6
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # 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 b20487f818b..9e0b63066e7 100644
--- a/devel/py-mercurial/PLIST
+++ b/devel/py-mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/08/01 10:12:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/11/02 10:28:29 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -21,6 +21,9 @@ ${PYSITELIB}/hgext/children.pyo
 ${PYSITELIB}/hgext/churn.py
 ${PYSITELIB}/hgext/churn.pyc
 ${PYSITELIB}/hgext/churn.pyo
+${PYSITELIB}/hgext/clonebundles.py
+${PYSITELIB}/hgext/clonebundles.pyc
+${PYSITELIB}/hgext/clonebundles.pyo
 ${PYSITELIB}/hgext/color.py
 ${PYSITELIB}/hgext/color.pyc
 ${PYSITELIB}/hgext/color.pyo
@@ -259,6 +262,9 @@ ${PYSITELIB}/mercurial/default.d/mergetools.rc
 ${PYSITELIB}/mercurial/demandimport.py
 ${PYSITELIB}/mercurial/demandimport.pyc
 ${PYSITELIB}/mercurial/demandimport.pyo
+${PYSITELIB}/mercurial/destutil.py
+${PYSITELIB}/mercurial/destutil.pyc
+${PYSITELIB}/mercurial/destutil.pyo
 ${PYSITELIB}/mercurial/diffhelpers.so
 ${PYSITELIB}/mercurial/dirstate.py
 ${PYSITELIB}/mercurial/dirstate.pyc
@@ -515,6 +521,9 @@ ${PYSITELIB}/mercurial/statichttprepo.pyo
 ${PYSITELIB}/mercurial/store.py
 ${PYSITELIB}/mercurial/store.pyc
 ${PYSITELIB}/mercurial/store.pyo
+${PYSITELIB}/mercurial/streamclone.py
+${PYSITELIB}/mercurial/streamclone.pyc
+${PYSITELIB}/mercurial/streamclone.pyo
 ${PYSITELIB}/mercurial/strutil.py
 ${PYSITELIB}/mercurial/strutil.pyc
 ${PYSITELIB}/mercurial/strutil.pyo
@@ -687,7 +696,7 @@ ${PYSITELIB}/mercurial/templates/static/feed-icon-14x14.png
 ${PYSITELIB}/mercurial/templates/static/hgicon.png
 ${PYSITELIB}/mercurial/templates/static/hglogo.png
 ${PYSITELIB}/mercurial/templates/static/mercurial.js
-${PYSITELIB}/mercurial/templates/static/style-coal.css
+${PYSITELIB}/mercurial/templates/static/style-extra-coal.css
 ${PYSITELIB}/mercurial/templates/static/style-gitweb.css
 ${PYSITELIB}/mercurial/templates/static/style-monoblue.css
 ${PYSITELIB}/mercurial/templates/static/style-paper.css
diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index 0044bc46d4a..984b91a820c 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2015/10/15 10:34:52 wiz Exp $
+$NetBSD: distinfo,v 1.25 2015/11/02 10:28:29 wiz Exp $
 
-SHA1 (mercurial-3.5.2.tar.gz) = 61055b54f2a4efcdc2f24b94432b1de7f869f1be
-RMD160 (mercurial-3.5.2.tar.gz) = 465fe1d458507d0795d7a5bab67b8832383f28d6
-SHA512 (mercurial-3.5.2.tar.gz) = d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd
-Size (mercurial-3.5.2.tar.gz) = 4415307 bytes
+SHA1 (mercurial-3.6.tar.gz) = eaa8b4ddfe0b1c972b95bdf914d07e6ad49bd00c
+RMD160 (mercurial-3.6.tar.gz) = 69da0b6c2b23306a187a5cffd52e920d3b3a21d0
+SHA512 (mercurial-3.6.tar.gz) = 5e3fa99f6cb5a4f5867233946714222c53f05d95b791fd0855afc9d5f3dfade8aeae08b3581ea700ae64516f304a120843b4187d1e309c5cf0c15af798889664
+Size (mercurial-3.6.tar.gz) = 4516703 bytes