Update to mercurial 0.9.3 with some file location reorganisation,

new extensions and fixes.  0.9.2 was fixed due to glitches that
slipped in just before release and needed fixes.

3 files changed, 88 insertions, 32 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 18eab670b10e..8d3914a69e46 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index e891987b2fd3..d91fa524af94 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-MD5 (mercurial-0.9.1.tar.gz) = 9ed3962bba640a686c37faa47739270c
-SHA256 (mercurial-0.9.1.tar.gz) = 60329317ed96cccf3db704ef9d2554890bcff6850c305199cc0f51cef606ebc9
-SIZE (mercurial-0.9.1.tar.gz) = 401485
+MD5 (mercurial-0.9.3.tar.gz) = 5e39fed853e5669cbac32b77a67bb6dd
+SHA256 (mercurial-0.9.3.tar.gz) = 48485e6b16d304ef67f747c956ad257139796359ebfba9a66aede5cc0f550e86
+SIZE (mercurial-0.9.3.tar.gz) = 530289
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index ce0cf549493b..8974ede67041 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -12,6 +12,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/hgext/extdiff.py
 %%PYTHON_SITELIBDIR%%/hgext/extdiff.pyc
 %%PYTHON_SITELIBDIR%%/hgext/extdiff.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fetch.py
+%%PYTHON_SITELIBDIR%%/hgext/fetch.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fetch.pyo
 %%PYTHON_SITELIBDIR%%/hgext/gpg.py
 %%PYTHON_SITELIBDIR%%/hgext/gpg.pyc
 %%PYTHON_SITELIBDIR%%/hgext/gpg.pyo
@@ -30,6 +33,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/hgext/patchbomb.py
 %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyc
 %%PYTHON_SITELIBDIR%%/hgext/patchbomb.pyo
+%%PYTHON_SITELIBDIR%%/hgext/transplant.py
+%%PYTHON_SITELIBDIR%%/hgext/transplant.pyc
+%%PYTHON_SITELIBDIR%%/hgext/transplant.pyo
 %%PYTHON_SITELIBDIR%%/hgext/win32text.py
 %%PYTHON_SITELIBDIR%%/hgext/win32text.pyc
 %%PYTHON_SITELIBDIR%%/hgext/win32text.pyo
@@ -39,12 +45,16 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.py
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/ancestor.py
+%%PYTHON_SITELIBDIR%%/mercurial/ancestor.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/ancestor.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/appendfile.py
 %%PYTHON_SITELIBDIR%%/mercurial/appendfile.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/appendfile.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/archival.py
 %%PYTHON_SITELIBDIR%%/mercurial/archival.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/archival.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/base85.so
 %%PYTHON_SITELIBDIR%%/mercurial/bdiff.so
 %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyc
@@ -58,6 +68,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/changelog.py
 %%PYTHON_SITELIBDIR%%/mercurial/changelog.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/changelog.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/cmdutil.py
+%%PYTHON_SITELIBDIR%%/mercurial/cmdutil.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/cmdutil.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/commands.py
 %%PYTHON_SITELIBDIR%%/mercurial/commands.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/commands.pyo
@@ -76,6 +89,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/filelog.py
 %%PYTHON_SITELIBDIR%%/mercurial/filelog.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/filelog.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/help.py
+%%PYTHON_SITELIBDIR%%/mercurial/help.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/help.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/hg.py
 %%PYTHON_SITELIBDIR%%/mercurial/hg.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/hg.pyo
@@ -121,12 +137,18 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.py
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/mail.py
+%%PYTHON_SITELIBDIR%%/mercurial/mail.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/mail.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/manifest.py
 %%PYTHON_SITELIBDIR%%/mercurial/manifest.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/manifest.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/mdiff.py
 %%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/merge.py
+%%PYTHON_SITELIBDIR%%/mercurial/merge.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/merge.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
 %%PYTHON_SITELIBDIR%%/mercurial/node.py
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyc
@@ -134,6 +156,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/packagescan.py
 %%PYTHON_SITELIBDIR%%/mercurial/packagescan.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/packagescan.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/patch.py
+%%PYTHON_SITELIBDIR%%/mercurial/patch.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/patch.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/remoterepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/remoterepo.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/remoterepo.pyo
@@ -155,60 +180,84 @@ bin/hgmerge
 %%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
 %%PYTHON_SITELIBDIR%%/mercurial/templater.py
 %%PYTHON_SITELIBDIR%%/mercurial/templater.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/templater.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/changelog.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-raw.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/changeset.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/error-gitweb.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/error.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate-raw.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff-raw.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filediff.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filelog.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision-gitweb.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/footer-gitweb.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/footer.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/header-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/header-raw.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/header-rss.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changeset.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/error.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/fileannotate.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/filediff.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/filelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/filerevision.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/footer.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/index.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/manifest.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/search.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/shortlog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/summary.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/tags.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/header.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/index.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/manifest-gitweb.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/manifest.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.changelog
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.compact
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.default
-%%PYTHON_SITELIBDIR%%/mercurial/templates/map-gitweb
-%%PYTHON_SITELIBDIR%%/mercurial/templates/map-raw
-%%PYTHON_SITELIBDIR%%/mercurial/templates/map-rss
 %%PYTHON_SITELIBDIR%%/mercurial/templates/notfound.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/search-gitweb.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/changelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/changeset.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/fileannotate.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/filediff.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/filelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/filelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/filerevision.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/footer.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/manifest.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/search.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/shortlog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/shortlogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/old/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/raw/changeset.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/raw/fileannotate.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/raw/filediff.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/raw/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/raw/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/filelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/filelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/tagentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/tags.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/search.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/shortlog-gitweb.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/shortlog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/shortlogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/static/hgicon.png
 %%PYTHON_SITELIBDIR%%/mercurial/templates/static/style-gitweb.css
 %%PYTHON_SITELIBDIR%%/mercurial/templates/static/style.css
-%%PYTHON_SITELIBDIR%%/mercurial/templates/summary-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/tagentry-rss.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/tags-gitweb.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/tags-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/template-vars.txt
 %%PYTHON_SITELIBDIR%%/mercurial/transaction.py
 %%PYTHON_SITELIBDIR%%/mercurial/transaction.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/transaction.pyo
@@ -221,6 +270,9 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/util_win32.py
 %%PYTHON_SITELIBDIR%%/mercurial/util_win32.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/util_win32.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/verify.py
+%%PYTHON_SITELIBDIR%%/mercurial/verify.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/verify.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/version.py
 %%PYTHON_SITELIBDIR%%/mercurial/version.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/version.pyo
@@ -251,6 +303,10 @@ bin/hgmerge
 %%PORTDOCS%%%%DATADIR%%/contrib/vim/patchreview.vim
 %%PORTDOCS%%%%DATADIR%%/www/hgweb.cgi
 %%PORTDOCS%%%%DATADIR%%/www/hgwebdir.cgi
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/old
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/raw
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/rss
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/static
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb