Update to 1.8.3:

This is a regular time-based bugfix release.

    convert: make filemap prune useless branch closing revs (issue2774)
    encoding: avoid localstr when a string can be encoded losslessly (issue2763)
    extdiff: fix broken symlinks handling (issue1909)
    help config: explain that config files do not exist by default
    hgweb: add bookmark labels to gitweb theme
    hgweb: add missing bookmarks definition to coal/map
    hgweb: add missing bookmarks templates to atom/rss styles
    hgweb: add separate bookmarks listing to gitweb theme
    hgweb: add separate bookmarks listing to monoblue theme
    hgweb: detect change based on changelog size too
    hgweb: fix inconsistant display of graphlog (issue1706)
    hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help
    hgweb: fix typo in page-header of monoblue's help template
    hgweb: format page_nav of gitweb/error.tmpl and add missing links
    rebase: don't mark file as removed if missing in parent's manifest (issue2725)
    subrepo: handle svn tracked/unknown directory collisions
    subrepo: prevent url normalization from removing // in ssh paths (issue2556)
    subrepo: tell Subversion when we are non-interactive (issue2759)
    url: use a regex to hide unsupported ssh passwords (issue2754)
    zeroconf: notify the Zeroconf threads when hg exits

3 files changed, 13 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 786c8dd1d83..278e365f7b6 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2011/04/04 09:23:20 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2011/05/02 13:05:06 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.8.2
+DISTNAME=	mercurial-1.8.3
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 8c36fafba3b..0456bb03783 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2011/04/04 09:23:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2011/05/02 13:05:06 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -407,6 +407,8 @@ ${PYSITELIB}/mercurial/templatekw.pyo
 ${PYSITELIB}/mercurial/templater.py
 ${PYSITELIB}/mercurial/templater.pyc
 ${PYSITELIB}/mercurial/templater.pyo
+${PYSITELIB}/mercurial/templates/atom/bookmarkentry.tmpl
+${PYSITELIB}/mercurial/templates/atom/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/atom/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/atom/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/atom/error.tmpl
@@ -417,6 +419,7 @@ ${PYSITELIB}/mercurial/templates/atom/tagentry.tmpl
 ${PYSITELIB}/mercurial/templates/atom/tags.tmpl
 ${PYSITELIB}/mercurial/templates/coal/header.tmpl
 ${PYSITELIB}/mercurial/templates/coal/map
+${PYSITELIB}/mercurial/templates/gitweb/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/branches.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changelogentry.tmpl
@@ -443,6 +446,7 @@ ${PYSITELIB}/mercurial/templates/map-cmdline.changelog
 ${PYSITELIB}/mercurial/templates/map-cmdline.compact
 ${PYSITELIB}/mercurial/templates/map-cmdline.default
 ${PYSITELIB}/mercurial/templates/map-cmdline.xml
+${PYSITELIB}/mercurial/templates/monoblue/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/branches.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelogentry.tmpl
@@ -495,6 +499,8 @@ ${PYSITELIB}/mercurial/templates/raw/index.tmpl
 ${PYSITELIB}/mercurial/templates/raw/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/raw/map
 ${PYSITELIB}/mercurial/templates/raw/notfound.tmpl
+${PYSITELIB}/mercurial/templates/rss/bookmarkentry.tmpl
+${PYSITELIB}/mercurial/templates/rss/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/rss/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/rss/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/rss/error.tmpl
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 559275f67c4..65962a14f71 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.44 2011/04/04 09:23:20 wiz Exp $
+$NetBSD: distinfo,v 1.45 2011/05/02 13:05:06 wiz Exp $
 
-SHA1 (mercurial-1.8.2.tar.gz) = 394e95b3ddfb9b725368b81ad60dc39382fb9e12
-RMD160 (mercurial-1.8.2.tar.gz) = 6a18f5e56928e1fbea7ac1821bdde77066f5c6b0
-Size (mercurial-1.8.2.tar.gz) = 2547027 bytes
+SHA1 (mercurial-1.8.3.tar.gz) = 2a8b09e3c203f276204d93706db0582c112e6657
+RMD160 (mercurial-1.8.3.tar.gz) = 5c1ac5e28014b78e1ad589acf97103d024a0890c
+Size (mercurial-1.8.3.tar.gz) = 2550988 bytes