Update to 1.3. Set LICENSE. Disallow Python-2.3 (see below).

Major Changes

    * experimental support for sub-repositories
    * Python 2.3 is no longer supported; now requires Python 2.4-2.6

Commands

    * merge: add -P/--preview option
    * update: don't unlink added files when -C/--clean is specified
    * update: added -c/--check option to abort on local changes
    * update: allow merges going backwards
    * push: improved handling of named branches
    * branches/heads: add a -c/--closed option to show closed branches
    * help: new extensions topic

General

    * add patch.eol config setting to work with cross-platform patches
    * fixed support for SSL through proxies
    * add ability to load hooks from arbitrary Python modules
    * hide passwords for HTTP repositories in error and log output
    * fix Python 2.6 support in the Windows installer
    * add mechanism for specifying HTTP authentication details in hgrc
    * prompts and choices are now shown even in non-interactive mode
    * performance improvements, especially on Windows
    * much improved zsh completion
    * improved Danish, Japanese, Italian and simplified Chinese translations
    * new German, French, Greek, Brazilian Portuguese and traditional Chinese translations

Web interface

    * read configuration data from webdir configs
    * add branches page to hgweb
    * pluggable templater engine support
    * refresh hgwebdir configuration periodically
    * let web.encoding override ui.encoding setting
    * deal with dicts/lists like webdir config paths

Extensions

    * experimental share extension
    * the alias extension has been moved into core
    * mq
          o add -P/--push option to qimport
          o numerous bug fixes
    * convert
          o improved source detection
          o support for comments in author maps
          o add branch map support
          o add different ordering options
          o svn: support OS-specific authn providers
          o svn: improved tag support
          o git: add committer tag only when needed
          o bzr: fix renaming support
          o bzr: add support for filemaps
          o bzr: handle timestamps correctly
          o bzr: fix symlink handling
          o bzr: restore paths to source encoding
          o cvs: add support for CVS merge(point)s
          o cvs: add support for synthetic revisions
          o cvs: better support for branchpoints
          o cvs: deprecate use of external cvsps
          o mtn: improve renaming support
          o mtn: support mtn database files as source
          o mtn: improve date/time support
          o p4: better handling of keywords, binary files and symlinks
    * rebase
          o don't lose copy/rename info
          o keep original mq patch format
    * zeroconf
          o advertise repositories by hostname
          o try to guess IP address if necessary
    * patchbomb
          o option to set attachment name
          o support for In-Reply-To header
    * inotify
          o fix handling of untracked files moved out of repository
          o fix support for directory deletion
    * acl: now works with push over https

3 files changed, 55 insertions, 20 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index c519c94853f..f4f82530d04 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.30 2009/07/16 22:12:17 zafer Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/17 20:35:48 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.2.1
+DISTNAME=	mercurial-1.3
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://mercurial.selenic.com/wiki/
 COMMENT=	Fast, lightweight source control management system
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
-PY_PATCHPLIST=	yes
-PYDISTUTILSPKG=	yes
-USE_TOOLS+=	gmake msgfmt
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+PY_PATCHPLIST=			yes
+PYDISTUTILSPKG=			yes
+PYTHON_VERSIONS_INCOMPATIBLE=	23
+USE_TOOLS+=			gmake msgfmt
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index ba100f4b20d..08513984c5b 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:48:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/07/17 20:35:48 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -6,9 +6,6 @@ ${PYSITELIB}/hgext/__init__.pyo
 ${PYSITELIB}/hgext/acl.py
 ${PYSITELIB}/hgext/acl.pyc
 ${PYSITELIB}/hgext/acl.pyo
-${PYSITELIB}/hgext/alias.py
-${PYSITELIB}/hgext/alias.pyc
-${PYSITELIB}/hgext/alias.pyo
 ${PYSITELIB}/hgext/bookmarks.py
 ${PYSITELIB}/hgext/bookmarks.pyc
 ${PYSITELIB}/hgext/bookmarks.pyo
@@ -123,6 +120,9 @@ ${PYSITELIB}/hgext/rebase.pyo
 ${PYSITELIB}/hgext/record.py
 ${PYSITELIB}/hgext/record.pyc
 ${PYSITELIB}/hgext/record.pyo
+${PYSITELIB}/hgext/share.py
+${PYSITELIB}/hgext/share.pyc
+${PYSITELIB}/hgext/share.pyo
 ${PYSITELIB}/hgext/transplant.py
 ${PYSITELIB}/hgext/transplant.pyc
 ${PYSITELIB}/hgext/transplant.pyo
@@ -170,6 +170,9 @@ ${PYSITELIB}/mercurial/cmdutil.pyo
 ${PYSITELIB}/mercurial/commands.py
 ${PYSITELIB}/mercurial/commands.pyc
 ${PYSITELIB}/mercurial/commands.pyo
+${PYSITELIB}/mercurial/config.py
+${PYSITELIB}/mercurial/config.pyc
+${PYSITELIB}/mercurial/config.pyo
 ${PYSITELIB}/mercurial/context.py
 ${PYSITELIB}/mercurial/context.pyc
 ${PYSITELIB}/mercurial/context.pyo
@@ -186,6 +189,9 @@ ${PYSITELIB}/mercurial/dirstate.pyo
 ${PYSITELIB}/mercurial/dispatch.py
 ${PYSITELIB}/mercurial/dispatch.pyc
 ${PYSITELIB}/mercurial/dispatch.pyo
