Update to 2.9:

1. Mercurial 2.9 (2014-02-01)

This is a regularly-scheduled feature release.
    aliases: make "_checkshellalias()" invoke "findcmd()" with "strict=True"
    backout: add a message after backout that need manual commit
    backout: avoid update on simple case
    bash_completion: add completion for deleting a shelve
    bash_completion: add global support for -B|--bookmark
    bash_completion: add global support for -b|--branch
    bisect: --command without --noupdate should flag the parent rev it tested
    bookmarks: allow push -B to create a new remote head (issue2372)
    branchmap: cache open/closed branch head information
    cat: increase perf when catting single files
    changectx: increase perf of walk function
    clone: do not turn hidden changeset public on publishing clone (issue3935)
    convert: use branchmap to change default branch in destination (issue3469)
    date: allow %z in format (issue4040)
    diff: search beyond ancestor when detecting renames
    hgweb: infinite scroll support for coal, gitweb, and monoblue styles
    merge: consider successor changesets for a bare update
    patch: add support for git delta hunks
    phase: properly compute ancestors of --rev on push (issue3786)
    rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
    rebase: do not crash in panic when cwd disapear in the process (issue4121)
    record: --user/-u now works with record when ui.username not set (issue3857)
    record: re-enable whitespace-ignoring options
    relink: abort earlier when on different devices (issue3916)
    strip: add faster revlog strip computation
    subrepo: check phase of state in each subrepositories before committing
    subrepo: make it possible to update to hidden subrepo revisions
    subsettable: move from repoview to branchmap, the only place it's used
    templater: selecting a style with no templates does not crash (issue4140)
    update: consider successor changesets when moving active bookmark
    url: added authuri when login information is requested (issue3209)

3 files changed, 15 insertions, 9 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 08b419b0447..bd081b40bbe 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2014/01/25 10:30:02 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2014/02/03 11:39:49 wiz Exp $
 
-DISTNAME=	mercurial-2.8.2
+DISTNAME=	mercurial-2.9
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -17,8 +17,11 @@ USE_TOOLS+=			gmake msgfmt
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=	share/doc/mercurial
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.8.2
-# the following setup argument was requested by 2.8.2 when compiling
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.9
+# see also http://mercurial.selenic.com/wiki/SupportedPythonVersions
+# 3.x support is not planned for the near future
+#
+# the following setup argument was requested when compiling
 # for python-3.x
 #.include "../../lang/python/pyversion.mk"
 #
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 74bd184fe10..49558bc91c8 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2013/11/02 17:29:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2014/02/03 11:39:49 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -437,6 +437,9 @@ ${PYSITELIB}/mercurial/parsers.so
 ${PYSITELIB}/mercurial/patch.py
 ${PYSITELIB}/mercurial/patch.pyc
 ${PYSITELIB}/mercurial/patch.pyo
+${PYSITELIB}/mercurial/pathutil.py
+${PYSITELIB}/mercurial/pathutil.pyc
+${PYSITELIB}/mercurial/pathutil.pyo
 ${PYSITELIB}/mercurial/peer.py
 ${PYSITELIB}/mercurial/peer.pyc
 ${PYSITELIB}/mercurial/peer.pyo
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 18b60682d14..34ef2e7ac6d 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.82 2014/01/02 23:51:45 wiz Exp $
+$NetBSD: distinfo,v 1.83 2014/02/03 11:39:49 wiz Exp $
 
-SHA1 (mercurial-2.8.2.tar.gz) = a724217d66f4a3f0a8ade971aefa66523e7a2ea9
-RMD160 (mercurial-2.8.2.tar.gz) = 186a0fe71ed94098e830de5a350ed574a9f7bbc7
-Size (mercurial-2.8.2.tar.gz) = 3839304 bytes
+SHA1 (mercurial-2.9.tar.gz) = 9b7d8259434f6aae29f6eee3dd5665b516857cf3
+RMD160 (mercurial-2.9.tar.gz) = f8bd548807452908c114f235850d40fcbc04adaf
+Size (mercurial-2.9.tar.gz) = 3847667 bytes