Update to 0.9.2:

New features:
 - merge now follows renames and copies
 - new layout protects against case-insensitivity issues
 - new branch and branches commands for managing named branches
 - push command accepts -r for pushing specified heads or named branches
 - proper storage of changelog and other metadata in UTF-8
 - log, annotate and grep '--follow' follow renames and copies
 - date parsing is improved and log, update, and revert accept --date ranges
 - additional command options for log, status, addremove
 - improved schema for hgweb URLs
 - bundle can now use '-r' and '--base' removing the need of an base repository
 - support for git-style extended patches with --git option
 - new debuginstall command to check for common installation issues

New contributions and extensions:
 - mq
   - support for quilt-style guards
   - can import existing changesets into mq ('qimport -r') or
     commit mq patches as regular changesets ('qdel -f')
   - edit the log message with 'qrefresh -e'
   - rename patches with 'qrename'
   - qheader to display the patch header of particular patches,
     and '--summary' for qseries, qapplied, qunapplied and qtop
   - combine patches with 'qfold'
   - qrefresh supports pattern options to import only a subset
     of the changes into a patch, to help split changes into multiple patches
   - patch names for applied patches act like local tags, and can be
     used in the revision arguments of any hg command
 - hgk
   - browse a subset of the history with '--limit' and revision range arguments
   - shows revision numbers as well as node hashes
 - churn: graph lines of code changed per user over a range of history
 - patchbomb: generate inline attachments with '-a'

Behavior changes:
 - hg cat defaults to the working directory revision rather than tip
 - hg manifest no longer shows internal file revision hashes by default
 - hg revert now requires the -a flag to revert all files

Developer notes:
 - new high-level API functions in the 'hg' module
 - new context API simplifies many operations
 - The changelog can now include arbitrary metadata in key: value form

4 files changed, 120 insertions, 40 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 5a2a182fd5e..570e652669d 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/07/25 22:12:38 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/11 23:15:56 wiz Exp $
 #
 
