Update to 2.1:

Mercurial 2.1 (2012-02-01)

This is a regularly-scheduled feature release. See UpgradeNotes for some minor compatibility notes.

1.1. Major features

   * Changesets now have a phase attribute, which tracks what changesets are safe to modify (see Phases)

1.2. Core changes

   * annotate: support diff whitespace filtering flags (issue3030)
   * bookmarks: automatically advance bookmark on bare update (BC) (issue2894)
   * bookmarks: shadow divergent bookmarks of foo with foo@n
   * copies: improved copy detection for diff and status
   * hooks: new priority specifier to control ordering
   * id: add command line options for handling ssh and https urls
   * push: propagate --new-branch and --ssh options when pushing subrepos
   * revset: add remote() predicate to lookup remote revisions
   * subrepo: support explicit add and forget of files in subrepos

1.3. Extension changes

   * bugzilla: make XMLRPC interface support http and https access
   * largefiles: add --normal option to hg add (issue3061)
   * notify: add option for writing to mbox
   * rebase: add a "D" short option for detach
   * rebase: allow --detach when --rev is used
   * win32mbcs: allow win32mbcs extension to be enabled on cygwin platform
   * mq: add secret phase setting

1.4. Bug fixes

   * hgcia: fix diffstat support
   * largefiles: add error checking to tags conversion (issue3092)
   * largefiles: add tests for uncovered codepaths (issue3092)
   * largefiles: check if largefile could be found when archiving (issue3193)
   * largefiles: correctly download new largefiles when merging
   * largefiles: correctly handle dirstate status when rebasing
   * largefiles: correctly handle newly added largefile on other side of merge
   * largefiles: display remote errors from putlfile (issue3123) (issue3149)
   * largefiles: don't reference uninitialized variable (issue3092)
   * largefiles: fix caching largefiles from an aliased repo (issue3212)
   * largefiles: fix confusion upon removal of added largefile (issue3176)
   * largefiles: fix inappropriate locking (issue3182)
   * largefiles: fix output of hg summary (issue3060)
   * largefiles: cache new largefiles for new heads when pulling
   * largefiles: implement addremove (issue3064)
   * largefiles: optimize performance of status on largefiles repos (issue3136)
   * largefiles: optimize status when files are specified (issue3144)
   * largefiles: remove empty directories upon update (issue3202)
   * largefiles: fix addremove when no largefiles are specified
   * largefiles: fix revert on missing largefile (issue3217)
   * largefiles: fix transplant for all cases (issue3192)
   * mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
   * merge: give a special message for internal:merge failure (issue3105)
   * rebase: reinstate old-style rev spec support for the source and base (issue3181)
   * ssh: quote remote paths (issue2983)
   * sslutil: abort properly if no certificate received for https connection
   * sslutil: show fingerprint when cacerts validation fails
   * status: support revsets with --change
   * subrepo: avoid syncing bookmarks twice on clone (issue3191)
   * tag: invalidate tag cache immediately after adding new tag (issue3210)
   * util: don't encode ':' in url paths
   * bundlerepo: try to find containing repo on creation (issue1812)
   * convert: subversion convert abort on revision not found (issue3205)
   * discovery: fix regression when checking heads for pre 1.4 client (issue3218)
   * merge: defer symlink flag merging to filemerge (issue3200)
   * patch: a little bit more robust line counting on diff --stat (issue3183)
   * push: return 1 if no changes found (issue3228)
   * qpush: avoid trying to manage existing history (issue2218)
   * revsets: include the correct first ancestor change for follow(file)
   * revsets: filesets now work correctly inside of revsets

3 files changed, 11 insertions, 8 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 1005bb50da4..fedd9431483 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2012/01/28 08:22:03 obache Exp $
+# $NetBSD: Makefile,v 1.67 2012/02/12 18:49:45 wiz Exp $
 #
 
-DISTNAME=	mercurial-2.0.2
-PKGREVISION=	1
+DISTNAME=	mercurial-2.1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 7368e06a851..8b7533dd551 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2012/01/28 08:22:03 obache Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/02/12 18:49:45 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -286,6 +286,7 @@ ${PYSITELIB}/mercurial/help/hgweb.txt
 ${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
 ${PYSITELIB}/mercurial/help/patterns.txt
+${PYSITELIB}/mercurial/help/phases.txt
 ${PYSITELIB}/mercurial/help/revisions.txt
 ${PYSITELIB}/mercurial/help/revsets.txt
 ${PYSITELIB}/mercurial/help/subrepos.txt
@@ -423,6 +424,9 @@ ${PYSITELIB}/mercurial/parsers.so
 ${PYSITELIB}/mercurial/patch.py
 ${PYSITELIB}/mercurial/patch.pyc
 ${PYSITELIB}/mercurial/patch.pyo
+${PYSITELIB}/mercurial/phases.py
+${PYSITELIB}/mercurial/phases.pyc
+${PYSITELIB}/mercurial/phases.pyo
 ${PYSITELIB}/mercurial/posix.py
 ${PYSITELIB}/mercurial/posix.pyc
 ${PYSITELIB}/mercurial/posix.pyo
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index b4768ed29a0..ddecc19f732 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.53 2012/01/08 15:09:06 wiz Exp $
+$NetBSD: distinfo,v 1.54 2012/02/12 18:49:45 wiz Exp $
 
-SHA1 (mercurial-2.0.2.tar.gz) = aedcb4e41c5b49188d9d34d12c343b2ec099c61b
-RMD160 (mercurial-2.0.2.tar.gz) = 5d5da2c17994da77340de6527108fb4a38c216eb
-Size (mercurial-2.0.2.tar.gz) = 3134016 bytes
+SHA1 (mercurial-2.1.tar.gz) = f649a0b33e0cafb3e5867a2e970f41eb887d3fab
+RMD160 (mercurial-2.1.tar.gz) = 4d89616c7a2dff4d8c05cf9d8ee8b13bda1c9e23
+Size (mercurial-2.1.tar.gz) = 3308300 bytes