Update to 2.0:

1.1. Major features
    New core graft command (similar to transplant extension)
    New largefiles extension

1.2. Core changes

    commit: abort when there are uncommitted subrepos, use the -S option to recurse
    help: most commands now have usage examples with help -v
    import: add --edit switch
    revset: add more keywords for bisection
    revert: introduce short option -C for --no-backup
    log: add new 'bisect' style that prints the bisection status
    hgweb: add a "web/logoimg" setting to customize the web logo image
    subrepo: pull revisions on demand when archiving hg subrepos

1.3. Extension changes

    color: add styles for tags
    convert: added bookmarks support in filemap
    eol: add new eol.fix-trailing-newline setting
    eol: eol.only-consistent can now be specified in .hgeol
    export: add %m to file format string (first line of the commit message)
    mq: make qqueue print current queue name
    rebase: add --edit switch
    rebase: add --rev option to rebase
    rebase: allow rebase on ancestor
    share: introduce unshare command
    transplant: add --edit option

1.4. Bug fixes

    alias: don't shadow commands that we only partially matched (issue2993) (BC)
    commit: suppress spurious new head message for duplicate commit (issue2893)
    contrib: some support for named branches in zsh_completion (issue2988)
    progress: add a changedelay to prevent parallel topics from flapping (issue2698)
    rebase: allow rebase to ancestor (issue3010)
    rollback: avoid unsafe rollback when not at tip (issue2998)
    subrepo: fix git branch tracking logic (issue2920)
    subrepo: fix repo relative path calculation for root directories (issue3033)
    summary: show bookmarks separate from tags and note active mark (issue2892)
    util: wrap lines with multi-byte characters correctly (issue2943)
    verify: filter messages about missing null manifests (issue2900)
    wireproto: do not call pushkey module directly (issue3041)
    auth: fix realm handling with Python < 2.4.3 (issue2739)
    diffstat: be more picky when marking file as 'binary' (issue2816)
    dirstate: don't fail when dropping a not-tracked file (issue3080)
    grep: correct handling of matching lines without line ending (issue3050)
    hgweb: fix dynamic date calculation not working under Safari
    mq: avoid data loss upon qfold + qmv (issue3058)
    setup: set whole env for running hg even if .hg doesn't exist (issue3073)

3 files changed, 41 insertions, 7 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index ad281535e10..b00075e03d9 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2011/10/10 13:01:30 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2011/11/02 23:14:33 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.9.3
+DISTNAME=	mercurial-2.0
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 15de8a69c2f..574b0ffce94 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2011/07/12 11:27:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2011/11/02 23:14:33 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -96,6 +96,39 @@ ${PYSITELIB}/hgext/interhg.pyo
 ${PYSITELIB}/hgext/keyword.py
 ${PYSITELIB}/hgext/keyword.pyc
 ${PYSITELIB}/hgext/keyword.pyo
+${PYSITELIB}/hgext/largefiles/__init__.py
+${PYSITELIB}/hgext/largefiles/__init__.pyc
+${PYSITELIB}/hgext/largefiles/__init__.pyo
+${PYSITELIB}/hgext/largefiles/basestore.py
+${PYSITELIB}/hgext/largefiles/basestore.pyc
+${PYSITELIB}/hgext/largefiles/basestore.pyo
+${PYSITELIB}/hgext/largefiles/lfcommands.py
+${PYSITELIB}/hgext/largefiles/lfcommands.pyc
+${PYSITELIB}/hgext/largefiles/lfcommands.pyo
+${PYSITELIB}/hgext/largefiles/lfutil.py
+${PYSITELIB}/hgext/largefiles/lfutil.pyc
+${PYSITELIB}/hgext/largefiles/lfutil.pyo
+${PYSITELIB}/hgext/largefiles/localstore.py
+${PYSITELIB}/hgext/largefiles/localstore.pyc
+${PYSITELIB}/hgext/largefiles/localstore.pyo
+${PYSITELIB}/hgext/largefiles/overrides.py
+${PYSITELIB}/hgext/largefiles/overrides.pyc
+${PYSITELIB}/hgext/largefiles/overrides.pyo
+${PYSITELIB}/hgext/largefiles/proto.py
+${PYSITELIB}/hgext/largefiles/proto.pyc
+${PYSITELIB}/hgext/largefiles/proto.pyo
+${PYSITELIB}/hgext/largefiles/remotestore.py
+${PYSITELIB}/hgext/largefiles/remotestore.pyc
+${PYSITELIB}/hgext/largefiles/remotestore.pyo
+${PYSITELIB}/hgext/largefiles/reposetup.py
+${PYSITELIB}/hgext/largefiles/reposetup.pyc
+${PYSITELIB}/hgext/largefiles/reposetup.pyo
+${PYSITELIB}/hgext/largefiles/uisetup.py
+${PYSITELIB}/hgext/largefiles/uisetup.pyc
+${PYSITELIB}/hgext/largefiles/uisetup.pyo
+${PYSITELIB}/hgext/largefiles/wirestore.py
+${PYSITELIB}/hgext/largefiles/wirestore.pyc
+${PYSITELIB}/hgext/largefiles/wirestore.pyo
 ${PYSITELIB}/hgext/mq.py
 ${PYSITELIB}/hgext/mq.pyc
 ${PYSITELIB}/hgext/mq.pyo
@@ -490,6 +523,7 @@ ${PYSITELIB}/mercurial/templates/gitweb/search.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/summary.tmpl
 ${PYSITELIB}/mercurial/templates/gitweb/tags.tmpl
+${PYSITELIB}/mercurial/templates/map-cmdline.bisect
 ${PYSITELIB}/mercurial/templates/map-cmdline.changelog
 ${PYSITELIB}/mercurial/templates/map-cmdline.compact
 ${PYSITELIB}/mercurial/templates/map-cmdline.default
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index d6079f057fc..06cb7e55429 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.50 2011/10/10 13:01:30 wiz Exp $
+$NetBSD: distinfo,v 1.51 2011/11/02 23:14:33 wiz Exp $
 
-SHA1 (mercurial-1.9.3.tar.gz) = 6be1b85d7cfd67283f4c76ed64570110b99a3fe1
-RMD160 (mercurial-1.9.3.tar.gz) = badc314f0a364c3e64131247665ebbc63d1533a9
-Size (mercurial-1.9.3.tar.gz) = 2977205 bytes
+SHA1 (mercurial-2.0.tar.gz) = 5ede1b3f54d3be2af0657901e7013dde7c19b7c5
+RMD160 (mercurial-2.0.tar.gz) = f0c5f143eabff4a6c06d512cecd718bf594d06b1
+Size (mercurial-2.0.tar.gz) = 3090977 bytes