+${PYSITELIB}/mercurial/encoding.py
+${PYSITELIB}/mercurial/encoding.pyc
+${PYSITELIB}/mercurial/encoding.pyo
 ${PYSITELIB}/mercurial/error.py
 ${PYSITELIB}/mercurial/error.pyc
 ${PYSITELIB}/mercurial/error.pyo
@@ -253,9 +259,15 @@ ${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/zh.po
+${PYSITELIB}/mercurial/i18n/pt_BR.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
@@ -263,9 +275,14 @@ ${PYSITELIB}/mercurial/keepalive.py
 ${PYSITELIB}/mercurial/keepalive.pyc
 ${PYSITELIB}/mercurial/keepalive.pyo
 ${PYSITELIB}/mercurial/locale/da/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/de/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/el/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/fr/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/it/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/ja/LC_MESSAGES/hg.mo
-${PYSITELIB}/mercurial/locale/zh/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/localrepo.py
 ${PYSITELIB}/mercurial/localrepo.pyc
 ${PYSITELIB}/mercurial/localrepo.pyo
@@ -275,6 +292,9 @@ ${PYSITELIB}/mercurial/lock.pyo
 ${PYSITELIB}/mercurial/lsprof.py
 ${PYSITELIB}/mercurial/lsprof.pyc
 ${PYSITELIB}/mercurial/lsprof.pyo
+${PYSITELIB}/mercurial/lsprofcalltree.py
+${PYSITELIB}/mercurial/lsprofcalltree.pyc
+${PYSITELIB}/mercurial/lsprofcalltree.pyo
 ${PYSITELIB}/mercurial/mail.py
 ${PYSITELIB}/mercurial/mail.pyc
 ${PYSITELIB}/mercurial/mail.pyo
@@ -299,6 +319,9 @@ ${PYSITELIB}/mercurial/parsers.so
 ${PYSITELIB}/mercurial/patch.py
 ${PYSITELIB}/mercurial/patch.pyc
 ${PYSITELIB}/mercurial/patch.pyo
+${PYSITELIB}/mercurial/posix.py
+${PYSITELIB}/mercurial/posix.pyc
+${PYSITELIB}/mercurial/posix.pyo
 ${PYSITELIB}/mercurial/repair.py
 ${PYSITELIB}/mercurial/repair.pyc
 ${PYSITELIB}/mercurial/repair.pyo
@@ -329,6 +352,9 @@ ${PYSITELIB}/mercurial/streamclone.pyo
 ${PYSITELIB}/mercurial/strutil.py
 ${PYSITELIB}/mercurial/strutil.pyc
 ${PYSITELIB}/mercurial/strutil.pyo
+${PYSITELIB}/mercurial/subrepo.py
+${PYSITELIB}/mercurial/subrepo.pyc
+${PYSITELIB}/mercurial/subrepo.pyo
 ${PYSITELIB}/mercurial/templatefilters.py
 ${PYSITELIB}/mercurial/templatefilters.pyc
 ${PYSITELIB}/mercurial/templatefilters.pyo
@@ -345,6 +371,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/branches.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/changeset.tmpl
@@ -367,6 +394,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/monoblue/branches.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/changeset.tmpl
@@ -386,6 +414,7 @@ ${PYSITELIB}/mercurial/templates/monoblue/search.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/summary.tmpl
 ${PYSITELIB}/mercurial/templates/monoblue/tags.tmpl
+${PYSITELIB}/mercurial/templates/paper/branches.tmpl
 ${PYSITELIB}/mercurial/templates/paper/changeset.tmpl
 ${PYSITELIB}/mercurial/templates/paper/error.tmpl
 ${PYSITELIB}/mercurial/templates/paper/fileannotate.tmpl
@@ -421,6 +450,7 @@ ${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/spartan/branches.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/spartan/changeset.tmpl
@@ -466,12 +496,15 @@ ${PYSITELIB}/mercurial/url.pyo
 ${PYSITELIB}/mercurial/util.py
 ${PYSITELIB}/mercurial/util.pyc
 ${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/win32.py
+${PYSITELIB}/mercurial/win32.pyc
+${PYSITELIB}/mercurial/win32.pyo
+${PYSITELIB}/mercurial/windows.py
+${PYSITELIB}/mercurial/windows.pyc
+${PYSITELIB}/mercurial/windows.pyo
 man/man1/hg.1
 man/man5/hgignore.5
 man/man5/hgrc.5
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 2d86056158d..ef4f9592c1c 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2009/03/22 09:40:01 wiz Exp $
+$NetBSD: distinfo,v 1.22 2009/07/17 20:35:48 wiz Exp $
 
-SHA1 (mercurial-1.2.1.tar.gz) = f40282bbb17fedb08b16aa7a4eeb1da7b6a6f1cb
-RMD160 (mercurial-1.2.1.tar.gz) = 37c94e5ef9cdc639fe23622ddaf97b2230ec2216
-Size (mercurial-1.2.1.tar.gz) = 1269393 bytes
+SHA1 (mercurial-1.3.tar.gz) = af1bfc2817e0719124593e4ec03f0056a4b2870c
+RMD160 (mercurial-1.3.tar.gz) = 20032f18a2bbe1d60969567299bb9ca3392fe6d9
+Size (mercurial-1.3.tar.gz) = 1768227 bytes