Update to 2.7:

Mercurial 2.7 (2013-08-01)

Regularly scheduled feature release. This release contains an
important fix for a merge ancestor calculation regression in the
2.6 series.

    ancestor: decrement ninteresting correctly (issue3984)
    bookmarks: allow bookmark command to take multiple arguments
    bookmarks: pull --update updates to active bookmark if it moved (issue4007)
    bookmarks: update only proper bookmarks on push -r/-B (issue 3973)
    changegroup: fix fastpath during commit
    checklink: work around sshfs brain-damage (issue3636)
    churn: split email aliases from the right
    commands: add checks for unfinished operations (issue3955)
    commit: enable --secret option
    convert: catch empty origpaths in svn gettags (issue3941)
    convert: fix bad conversion of copies when hg.startrev is specified
    convert: handle changeset sorting errors without traceback (issue3961)
    hgweb: fix incorrect way to count revisions in log (issue3977)
    hgweb: run search instead of showing wrong error for ambigious identifier
    histedit: don't clobber working copy on --abort if not on histedit cset
    histedit: refuse to edit history that contains merges (issue3962)
    import: cut commit messages at --- unconditionally (issue2148)
    largefiles: overridematch() should replace the file path instead of extending (issue3934)
    log: add a log style that is default+phase (issue3436)
    paper: add line wrapping switch to file source view
    paper: code selection without line numbers in file source view
    paper: highlight line which is linked to in source view
    progress: respect HGPLAIN
    rebase: allow aborting when descendants detected
    rebase: continue abort without strip for immutable csets (issue3997)
    rebase: don't clobber wd on --abort when we've updated away (issue4009)
    revert: make backup when unforgetting a file (issue3423)
    revlog: handle hidden revs in _partialmatch (issue3979)
    rollback: mark as deprecated
    splicemap: improve error handling when parsing (issue2084)
    splicemap: support paths with spaces in splicemap (issue3844)
    sslutil: force SSLv3 on Python 2.6 and later (issue3905)
    summary: augment output with info from extensions
    templater: add strip function with chars as an extra argument
    log: show style list when unknown style specified
    tip: deprecate the tip command
    update: add tracking of interrupted updates (issue3113)
    worker: check problem state correctly (issue3982)
    worker: properly report errors from worker processes (issue3982)

3 files changed, 15 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 99d6a7b617f..409ff82fd63 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2013/07/02 06:36:27 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2013/08/03 08:30:05 wiz Exp $
 
-DISTNAME=	mercurial-2.6.3
+DISTNAME=	mercurial-2.7
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 76649d33ef1..3ef964187d0 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2013/05/03 21:26:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.35 2013/08/03 08:30:05 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -292,6 +292,7 @@ ${PYSITELIB}/mercurial/hbisect.pyo
 ${PYSITELIB}/mercurial/help.py
 ${PYSITELIB}/mercurial/help.pyc
 ${PYSITELIB}/mercurial/help.pyo
+${PYSITELIB}/mercurial/help/common.txt
 ${PYSITELIB}/mercurial/help/config.txt
 ${PYSITELIB}/mercurial/help/dates.txt
 ${PYSITELIB}/mercurial/help/diffs.txt
@@ -299,7 +300,10 @@ ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
 ${PYSITELIB}/mercurial/help/filesets.txt
 ${PYSITELIB}/mercurial/help/glossary.txt
+${PYSITELIB}/mercurial/help/hg.1.txt
+${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/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
@@ -550,6 +554,7 @@ ${PYSITELIB}/mercurial/templates/map-cmdline.bisect
 ${PYSITELIB}/mercurial/templates/map-cmdline.changelog
 ${PYSITELIB}/mercurial/templates/map-cmdline.compact
 ${PYSITELIB}/mercurial/templates/map-cmdline.default
+${PYSITELIB}/mercurial/templates/map-cmdline.phases
 ${PYSITELIB}/mercurial/templates/map-cmdline.xml
 ${PYSITELIB}/mercurial/templates/monoblue/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/branches.tmpl
@@ -599,6 +604,7 @@ ${PYSITELIB}/mercurial/templates/paper/search.tmpl
 ${PYSITELIB}/mercurial/templates/paper/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/paper/shortlogentry.tmpl
 ${PYSITELIB}/mercurial/templates/paper/tags.tmpl
+${PYSITELIB}/mercurial/templates/raw/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/raw/changeset.tmpl
 ${PYSITELIB}/mercurial/templates/raw/error.tmpl
 ${PYSITELIB}/mercurial/templates/raw/fileannotate.tmpl
@@ -607,9 +613,11 @@ ${PYSITELIB}/mercurial/templates/raw/graph.tmpl
 ${PYSITELIB}/mercurial/templates/raw/graphedge.tmpl
 ${PYSITELIB}/mercurial/templates/raw/graphnode.tmpl
 ${PYSITELIB}/mercurial/templates/raw/index.tmpl
+${PYSITELIB}/mercurial/templates/raw/logentry.tmpl
 ${PYSITELIB}/mercurial/templates/raw/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/raw/map
 ${PYSITELIB}/mercurial/templates/raw/notfound.tmpl
+${PYSITELIB}/mercurial/templates/raw/search.tmpl
 ${PYSITELIB}/mercurial/templates/rss/bookmarkentry.tmpl
 ${PYSITELIB}/mercurial/templates/rss/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/rss/branchentry.tmpl
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 3c7978717f0..6b82b96a4c8 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.76 2013/07/02 06:36:27 wiz Exp $
+$NetBSD: distinfo,v 1.77 2013/08/03 08:30:05 wiz Exp $
 
-SHA1 (mercurial-2.6.3.tar.gz) = d42f6021c1f45e9cf761f07b6d34c8a7e45a4c8d
-RMD160 (mercurial-2.6.3.tar.gz) = 4f1f849ad606c3104cf9938741d5feb21fa9501f
-Size (mercurial-2.6.3.tar.gz) = 3736480 bytes
+SHA1 (mercurial-2.7.tar.gz) = 185be3422fd8e14167a6b188c89cc1e24be894f9
+RMD160 (mercurial-2.7.tar.gz) = 792d0a69cab6a6a132a1d1c41f4d903cb9c519e9
+Size (mercurial-2.7.tar.gz) = 3755724 bytes