Update to 1.7:

1.7 (2010-11-01)

  1.1. Core

     * filelog: improve cmp performances (issue2273)
     * patch: don't strip '#' lines from patch descriptions (issue2417)
     * patch: when native patching fails (ui.patch is not set), don't retry with an external tool
     * setup/hg: always load Mercurial from where it was installed.
     * setup: user-friendly error message if Python headers are missing
     * store: new unsupported and experimental parentdelta format (see UpgradeNotes)
     * store: encode first period or space in filenames (issue1713)
     * url: expand environment variables in [auth] settings (issue2328)
     * url: check validity (notBefore/notAfter) using OpenSSL (issue2407)

  1.2. Commands

     * addremove: use similarity 100 by default
     * alias: add support for shell command aliases starting with '!' (see [alias] in hgrc(5))
     * backout: add --tool argument for specifying merge tool
     * backout: backout linearly by default instead of branching and merging (use --merge to get the former behaviour)
     * dispatch: properly handle relative path aliases used with -R (issue2376)
     * init: expand destination url as a configured paths
     * log: do not --follow file that is deleted and recreated later (issue732)
     * merge: don't detect copies as "divergent renames", make error message more helpful
     * merge: add --tool argument to merge and resolve
     * merge: handle no file parent in backwards merge (issue2364)
     * tags: do not fail if tags.cache is corrupted (issue2444)
     * templater: add "hex" filter and "children" keywords (see hg help templating)

  1.3. Subrepos

     * support remapping of subrepository source paths (see [subpaths] in hgrc(5))
     * make add, diff, incoming, outgoing and status commands recurse into subrepos with --subrepos/-S
     * subrepo: add support for 'hg archive'
     * subrepo: fix status check on SVN subrepos (issue2445)

  1.4. Revsets

     * add id() and rev() to allow explicit references to changes by hash or rev (see hg help revsets)
     * add min() function to complement max()
     * add present() function to avoid lookup errors on possibly missing changesets
     * rename tagged() to tag() and allow it to take an optional tag name
     * strip: add revsets support
     * add revsets support to bisect and update (issue1993)
     * bookmarks: add a bookmark([name]) revset for referencing bookmarks
     * transplant: add a transplanted(set) revset to get transplanted revisions

  1.5. hgweb

     * add a help view for accessing the built-in documentation (see help link in hg serve)
     * let HTTPS serve use more compatible but less secure encryption
     * support very simple caching model (issue1845)

  1.6. Extensions

     * color: better support for branches and mq guards
     * convert: handle closed branch heads in hg-hg conversion (issue2185)
     * convert: support darcs changelogs with bytes 0x7F-0xFF (issue2411)
     * convert: deprecate --authors in preference for --authormap
     * graphlog: support header and footer templates when using styles (issue2395)
     * keyword: do not expand at all during diff
     * keyword: support copy and rename
     * mq: extend support for the --mq argument to extension commands
     * mq: save qrefresh message for easy recovery in case it fails (issue2062)
     * mq: support hg qimport --existing --name renametothis thatexistingpatch, fix --force case on Windows
     * mq/qqueue: support renaming of active queue
     * mq/qqueue: add --purge option to delete a queue and its patches
     * pager: add global --pager=<auto/boolean> option
     * patchbomb: add --confirm option to show series details and ask for confirmation
     * patchbomb: let diffstat prompt only once with complete summary
     * progress: support rebase and patchbomb
     * rebase: re-add patches to mq repo after rebase
     * strip: add --keep flag to avoid modifying working directory during strip
     * strip: rename --nobackup option to --no-backup (issue2377)
     * strip: support stripping multiple revisions

  1.7. contrib

     * mergetools.hgrc: add vimdiff
     * zsh completion: support bookmarks and patchbomb extensions
     * zsh completion: add qpush --move option

3 files changed, 22 insertions, 10 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 658b30a4790..a9c870705af 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/10/05 22:12:13 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/11/02 09:37:19 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.6.4
+DISTNAME=	mercurial-1.7
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index e382d824ca6..4910e81fc7b 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/07/05 09:11:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/11/02 09:37:19 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -241,10 +241,12 @@ ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
 ${PYSITELIB}/mercurial/help/glossary.txt
 ${PYSITELIB}/mercurial/help/hgweb.txt
