Update to 2.6.0:

This is a regularly scheduled feature release.

    addremove: improve performance
    amend: support amending merge changesets (issue3778)
    ancestor: a new algorithm that is faster for nodes near tip
    annotate: increase refcount of each revision correctly (issue3841)
    applyupdates: assign variable before we try to use it (issue3855)
    archive: raise error.Abort if the file pattern matches no files
    bash_completion: allow remove to complete normal files
    blackbox: new extension
    bookmarks: don't allow integers as bookmark/branch/tag names
    bookmarks: allow (re-)activating a bookmark on the current changeset
    bookmarks: allow moving a bookmark forward to a descendant
    bookmarks: moving the active bookmark deactivates it
    bookmarks: fix bug that activated a bookmark even with -r passed
    bookmarks: resolve divergent bookmark when moving across a branch
    bookmarks: resolve divergent bookmarks when moving active bookmark forward
    commit: allow closing "non-head" changesets
    commit: show active bookmark in commit editor helper text
    config: discard "%unset" values defined in the other files read in previously
    convert/git: catch errors from modern git-ls-remote (issue3428)
    convert: add closesort algorithm to mercurial sources
    dates: support 'today' and 'yesterday' in parsedate (issue3764)
    destroyed: invalidate phraserevs cache in all case (issue3858)
    diff: fix binary file removals in git mode
    dirstate: performance improvements
    dispatch: exit with status 1 for an InterventionRequired exception (BC)
    dispatch: print 'abort:' when a pre-command hook fails (BC)
    export: clobber files with -o (BC) (issue3652)
    export: export working directory parent by default
    export: show 'Date' header in a format that also is readable for humans
    extensions: obsolete and remove interhg extension
    filesets: add eol predicate
    grep: use re2 if possible
    hgk: add support for phases
    hgk: don't use fixed format for dates
    hgk: update backgroud colour when Ttk is available
    hgweb: generate HTML documentation
    hgweb: teach archive how to download a specific directory or file
    histedit: allow "-" as a command file
    histedit: handle multiple spaces between action and hash (issue3893)
    histedit: make "hg histedit" sensitive to branch in URL
    histedit: properly handle --continue on empty fold
    histedit: support editing of the first commit (issue3767)
    httppeer: avoid large dumps when we don't see an hgweb repo
    icasefs: rewrite case-folding collision detection (issue3452)
    import: don't rollback on failed import --exact (issue3616)
    largefiles: don't cache largefiles for pulled heads by default
    largefiles: improve reuse of HTTP connections
    largefiles: introduce lfpull command for pulling missing largefiles
    largefiles: introduce pull --lfrev option
    largefiles: introduce pulled() revset expression for use in --lfrev
    largefiles: quiet (and document) undefined name errors (issue3886)
    largefiles: stat all largefiles in one batch before downloading
    largefiles: use repo.wwrite for writing standins (issue3909)
    log: fix behavior with empty repositories (issue3497)
    merge: apply non-interactive working dir updates in parallel
    mergetools: avoid losing the merged version with meld
    mergetools: vimdiff issues a warning explaining how to abort
    mq: comply with filtering when injecting fake tags (issue3812)
    mq: do not inherit settings form base repo in mqrepo (Fixes issue2358)
    outgoing: fix possible filtering crash in outgoing (issue3814)
    pager: catch ctrl-c on exit (issue3834)
    date: understand "now" as a shortcut for the current time
    parsers: a C implementation of the new ancestors algorithm
    pull: list bookmarks before pulling changesets (issue3873)
    push: make locking of source optional (issue3684)
    rebase: check no-op before checking phase (issue3891)
    rebase: fix --collapse when a file was added then removed
    record: abort on malformed patches instead of crashing
    revset: change ancestor to accept 0 or more arguments (issue3750)
    revset: don't abort when regex to tag() matches nothing (issue3850)
    sadclown: another test failure eluded bos
    scheme: don't crash on invalid URLs
    scmutil: rewrite dirs in C, use if available
    setup: make error message for missing Python headers more helpful
    smtp: use 465 as default port for SMTPS
    smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS
    sshpeer: store subprocess so it cleans up correctly
    sslutil: abort if peer certificate is not verified for secure use
    subrepo: clone of git sub-repository creates incorrect git branch (issue3870)
    subrepo: do not push mercurial subrepos whose store is clean
    subrepo: fix exception on revert when "all" option is omitted
    summary: make "incoming" information sensitive to branch in URL (issue3830)
    summary: make "outgoing" information sensitive to branch in URL (issue3829)
    summary: show active bookmark even if not at current changeset
    tags: update tag type only if tag node is updated (issue3911)
    templatekw: add default styles for hybrid types (issue3887)
    templater: add get() function to access dict element (e.g. extra)
    unionrepo: read-only operations on a union of two localrepos
    win32: use explicit path to "python.exe" only if it exists

