Update mercurial to 0.8.1.

Changes:
- new extensions:
  mq (manage a queue of patches, like quilt only better)
  email (send changes as series of email patches)
- new command: merge (replaces "update -m")
- improved commands: log (--limit option added), pull/push ("-r" works
  on specific revisions), revert (rewritten, much better)
- comprehensive hook support
- output templating added, supporting e.g. GNU changelog style
- Windows, Mac OS X: prebuilt binary packages, better support
- many reliability, performance, and memory usage improvements

4 files changed, 38 insertions, 53 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 6ac52679fb5..460588ba2b2 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/04/08 23:01:58 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/08 23:21:38 minskim Exp $
 #
 
-DISTNAME=	mercurial-0.8
-PKGREVISION=	2
+DISTNAME=	mercurial-0.8.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 0646d9ee590..dd1d327bfad 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/04 06:40:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/08 23:21:38 minskim Exp $
 bin/hg
 bin/hgmerge
 ${PYSITELIB}/hgext/__init__.py
@@ -7,6 +7,15 @@ ${PYSITELIB}/hgext/__init__.pyo
 ${PYSITELIB}/hgext/gpg.py
 ${PYSITELIB}/hgext/gpg.pyc
 ${PYSITELIB}/hgext/gpg.pyo
+${PYSITELIB}/hgext/hbisect.py
+${PYSITELIB}/hgext/hbisect.pyc
+${PYSITELIB}/hgext/hbisect.pyo
+${PYSITELIB}/hgext/mq.py
+${PYSITELIB}/hgext/mq.pyc
+${PYSITELIB}/hgext/mq.pyo
+${PYSITELIB}/hgext/patchbomb.py
+${PYSITELIB}/hgext/patchbomb.pyc
+${PYSITELIB}/hgext/patchbomb.pyo
 ${PYSITELIB}/hgext/win32text.py
 ${PYSITELIB}/hgext/win32text.pyc
 ${PYSITELIB}/hgext/win32text.pyo
@@ -16,10 +25,19 @@ ${PYSITELIB}/mercurial/__init__.pyo
 ${PYSITELIB}/mercurial/__version__.py
 ${PYSITELIB}/mercurial/__version__.pyc
 ${PYSITELIB}/mercurial/__version__.pyo
+${PYSITELIB}/mercurial/appendfile.py
+${PYSITELIB}/mercurial/appendfile.pyc
+${PYSITELIB}/mercurial/appendfile.pyo
 ${PYSITELIB}/mercurial/bdiff.so
+${PYSITELIB}/mercurial/bundlerepo.py
+${PYSITELIB}/mercurial/bundlerepo.pyc
+${PYSITELIB}/mercurial/bundlerepo.pyo
 ${PYSITELIB}/mercurial/byterange.py
 ${PYSITELIB}/mercurial/byterange.pyc
 ${PYSITELIB}/mercurial/byterange.pyo
+${PYSITELIB}/mercurial/changegroup.py
+${PYSITELIB}/mercurial/changegroup.pyc
+${PYSITELIB}/mercurial/changegroup.pyo
 ${PYSITELIB}/mercurial/changelog.py
 ${PYSITELIB}/mercurial/changelog.pyc
 ${PYSITELIB}/mercurial/changelog.pyo
@@ -99,6 +117,7 @@ ${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
@@ -120,6 +139,9 @@ ${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
@@ -128,8 +150,16 @@ ${PYSITELIB}/mercurial/templates/search-gitweb.tmpl
 ${PYSITELIB}/mercurial/templates/search.tmpl
 ${PYSITELIB}/mercurial/templates/shortlog-gitweb.tmpl
 ${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/static/hgicon.png
+${PYSITELIB}/mercurial/templates/static/style-gitweb.css
+${PYSITELIB}/mercurial/templates/static/style.css
+${PYSITELIB}/mercurial/templater.py
+${PYSITELIB}/mercurial/templater.pyc
+${PYSITELIB}/mercurial/templater.pyo
 ${PYSITELIB}/mercurial/transaction.py
 ${PYSITELIB}/mercurial/transaction.pyc
 ${PYSITELIB}/mercurial/transaction.pyo
@@ -148,6 +178,7 @@ 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
 @dirrm ${PYSITELIB}/mercurial
 @dirrm ${PYSITELIB}/hgext
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 7ab52797e19..5a00b197d31 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/03/14 13:56:12 drochner Exp $
+$NetBSD: distinfo,v 1.4 2006/04/08 23:21:38 minskim Exp $
 
-SHA1 (mercurial-0.8.tar.gz) = e9381f8e6dd4af64d11493adcf8bcaa0f07122f6
-RMD160 (mercurial-0.8.tar.gz) = 45f84b85c09d0bff6020dabdb7c595d4e5becf3c
-Size (mercurial-0.8.tar.gz) = 229641 bytes
-SHA1 (patch-aa) = c419f0edd19ca447e417ccfa35b6fb8dc6d6c4f2
+SHA1 (mercurial-0.8.1.tar.gz) = 7d71b6d0f73ec8b90d774b5251e69023e1ca7857
+RMD160 (mercurial-0.8.1.tar.gz) = 0dca740eb32297813489162f9564ba349747be35
+Size (mercurial-0.8.1.tar.gz) = 284529 bytes
diff --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa
deleted file mode 100644
index 94e4956f3d6..00000000000
--- a/devel/mercurial/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/14 13:56:12 drochner Exp $
-
---- hgmerge.orig	2006-03-09 10:32:29.000000000 +0100
-+++ hgmerge
-@@ -44,39 +44,6 @@ elif [ -n "$DIFF3" ]; then
-     cp "$LOCAL.orig" "$LOCAL"
- fi
- 
--# on MacOS X try FileMerge.app, shipped with Apple's developer tools
--# TODO: make proper temp files. foo.orig and foo.link are dangerous
--FILEMERGE='/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge'
--if type "$FILEMERGE" > /dev/null 2>&1; then
--    cp "$LOCAL.orig" "$LOCAL"
--    ln "$LOCAL" "$LOCAL.link"
--    # filemerge prefers the right by default
--    if ! "$FILEMERGE" -left "$OTHER" -right "$LOCAL" -ancestor "$BASE" -merge "$LOCAL"
--    then
--        echo "FileMerge failed to launch"
--        exit 1
--    fi
--    if ! test "$LOCAL" -ef "$LOCAL.link"
--    then
--        rm "$LOCAL.orig" "$LOCAL.link"
--        exit 0
--    else
--        rm "$LOCAL.link"
--        echo "$LOCAL is unchanged. Was the merge successful?"
--        select answer in yes no
--        do
--            if test "$answer" == "yes"
--            then
--                rm "$LOCAL.orig"
--                exit 0
--            else
--                exit 1
--            fi
--        done
--        exit 1
--    fi
--fi
--
- if [ -n "$DISPLAY" ]; then
-     # try using kdiff3, which is fairly nice
-     if type kdiff3 > /dev/null 2>&1; then