Update mercurial to 0.9.3.

Bug fixes:
 * fix a merge copy/rename corner case
 * fix spurious new heads message with push -r
 * fix hg export %n sequence numbers
 * fix shell quoting on Windows
 * fix charset encoding for hgwebdir and obfuscated addresses
 * fix missing generated files for distribution tarball
 * fix convert-repo tag updates and transcoding of committer
 * add instructions for redoing failed merges

Documentation fixes:
 * hg cat, manifest, and tag default to current parent revision.
 * CGI stub comments clarified
 * corrected synopses for many commands
 * improve doc building and distribution
 * convert-repo: update usage information

Extension fixes:
 * mq: fix strip on Windows
 * mq: fix some guards corner cases
 * gpg: make 'hg sign' default to current parent

4 files changed, 14 insertions, 11 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 570e652669d..c5aff483b27 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/12/11 23:15:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/02 16:52:00 minskim Exp $
 #
 
-DISTNAME=	mercurial-0.9.2
+DISTNAME=	mercurial-0.9.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index e33a8500c55..9e23d3105fb 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/12/11 23:15:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/02 16:52:00 minskim Exp $
 bin/hg
 bin/hgmerge
 ${PYSITELIB}/hgext/__init__.py
@@ -43,6 +43,9 @@ ${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
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 4190ef307ba..28cda254007 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/12/11 23:15:56 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/01/02 16:52:00 minskim Exp $
 
-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
+SHA1 (mercurial-0.9.3.tar.gz) = a91c769ea78bffc15017a2157d05b87b9218ca40
+RMD160 (mercurial-0.9.3.tar.gz) = 9a25e508ebbe8e1827f26f6731ab085ce535f73a
+Size (mercurial-0.9.3.tar.gz) = 530289 bytes
+SHA1 (patch-aa) = 82eaf7bd589ab6c50912ea36496475923f6ae3db
diff --git a/devel/mercurial/patches/patch-aa b/devel/mercurial/patches/patch-aa
index 4e7cb060bf8..52597fdd7d3 100644
--- a/devel/mercurial/patches/patch-aa
+++ b/devel/mercurial/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/12/11 23:15:56 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2007/01/02 16:52:00 minskim Exp $
 
---- doc/Makefile.orig	2006-10-18 05:20:49.000000000 +0000
+--- doc/Makefile.orig	2006-12-17 17:02:33.000000000 -0800
 +++ doc/Makefile
 @@ -1,4 +1,4 @@
 -SOURCES=$(wildcard *.[0-9].txt)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2006/12/11 23:15:56 wiz Exp $
 @@ -15,7 +15,7 @@ hg.1.txt: hg.1.gendoc.txt
  	touch hg.1.txt
  
- hg.1.gendoc.txt: ../mercurial/commands.py
+ hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py
 -	python gendoc.py > $@
 +	${PYTHONBIN} gendoc.py > $@