Update to to 1.6:

1.6 (2010-07-01)

   (This release makes a couple small behavior changes, be sure to read UpgradeNotes!)

  Core

     * addremove: optimize addremove -s100 by matching files by their SHA1 hashes
     * archive: auto-detect archive type by extension (issue2058)
     * commit: more friendly handling of new and closed named branches
     * hooks: provide pre- and post- hooks with parsed command line arguments
     * log: add --branch for filtering on named branch
     * log: add --stat for diffstat output
     * push: add --new-branch option to allow initial push of new branches
     * push: break infinite http recursion bug with Python 2.6.5 (issue2179)
     * rollback: add -n/--dry-run flag, report what's being rolled back
     * subrepo: various fixes
     * summary: report copies and renames and add subrepo status
     * tag: add -e/--edit option for modifying the commit message
     * revsets: introduce a powerful query language for specifying revisions, see the manpage or hg help revsets

  Hgweb

     * unify and simplify hgweb.cgi and hgwebdir.cgi scripts
     * fix race in refreshing repo list (issue2188)
     * simplify hgweb.cgi, add help pointer
     * deliver shell hook output to client
     * allow --port=0 to specify "choose free port number automatically"
     * improved templater performance

  Help

     * add new hgweb, glossary, and revsets topics
     * numerous improvements to help text

  Extensions

     * acl: support for access control base on branches and user-defined or OS-level groups
     * acl: added support for pretxncommit, so that one can call the ACL hook at (?)
     * bookmarks: add support for pushing and pulling bookmarks
     * churn: add possibility to include/exclude paths
     * color: add support for Windows consoles
     * color: colorize based on output labels instead of parsing output
     * extdiff: add labels, read diff arguments from [merge-tools]
     * keyword: offer svn-like default keywordmaps
     * keyword: support (q)record
     * mq: add a line to hg summary
     * mq: qpush --move, reorder patch series and apply only the patch
     * progress: progress support for many more commands
     * rebase: add option to not commit after a collapsing

3 files changed, 28 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 5320aa995f8..923e3add180 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2010/06/05 12:32:20 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/07/05 09:11:14 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.5.4
+DISTNAME=	mercurial-1.6
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index aabe52577c5..e382d824ca6 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/06/05 12:32:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/07/05 09:11:14 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -191,6 +191,9 @@ ${PYSITELIB}/mercurial/context.pyo
 ${PYSITELIB}/mercurial/copies.py
 ${PYSITELIB}/mercurial/copies.pyc
 ${PYSITELIB}/mercurial/copies.pyo
+${PYSITELIB}/mercurial/dagparser.py
+${PYSITELIB}/mercurial/dagparser.pyc
+${PYSITELIB}/mercurial/dagparser.pyo
 ${PYSITELIB}/mercurial/demandimport.py
 ${PYSITELIB}/mercurial/demandimport.pyc
 ${PYSITELIB}/mercurial/demandimport.pyo
@@ -198,6 +201,9 @@ ${PYSITELIB}/mercurial/diffhelpers.so
 ${PYSITELIB}/mercurial/dirstate.py
 ${PYSITELIB}/mercurial/dirstate.pyc
 ${PYSITELIB}/mercurial/dirstate.pyo
+${PYSITELIB}/mercurial/discovery.py
+${PYSITELIB}/mercurial/discovery.pyc
+${PYSITELIB}/mercurial/discovery.pyo
 ${PYSITELIB}/mercurial/dispatch.py
 ${PYSITELIB}/mercurial/dispatch.pyc
 ${PYSITELIB}/mercurial/dispatch.pyo
@@ -233,9 +239,12 @@ ${PYSITELIB}/mercurial/help/dates.txt
 ${PYSITELIB}/mercurial/help/diffs.txt
 ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
+${PYSITELIB}/mercurial/help/glossary.txt
+${PYSITELIB}/mercurial/help/hgweb.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
 ${PYSITELIB}/mercurial/help/revisions.txt
+${PYSITELIB}/mercurial/help/revsets.txt
 ${PYSITELIB}/mercurial/help/templates.txt
 ${PYSITELIB}/mercurial/help/urls.txt
 ${PYSITELIB}/mercurial/hg.py
@@ -331,6 +340,9 @@ ${PYSITELIB}/mercurial/node.py
 ${PYSITELIB}/mercurial/node.pyc
 ${PYSITELIB}/mercurial/node.pyo
 ${PYSITELIB}/mercurial/osutil.so
+${PYSITELIB}/mercurial/parser.py
+${PYSITELIB}/mercurial/parser.pyc
+${PYSITELIB}/mercurial/parser.pyo
 ${PYSITELIB}/mercurial/parsers.so
 ${PYSITELIB}/mercurial/patch.py
 ${PYSITELIB}/mercurial/patch.pyc
@@ -338,6 +350,9 @@ ${PYSITELIB}/mercurial/patch.pyo
 ${PYSITELIB}/mercurial/posix.py
 ${PYSITELIB}/mercurial/posix.pyc
 ${PYSITELIB}/mercurial/posix.pyo
+${PYSITELIB}/mercurial/pushkey.py
+${PYSITELIB}/mercurial/pushkey.pyc
+${PYSITELIB}/mercurial/pushkey.pyo
 ${PYSITELIB}/mercurial/repair.py
 ${PYSITELIB}/mercurial/repair.pyc
 ${PYSITELIB}/mercurial/repair.pyo
@@ -347,6 +362,12 @@ ${PYSITELIB}/mercurial/repo.pyo
 ${PYSITELIB}/mercurial/revlog.py
 ${PYSITELIB}/mercurial/revlog.pyc
 ${PYSITELIB}/mercurial/revlog.pyo
+${PYSITELIB}/mercurial/revset.py
+${PYSITELIB}/mercurial/revset.pyc
+${PYSITELIB}/mercurial/revset.pyo
+${PYSITELIB}/mercurial/similar.py
+${PYSITELIB}/mercurial/similar.pyc
+${PYSITELIB}/mercurial/similar.pyo
 ${PYSITELIB}/mercurial/simplemerge.py
 ${PYSITELIB}/mercurial/simplemerge.pyc
 ${PYSITELIB}/mercurial/simplemerge.pyo
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index dc67409124e..bf46db37dfa 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.32 2010/06/05 12:32:20 wiz Exp $
+$NetBSD: distinfo,v 1.33 2010/07/05 09:11:14 wiz Exp $
 
-SHA1 (mercurial-1.5.4.tar.gz) = 1ff675bc4ec5d1b19f16427df12df691507c2b54
-RMD160 (mercurial-1.5.4.tar.gz) = 3452d96ebc8405fb4393dc5f9a09a1562a41f3e3
-Size (mercurial-1.5.4.tar.gz) = 2038613 bytes
+SHA1 (mercurial-1.6.tar.gz) = 53ffa5d267fcf220e9fd303da0ba477673fd412b
+RMD160 (mercurial-1.6.tar.gz) = 1c1994f4747cd01712d8b72d8e33310df74ddce4
+Size (mercurial-1.6.tar.gz) = 2192032 bytes