3 files changed, 25 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index bc7ca8c1cd7a..180806bae053 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	1.6.4
+PORTVERSION=	1.7
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -27,8 +27,13 @@ PYDISTUTILS_EGGINFO=	${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-i
 
 CONTRIB_FILES=	bash_completion \
 		convert-repo \
+		debugshell.py \
 		dumprevlog \
 		hg-ssh \
+		hgfixes/__init__.py \
+		hgfixes/fix_bytes.py \
+		hgfixes/fix_bytesmod.py \
+		hgfixes/fix_leftover_imports.py \
 		hgk \
 		logo-droplets.svg \
 		memory.py \
@@ -39,6 +44,7 @@ CONTRIB_FILES=	bash_completion \
 		pylintrc \
 		python-hook-examples.py \
 		sample.hgrc \
+		setup3k.py \
 		shrink-revlog.py \
 		simplemerge \
 		tcsh_completion \
@@ -51,6 +57,7 @@ CONTRIB_FILES=	bash_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
+		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index ec9820eb9860..efb401ed8a7a 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-MD5 (mercurial-1.6.4.tar.gz) = 657dd6aff80aa9a3b187652a635544d0
-SHA256 (mercurial-1.6.4.tar.gz) = 1e8edbbf8c495c095a3f086028e5f2b0440ce218eac9056c0b477b4192dc8811
-SIZE (mercurial-1.6.4.tar.gz) = 2240810
+MD5 (mercurial-1.7.tar.gz) = 698948ff128d265db55bee8149445556
+SHA256 (mercurial-1.7.tar.gz) = 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
+SIZE (mercurial-1.7.tar.gz) = 2468587
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 6118467be64e..4193d3f90897 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -241,10 +241,12 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help/extensions.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/glossary.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/hgweb.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revsets.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/subrepos.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/templates.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/urls.txt
 %%PYTHON_SITELIBDIR%%/mercurial/hg.py
@@ -353,6 +355,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.py
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.py
+%%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/repair.py
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo
@@ -383,9 +388,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/store.py
 %%PYTHON_SITELIBDIR%%/mercurial/store.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/store.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/streamclone.py
-%%PYTHON_SITELIBDIR%%/mercurial/streamclone.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/streamclone.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.py
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.pyo
@@ -426,6 +428,8 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/footer.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/graph.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/help.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/helptopics.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/index.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/manifest.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/map
@@ -450,6 +454,8 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/footer.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/graph.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/help.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/helptopics.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/index.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/manifest.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/map
@@ -469,6 +475,8 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/footer.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/graph.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/paper/help.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/paper/helptopics.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/index.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/manifest.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/map
@@ -549,6 +557,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/windows.py
 %%PYTHON_SITELIBDIR%%/mercurial/windows.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/windows.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/wireproto.py
+%%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README