Update to 1.5.

1.5: Small behavior changes

    * hg heads now shows all branch heads, use --topo for old behavior
    * hg annotate now follows copies and renames by default, use
      --no-follow for old behavior
    * the repo#name URL syntax now refers to all branch heads if
      name is a branch
    * servers now allow clone --uncompressed by default, set
      server.uncompressed=false for old behavior
    * the {file_copies} template now displays copies unconditionally,
      use {file_copies_switch} for old behavior
    * the templates/ directory has moved inside mercurial/
    * mq patches are automatically upgraded to git patches, use
      mq.git=keep for old behavior

1.5 - 2010-03-06

Core

    * improved behavior for named branches with heads command
    * new XML output template for logs
    * import extract multiple patches from emails, mboxes, files, and URLs
    * new patch.eol=auto option to ignore patch line-endings while
      preserving target file endings.
    * new -b/--branch option for clone, bundle, incoming, outgoing,
      pull, and push
    * new server.validate option to validate completeness of pushed
      changesets
    * subrepos now has basic Subversion support
    * support for SSL server certificates and improved IPv6 support
    * the HGPLAIN environment variable makes output more stable for scripts

Extensions

    * new progress bar extension
    * mq: new --mq option to make regular commands operate on queue repository
    * mq: automatically upgrade conventional patches to git format where needed
    * color: add support for bookmarks, resolve -l, and churn --diffstat
    * convert: two CVS history editing hooks
    * win32mbcs: add configuration to specify path encoding
    * zeroconf: many bug fixes
    * rebase: new --detach option for rebase

Web Interface

    * improve navigation on log and graph pages
    * support for pluggable authorization
    * raw templates for tags/branches pages
    * add wsgi script for Microsoft IIS with isapi-wsgi

Help and Documentation

    * greatly improve error messages and command documentation
    * support extended documentation with --verbose
    * provide help for disabled extensions and commands

3 files changed, 14 insertions, 19 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index ba0227cf47c..ffbdca9a15d 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/02/10 19:17:36 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2010/03/07 23:23:59 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.4.3
-PKGREVISION=	1
+DISTNAME=	mercurial-1.5
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index c5f8a9fc1ab..203afd1b87d 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/12/02 12:08:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2010/03/07 23:23:59 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -111,6 +111,9 @@ ${PYSITELIB}/hgext/parentrevspec.pyo
 ${PYSITELIB}/hgext/patchbomb.py
 ${PYSITELIB}/hgext/patchbomb.pyc
 ${PYSITELIB}/hgext/patchbomb.pyo
+${PYSITELIB}/hgext/progress.py
+${PYSITELIB}/hgext/progress.pyc
+${PYSITELIB}/hgext/progress.pyo
 ${PYSITELIB}/hgext/purge.py
 ${PYSITELIB}/hgext/purge.pyc
 ${PYSITELIB}/hgext/purge.pyo
@@ -274,17 +277,6 @@ ${PYSITELIB}/mercurial/httprepo.pyo
 ${PYSITELIB}/mercurial/i18n.py
 ${PYSITELIB}/mercurial/i18n.pyc
 ${PYSITELIB}/mercurial/i18n.pyo
-${PYSITELIB}/mercurial/i18n/da.po
-${PYSITELIB}/mercurial/i18n/de.po
-${PYSITELIB}/mercurial/i18n/el.po
-${PYSITELIB}/mercurial/i18n/fr.po
-${PYSITELIB}/mercurial/i18n/hggettext
-${PYSITELIB}/mercurial/i18n/it.po
-${PYSITELIB}/mercurial/i18n/ja.po
-${PYSITELIB}/mercurial/i18n/pt_BR.po
-${PYSITELIB}/mercurial/i18n/sv.po
-${PYSITELIB}/mercurial/i18n/zh_CN.po
-${PYSITELIB}/mercurial/i18n/zh_TW.po
 ${PYSITELIB}/mercurial/ignore.py
 ${PYSITELIB}/mercurial/ignore.pyc
 ${PYSITELIB}/mercurial/ignore.pyo
@@ -382,6 +374,9 @@ ${PYSITELIB}/mercurial/tags.pyo
 ${PYSITELIB}/mercurial/templatefilters.py
 ${PYSITELIB}/mercurial/templatefilters.pyc
 ${PYSITELIB}/mercurial/templatefilters.pyo
+${PYSITELIB}/mercurial/templatekw.py
+${PYSITELIB}/mercurial/templatekw.pyc
+${PYSITELIB}/mercurial/templatekw.pyo
 ${PYSITELIB}/mercurial/templater.py
 ${PYSITELIB}/mercurial/templater.pyc
 ${PYSITELIB}/mercurial/templater.pyo
@@ -418,6 +413,7 @@ ${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
 ${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/branches.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelogentry.tmpl
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 3a88e5e5e23..18b6515c014 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.27 2010/02/03 10:47:21 wiz Exp $
+$NetBSD: distinfo,v 1.28 2010/03/07 23:23:59 wiz Exp $
 
-SHA1 (mercurial-1.4.3.tar.gz) = 26ed2726b4a8886bbc5a1b3e0823ad252a13b991
-RMD160 (mercurial-1.4.3.tar.gz) = 7dee2f0752befcec85f2d6b7ab87e2603aa94d76
-Size (mercurial-1.4.3.tar.gz) = 1925613 bytes
+SHA1 (mercurial-1.5.tar.gz) = f4e5ff53be661a8bd1422c70ae76337aafbffa56
+RMD160 (mercurial-1.5.tar.gz) = adc1bca311ecac8afd13424613fc95a3777f1011
+Size (mercurial-1.5.tar.gz) = 2017153 bytes