+${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
 ${PYSITELIB}/mercurial/help/revisions.txt
 ${PYSITELIB}/mercurial/help/revsets.txt
+${PYSITELIB}/mercurial/help/subrepos.txt
 ${PYSITELIB}/mercurial/help/templates.txt
 ${PYSITELIB}/mercurial/help/urls.txt
 ${PYSITELIB}/mercurial/hg.py
@@ -302,6 +304,7 @@ ${PYSITELIB}/mercurial/locale/fr/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/it/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/ja/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/ro/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/sv/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
@@ -353,6 +356,9 @@ ${PYSITELIB}/mercurial/posix.pyo
 ${PYSITELIB}/mercurial/pushkey.py
 ${PYSITELIB}/mercurial/pushkey.pyc
 ${PYSITELIB}/mercurial/pushkey.pyo
+${PYSITELIB}/mercurial/py3kcompat.py
+${PYSITELIB}/mercurial/py3kcompat.pyc
+${PYSITELIB}/mercurial/py3kcompat.pyo
 ${PYSITELIB}/mercurial/repair.py
 ${PYSITELIB}/mercurial/repair.pyc
 ${PYSITELIB}/mercurial/repair.pyo
@@ -383,9 +389,6 @@ ${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
@@ -426,6 +429,8 @@ ${PYSITELIB}/mercurial/templates/gitweb/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/footer.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/graph.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/header.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/help.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/helptopics.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/index.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/map
@@ -450,6 +455,8 @@ ${PYSITELIB}/mercurial/templates/monoblue/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/footer.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/graph.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/header.tmpl
+${PYSITELIB}/mercurial/templates/monoblue/help.tmpl
+${PYSITELIB}/mercurial/templates/monoblue/helptopics.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/index.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/map
@@ -469,6 +476,8 @@ ${PYSITELIB}/mercurial/templates/paper/filerevision.tmpl
 ${PYSITELIB}/mercurial/templates/paper/footer.tmpl
 ${PYSITELIB}/mercurial/templates/paper/graph.tmpl
 ${PYSITELIB}/mercurial/templates/paper/header.tmpl
+${PYSITELIB}/mercurial/templates/paper/help.tmpl
+${PYSITELIB}/mercurial/templates/paper/helptopics.tmpl
 ${PYSITELIB}/mercurial/templates/paper/index.tmpl
 ${PYSITELIB}/mercurial/templates/paper/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/paper/map
@@ -549,6 +558,9 @@ ${PYSITELIB}/mercurial/win32.pyo
 ${PYSITELIB}/mercurial/windows.py
 ${PYSITELIB}/mercurial/windows.pyc
 ${PYSITELIB}/mercurial/windows.pyo
+${PYSITELIB}/mercurial/wireproto.py
+${PYSITELIB}/mercurial/wireproto.pyc
+${PYSITELIB}/mercurial/wireproto.pyo
 man/man1/hg.1
 man/man5/hgignore.5
 man/man5/hgrc.5
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 330837167f6..4264f2102df 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2010/10/05 22:12:13 wiz Exp $
+$NetBSD: distinfo,v 1.37 2010/11/02 09:37:19 wiz Exp $
 
-SHA1 (mercurial-1.6.4.tar.gz) = 13e9dcf64ce5228b6abf9ae402966b1129f0889c
-RMD160 (mercurial-1.6.4.tar.gz) = 269beb3fa3bb4f046b7c713fea7f9508d027fe34
-Size (mercurial-1.6.4.tar.gz) = 2240810 bytes
+SHA1 (mercurial-1.7.tar.gz) = 54f5f58365c79dd897e0e490043a5b52aa50aae1
+RMD160 (mercurial-1.7.tar.gz) = 1103d8033309a69ed76a29d40823f45877dee5b9
+Size (mercurial-1.7.tar.gz) = 2468587 bytes