3 files changed, 25 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index f9801019ef6..aeba0c3c01e 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2013/04/07 17:06:07 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2013/05/03 21:26:14 wiz Exp $
 
-DISTNAME=	mercurial-2.5.4
+DISTNAME=	mercurial-2.6
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index d547e008bdb..76649d33ef1 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2013/02/03 14:39:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.34 2013/05/03 21:26:14 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -6,6 +6,9 @@ ${PYSITELIB}/hgext/__init__.pyo
 ${PYSITELIB}/hgext/acl.py
 ${PYSITELIB}/hgext/acl.pyc
 ${PYSITELIB}/hgext/acl.pyo
+${PYSITELIB}/hgext/blackbox.py
+${PYSITELIB}/hgext/blackbox.pyc
+${PYSITELIB}/hgext/blackbox.pyo
 ${PYSITELIB}/hgext/bugzilla.py
 ${PYSITELIB}/hgext/bugzilla.pyc
 ${PYSITELIB}/hgext/bugzilla.pyo
@@ -243,6 +246,9 @@ ${PYSITELIB}/mercurial/dagutil.pyo
 ${PYSITELIB}/mercurial/demandimport.py
 ${PYSITELIB}/mercurial/demandimport.pyc
 ${PYSITELIB}/mercurial/demandimport.pyo
+${PYSITELIB}/mercurial/dicthelpers.py
+${PYSITELIB}/mercurial/dicthelpers.pyc
+${PYSITELIB}/mercurial/dicthelpers.pyo
 ${PYSITELIB}/mercurial/diffhelpers.so
 ${PYSITELIB}/mercurial/dirstate.py
 ${PYSITELIB}/mercurial/dirstate.pyc
@@ -451,9 +457,15 @@ ${PYSITELIB}/mercurial/revlog.pyo
 ${PYSITELIB}/mercurial/revset.py
 ${PYSITELIB}/mercurial/revset.pyc
 ${PYSITELIB}/mercurial/revset.pyo
+${PYSITELIB}/mercurial/scmposix.py
+${PYSITELIB}/mercurial/scmposix.pyc
+${PYSITELIB}/mercurial/scmposix.pyo
 ${PYSITELIB}/mercurial/scmutil.py
 ${PYSITELIB}/mercurial/scmutil.pyc
 ${PYSITELIB}/mercurial/scmutil.pyo
+${PYSITELIB}/mercurial/scmwindows.py
+${PYSITELIB}/mercurial/scmwindows.pyc
+${PYSITELIB}/mercurial/scmwindows.pyo
 ${PYSITELIB}/mercurial/setdiscovery.py
 ${PYSITELIB}/mercurial/setdiscovery.pyc
 ${PYSITELIB}/mercurial/setdiscovery.pyo
@@ -654,6 +666,9 @@ ${PYSITELIB}/mercurial/treediscovery.pyo
 ${PYSITELIB}/mercurial/ui.py
 ${PYSITELIB}/mercurial/ui.pyc
 ${PYSITELIB}/mercurial/ui.pyo
+${PYSITELIB}/mercurial/unionrepo.py
+${PYSITELIB}/mercurial/unionrepo.pyc
+${PYSITELIB}/mercurial/unionrepo.pyo
 ${PYSITELIB}/mercurial/url.py
 ${PYSITELIB}/mercurial/url.pyc
 ${PYSITELIB}/mercurial/url.pyo
@@ -672,6 +687,9 @@ ${PYSITELIB}/mercurial/windows.pyo
 ${PYSITELIB}/mercurial/wireproto.py
 ${PYSITELIB}/mercurial/wireproto.pyc
 ${PYSITELIB}/mercurial/wireproto.pyo
+${PYSITELIB}/mercurial/worker.py
+${PYSITELIB}/mercurial/worker.pyc
+${PYSITELIB}/mercurial/worker.pyo
 man/man1/hg.1
 man/man5/hgignore.5
 man/man5/hgrc.5
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 9e501ac2eae..2477b479d7b 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.72 2013/04/07 17:06:07 wiz Exp $
+$NetBSD: distinfo,v 1.73 2013/05/03 21:26:14 wiz Exp $
 
-SHA1 (mercurial-2.5.4.tar.gz) = 9a387a041fe808833fe3512229eb35c6d5274188
-RMD160 (mercurial-2.5.4.tar.gz) = 4e67ecc38acb1886c992a90ab19cb5221d938bd2
-Size (mercurial-2.5.4.tar.gz) = 3673850 bytes
+SHA1 (mercurial-2.6.tar.gz) = b158d2cb9ac9c5f45330555a42a3aa4cdf04dd1d
+RMD160 (mercurial-2.6.tar.gz) = 3a9fb00d6a0bb8e10c79df00f19f0a2c74cd6267
+Size (mercurial-2.6.tar.gz) = 3726957 bytes