-DISTNAME=	mercurial-0.9.1
+DISTNAME=	mercurial-0.9.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
@@ -9,19 +9,27 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial
 COMMENT=	Fast, lightweight source control management system
 
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
+USE_TOOLS+=	gmake
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
+MAKE_ENV+=	PYTHONBIN=${PYTHONBIN:Q}
+
+post-build:
+	cd ${WRKSRC}/doc && ${MAKE_ENV} ${GMAKE} man
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.1  ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/*.5  ${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mercurial
 	${INSTALL_DATA} ${WRKSRC}/README  ${PREFIX}/share/doc/mercurial
-	${INSTALL_DATA} ${WRKSRC}/comparison.txt  ${PREFIX}/share/doc/mercurial
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 49b81ae6f5b..e33a8500c55 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/25 22:12:38 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/12/11 23:15:56 wiz Exp $
 bin/hg
 bin/hgmerge
 ${PYSITELIB}/hgext/__init__.py
@@ -13,6 +13,9 @@ ${PYSITELIB}/hgext/bugzilla.pyo
 ${PYSITELIB}/hgext/extdiff.py
 ${PYSITELIB}/hgext/extdiff.pyc
 ${PYSITELIB}/hgext/extdiff.pyo
+${PYSITELIB}/hgext/fetch.py
+${PYSITELIB}/hgext/fetch.pyc
+${PYSITELIB}/hgext/fetch.pyo
 ${PYSITELIB}/hgext/gpg.py
 ${PYSITELIB}/hgext/gpg.pyc
 ${PYSITELIB}/hgext/gpg.pyo
@@ -31,21 +34,25 @@ ${PYSITELIB}/hgext/notify.pyo
 ${PYSITELIB}/hgext/patchbomb.py
 ${PYSITELIB}/hgext/patchbomb.pyc
 ${PYSITELIB}/hgext/patchbomb.pyo
+${PYSITELIB}/hgext/transplant.py
+${PYSITELIB}/hgext/transplant.pyc
+${PYSITELIB}/hgext/transplant.pyo
 ${PYSITELIB}/hgext/win32text.py
 ${PYSITELIB}/hgext/win32text.pyc
 ${PYSITELIB}/hgext/win32text.pyo
 ${PYSITELIB}/mercurial/__init__.py
 ${PYSITELIB}/mercurial/__init__.pyc
 ${PYSITELIB}/mercurial/__init__.pyo
-${PYSITELIB}/mercurial/__version__.py
-${PYSITELIB}/mercurial/__version__.pyc
-${PYSITELIB}/mercurial/__version__.pyo
+${PYSITELIB}/mercurial/ancestor.py
+${PYSITELIB}/mercurial/ancestor.pyc
+${PYSITELIB}/mercurial/ancestor.pyo
 ${PYSITELIB}/mercurial/appendfile.py
 ${PYSITELIB}/mercurial/appendfile.pyc
 ${PYSITELIB}/mercurial/appendfile.pyo
 ${PYSITELIB}/mercurial/archival.py
 ${PYSITELIB}/mercurial/archival.pyc
 ${PYSITELIB}/mercurial/archival.pyo
+${PYSITELIB}/mercurial/base85.so
 ${PYSITELIB}/mercurial/bdiff.so
 ${PYSITELIB}/mercurial/bundlerepo.py
 ${PYSITELIB}/mercurial/bundlerepo.pyc
@@ -59,6 +66,9 @@ ${PYSITELIB}/mercurial/changegroup.pyo
 ${PYSITELIB}/mercurial/changelog.py
 ${PYSITELIB}/mercurial/changelog.pyc
 ${PYSITELIB}/mercurial/changelog.pyo
+${PYSITELIB}/mercurial/cmdutil.py
+${PYSITELIB}/mercurial/cmdutil.pyc
+${PYSITELIB}/mercurial/cmdutil.pyo
 ${PYSITELIB}/mercurial/commands.py
 ${PYSITELIB}/mercurial/commands.pyc
 ${PYSITELIB}/mercurial/commands.pyo
@@ -77,6 +87,9 @@ ${PYSITELIB}/mercurial/fancyopts.pyo
 ${PYSITELIB}/mercurial/filelog.py
 ${PYSITELIB}/mercurial/filelog.pyc
 ${PYSITELIB}/mercurial/filelog.pyo
+${PYSITELIB}/mercurial/help.py
+${PYSITELIB}/mercurial/help.pyc
+${PYSITELIB}/mercurial/help.pyo
 ${PYSITELIB}/mercurial/hg.py
 ${PYSITELIB}/mercurial/hg.pyc
 ${PYSITELIB}/mercurial/hg.pyo
@@ -122,12 +135,18 @@ ${PYSITELIB}/mercurial/lock.pyo
 ${PYSITELIB}/mercurial/lsprof.py
 ${PYSITELIB}/mercurial/lsprof.pyc
 ${PYSITELIB}/mercurial/lsprof.pyo
+${PYSITELIB}/mercurial/mail.py
+${PYSITELIB}/mercurial/mail.pyc
+${PYSITELIB}/mercurial/mail.pyo
 ${PYSITELIB}/mercurial/manifest.py
 ${PYSITELIB}/mercurial/manifest.pyc
 ${PYSITELIB}/mercurial/manifest.pyo
 ${PYSITELIB}/mercurial/mdiff.py
 ${PYSITELIB}/mercurial/mdiff.pyc
 ${PYSITELIB}/mercurial/mdiff.pyo
+${PYSITELIB}/mercurial/merge.py
+${PYSITELIB}/mercurial/merge.pyc
+${PYSITELIB}/mercurial/merge.pyo
 ${PYSITELIB}/mercurial/mpatch.so
 ${PYSITELIB}/mercurial/node.py
 ${PYSITELIB}/mercurial/node.pyc
@@ -135,6 +154,9 @@ ${PYSITELIB}/mercurial/node.pyo
 ${PYSITELIB}/mercurial/packagescan.py
 ${PYSITELIB}/mercurial/packagescan.pyc
 ${PYSITELIB}/mercurial/packagescan.pyo
+${PYSITELIB}/mercurial/patch.py
+${PYSITELIB}/mercurial/patch.pyc
+${PYSITELIB}/mercurial/patch.pyo
 ${PYSITELIB}/mercurial/remoterepo.py
 ${PYSITELIB}/mercurial/remoterepo.pyc
 ${PYSITELIB}/mercurial/remoterepo.pyo
@@ -156,60 +178,84 @@ ${PYSITELIB}/mercurial/statichttprepo.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
 ${PYSITELIB}/mercurial/templater.py
 ${PYSITELIB}/mercurial/templater.pyc
 ${PYSITELIB}/mercurial/templater.pyo
-${PYSITELIB}/mercurial/templates/changelog-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/changelog-rss.tmpl
 ${PYSITELIB}/mercurial/templates/changelog.tmpl
-${PYSITELIB}/mercurial/templates/changelogentry-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/changelogentry-rss.tmpl
 ${PYSITELIB}/mercurial/templates/changelogentry.tmpl
-${PYSITELIB}/mercurial/templates/changeset-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/changeset-raw.tmpl
 ${PYSITELIB}/mercurial/templates/changeset.tmpl
-${PYSITELIB}/mercurial/templates/error-gitweb.tmpl
 ${PYSITELIB}/mercurial/templates/error.tmpl
-${PYSITELIB}/mercurial/templates/fileannotate-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/fileannotate-raw.tmpl
 ${PYSITELIB}/mercurial/templates/fileannotate.tmpl
-${PYSITELIB}/mercurial/templates/filediff-raw.tmpl
 ${PYSITELIB}/mercurial/templates/filediff.tmpl
-${PYSITELIB}/mercurial/templates/filelog-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/filelog-rss.tmpl
 ${PYSITELIB}/mercurial/templates/filelog.tmpl
-${PYSITELIB}/mercurial/templates/filelogentry-rss.tmpl
 ${PYSITELIB}/mercurial/templates/filelogentry.tmpl
-${PYSITELIB}/mercurial/templates/filerevision-gitweb.tmpl
 ${PYSITELIB}/mercurial/templates/filerevision.tmpl
-${PYSITELIB}/mercurial/templates/footer-gitweb.tmpl
 ${PYSITELIB}/mercurial/templates/footer.tmpl
-${PYSITELIB}/mercurial/templates/header-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/header-raw.tmpl
-${PYSITELIB}/mercurial/templates/header-rss.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/changelog.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/changelogentry.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/changeset.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/error.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/fileannotate.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/filediff.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/filelog.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/filerevision.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/footer.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/header.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/index.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/manifest.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/map
+${PYSITELIB}/mercurial/templates/gitweb/search.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/shortlog.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl
+${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
 ${PYSITELIB}/mercurial/templates/header.tmpl
 ${PYSITELIB}/mercurial/templates/index.tmpl
-${PYSITELIB}/mercurial/templates/manifest-gitweb.tmpl
 ${PYSITELIB}/mercurial/templates/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/map
 ${PYSITELIB}/mercurial/templates/map-cmdline.changelog
 ${PYSITELIB}/mercurial/templates/map-cmdline.compact
 ${PYSITELIB}/mercurial/templates/map-cmdline.default
-${PYSITELIB}/mercurial/templates/map-gitweb
-${PYSITELIB}/mercurial/templates/map-raw
-${PYSITELIB}/mercurial/templates/map-rss
 ${PYSITELIB}/mercurial/templates/notfound.tmpl
-${PYSITELIB}/mercurial/templates/search-gitweb.tmpl
+${PYSITELIB}/mercurial/templates/old/changelog.tmpl
+${PYSITELIB}/mercurial/templates/old/changelogentry.tmpl
+${PYSITELIB}/mercurial/templates/old/changeset.tmpl
+${PYSITELIB}/mercurial/templates/old/fileannotate.tmpl
+${PYSITELIB}/mercurial/templates/old/filediff.tmpl
+${PYSITELIB}/mercurial/templates/old/filelog.tmpl
+${PYSITELIB}/mercurial/templates/old/filelogentry.tmpl
+${PYSITELIB}/mercurial/templates/old/filerevision.tmpl
+${PYSITELIB}/mercurial/templates/old/footer.tmpl
+${PYSITELIB}/mercurial/templates/old/header.tmpl
+${PYSITELIB}/mercurial/templates/old/manifest.tmpl
+${PYSITELIB}/mercurial/templates/old/map
+${PYSITELIB}/mercurial/templates/old/search.tmpl
+${PYSITELIB}/mercurial/templates/old/shortlog.tmpl
+${PYSITELIB}/mercurial/templates/old/shortlogentry.tmpl
+${PYSITELIB}/mercurial/templates/old/tags.tmpl
+${PYSITELIB}/mercurial/templates/raw/changeset.tmpl
+${PYSITELIB}/mercurial/templates/raw/fileannotate.tmpl
+${PYSITELIB}/mercurial/templates/raw/filediff.tmpl
+${PYSITELIB}/mercurial/templates/raw/header.tmpl
+${PYSITELIB}/mercurial/templates/raw/map
+${PYSITELIB}/mercurial/templates/rss/changelog.tmpl
+${PYSITELIB}/mercurial/templates/rss/changelogentry.tmpl
+${PYSITELIB}/mercurial/templates/rss/filelog.tmpl
+${PYSITELIB}/mercurial/templates/rss/filelogentry.tmpl
+${PYSITELIB}/mercurial/templates/rss/header.tmpl
+${PYSITELIB}/mercurial/templates/rss/map
+${PYSITELIB}/mercurial/templates/rss/tagentry.tmpl
+${PYSITELIB}/mercurial/templates/rss/tags.tmpl
 ${PYSITELIB}/mercurial/templates/search.tmpl
-${PYSITELIB}/mercurial/templates/shortlog-gitweb.tmpl
+${PYSITELIB}/mercurial/templates/shortlog.tmpl
+${PYSITELIB}/mercurial/templates/shortlogentry.tmpl
 ${PYSITELIB}/mercurial/templates/static/hgicon.png
 ${PYSITELIB}/mercurial/templates/static/style-gitweb.css
 ${PYSITELIB}/mercurial/templates/static/style.css
-${PYSITELIB}/mercurial/templates/summary-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/tagentry-rss.tmpl
-${PYSITELIB}/mercurial/templates/tags-gitweb.tmpl
-${PYSITELIB}/mercurial/templates/tags-rss.tmpl
 ${PYSITELIB}/mercurial/templates/tags.tmpl
+${PYSITELIB}/mercurial/templates/template-vars.txt
 ${PYSITELIB}/mercurial/transaction.py
 ${PYSITELIB}/mercurial/transaction.pyc
 ${PYSITELIB}/mercurial/transaction.pyo
@@ -222,6 +268,9 @@ ${PYSITELIB}/mercurial/util.pyo
 ${PYSITELIB}/mercurial/util_win32.py
 ${PYSITELIB}/mercurial/util_win32.pyc
 ${PYSITELIB}/mercurial/util_win32.pyo
+${PYSITELIB}/mercurial/verify.py
+${PYSITELIB}/mercurial/verify.pyc
+${PYSITELIB}/mercurial/verify.pyo
 ${PYSITELIB}/mercurial/version.py
 ${PYSITELIB}/mercurial/version.pyc
 ${PYSITELIB}/mercurial/version.pyo
@@ -230,9 +279,12 @@ man/man1/hgmerge.1
 man/man5/hgignore.5
 man/man5/hgrc.5
 share/doc/mercurial/README
-share/doc/mercurial/comparison.txt
 @dirrm share/doc/mercurial
 @dirrm ${PYSITELIB}/mercurial/templates/static
+@dirrm ${PYSITELIB}/mercurial/templates/rss
+@dirrm ${PYSITELIB}/mercurial/templates/raw
+@dirrm ${PYSITELIB}/mercurial/templates/old
+@dirrm ${PYSITELIB}/mercurial/templates/gitweb
 @dirrm ${PYSITELIB}/mercurial/templates
 @dirrm ${PYSITELIB}/mercurial/hgweb
 @dirrm ${PYSITELIB}/mercurial
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index fe16457a596..4190ef307ba 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/07/25 22:12:38 minskim Exp $
+$NetBSD: distinfo,v 1.7 2006/12/11 23:15:56 wiz Exp $
 
-SHA1 (mercurial-0.9.1.tar.gz) = a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e
-RMD160 (mercurial-0.9.1.tar.gz) = f34db5fbfcc5b3e90b2bce7577d3446f6159b057
-Size (mercurial-0.9.1.tar.gz) = 401485 bytes
+SHA1 (mercurial-0.9.2.tar.gz) = 5845c656bddcd2a6a19d8faa848d8aeb185d46a0
+RMD160 (mercurial-0.9.2.tar.gz) = 94b86f0d772d90508eb19cd17473227f29cc244f
+Size (mercurial-0.9.2.tar.gz) = 475509 bytes
+SHA1 (patch-aa) = 3439534151284fd7c896d2bba8bc28940ff5e768
diff --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa
new file mode 100644
index 00000000000..4e7cb060bf8
--- /dev/null
+++ b/devel/mercurial/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2006/12/11 23:15:56 wiz Exp $
+
+--- doc/Makefile.orig	2006-10-18 05:20:49.000000000 +0000
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-SOURCES=$(wildcard *.[0-9].txt)
++SOURCES=hg.1.txt hgignore.5.txt hgmerge.1.txt hgrc.5.txt
+ MAN=$(SOURCES:%.txt=%)
+ HTML=$(SOURCES:%.txt=%.html)
+ PREFIX=/usr/local
+@@ -15,7 +15,7 @@ hg.1.txt: hg.1.gendoc.txt
+ 	touch hg.1.txt
+ 
+ hg.1.gendoc.txt: ../mercurial/commands.py
+-	python gendoc.py > $@
++	${PYTHONBIN} gendoc.py > $@
+ 
+ %: %.xml
+ 	xmlto man $*.xml