Update to 2.2:

1. Mercurial 2.2 (2012-05-01)

This is a regularly-scheduled feature release. The most notable
feature is a new safe '--amend' option for commit using our new
phases infrastructure. There are also a number of signficant
performance improvements for large repositories and improvements
for case-folding filesystems. See UpgradeNotes for minor compatibility
notes.

1.1. Core features

    commit: add --amend option
    fileset: add "subrepo" fileset symbol
    graft: add --dry-run support (issue3362)
    hgweb: add support for branch width and color settings
    hgweb: add block numbers to diff regions and related links
    hgweb: support multi-level repository indexes by enabling descend and collapse
    merge: improve performance with lots of unknown files
    parsers: incrementally parse the revlog index in C
    plan9: add support for plan9
    push/pull: improve performance for partial transfers
    push: decompress in larger chunks for better performance on the server
    clone: add server config option to prefer uncompressed clone
    revert: add support for reverting subrepos
    revset: add "matching" keyword
    store: speed up read and write of large fncache files
    ui: optionally quiesce ssl verification warnings on python 2.5

1.2. Extension features

    bugzilla: add xmlrpcemail submission for Bugzilla 3.6 email interface
    bugzilla: allow change comment to mark bugs fixed
    bugzilla: extract optional hours from commit message and update bug time
    bugzilla: modify access interface to include new bug states
    graphlog: add all log options to glog command
    patchbomb: add --body flag to send patches as inline message body text
    record: allow splitting of hunks by manually editing patches
    transplant: permit merge changesets via --parent

1.3. Fixes

    alias: fix shell alias documentation (issue3374)
    archive: make it work with svn subrepos (issue3308)
    branchmap: server should not advertise secret changeset in branchmap (Issue3303)
    clone: always close source repository (issue2491)
    commit: abort on merge with missing files (BC)
    config: discard UTF-8 BOM if found
    convert/bzr: convert all branches (issue3229) (BC)
    convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
    convert/bzr: handle empty bzr repositories (issue3233)
    convert/bzr: ignore nested repos when listing branches (issue3254)
    convert/svn: do not try converting empty head revisions (issue3347)
    convert/svn: make svn sink work with svn 1.7
    convert: support non-annotated tags in git backend
    dirstate: preserve path components case on renames (issue3402)
    export: catch exporting empty revsets (issue3353)
    icasefs: make case-folding collision detection rename aware (issue3370)
    inotify: catch SignalInterrupt during shutdown (issue3351)
    journal: use tryread helper to backup files (issue3375)
    largefiles: fix cat for largefiles (issue3352)
    largefiles: fix status -S reporting of subrepos (issue3231)
    largefiles: hide .hglf/ prefix for largefiles in hgweb
    largefiles: notice dirty large files in a subrepo
    largefiles: only update changed largefiles when transplanting
    largefiles: optimize update speed by only updating changed largefiles
    localrepo: add setparents() to adjust dirstate copies (issue3407)
    mdiff: fix diff header generation for files with spaces (issue3357)
    merge: check for untracked files more precisely (issue3400)
    merge: fix unknown file merge detection for case-folding systems
    patch: be more tolerant with "Parent" header (issue3356)
    patch: be more tolerant with EOLs in binary diffs (issue2870)
    patch: fix patch hunk/metdata synchronization (issue3384)
    phase: when phase cannot be reduced, hint at --force and return 1 (BC)
    posix: disable cygwin's symlink emulation (BC)
    posix: ignore execution bit in cygwin (issue3301)
    pure/osutil: use Python's msvcrt module (issue3380)
    rebase: preserve mq series order, guarded patches (issue2849)
    rebase: skip resolved but emptied revisions
    revset: fix O(n**2) behaviour of bisect() (issue3381)
    revset: fix adds/modifies/removes and patterns (issue3403)
    revset: fix alias substitution recursion (issue3240)
    subrepo/svn: abort on commit with missing file (issue3029)
    subrepo/svn: fix checked out rev number retrieval (issue2968)
    subrepo: fix default implementation of forget() (issue3404)
    subrepo: rewrite handling of subrepo state at commit (issue2403)
    templates/filters: extracting the user portion of an email address (BC)
    transplant: do not rollback on patching error (issue3379)
    update: fix case-collision with a clean wd and no --clean
    update: make --check abort with dirty subrepos
    update: use normal update path with --check (issue2450)
    wireprotocol: use visibleheads as reference while unbundling (issue 3303)

4 files changed, 16 insertions, 22 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 453ab320b77..d32271320ef 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2012/04/07 15:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2012/05/03 16:16:51 wiz Exp $
 #
 
-DISTNAME=	mercurial-2.1.2
+DISTNAME=	mercurial-2.2
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 0e77735c8a0..5d5cdfd11a3 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2012/04/08 20:21:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.30 2012/05/03 16:16:51 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -69,6 +69,9 @@ ${PYSITELIB}/hgext/eol.pyo
 ${PYSITELIB}/hgext/extdiff.py
 ${PYSITELIB}/hgext/extdiff.pyc
 ${PYSITELIB}/hgext/extdiff.pyo
+${PYSITELIB}/hgext/factotum.py
+${PYSITELIB}/hgext/factotum.pyc
+${PYSITELIB}/hgext/factotum.pyo
 ${PYSITELIB}/hgext/fetch.py
 ${PYSITELIB}/hgext/fetch.pyc
 ${PYSITELIB}/hgext/fetch.pyo
@@ -265,6 +268,9 @@ ${PYSITELIB}/mercurial/filemerge.pyo
 ${PYSITELIB}/mercurial/fileset.py
 ${PYSITELIB}/mercurial/fileset.pyc
 ${PYSITELIB}/mercurial/fileset.pyo
+${PYSITELIB}/mercurial/formatter.py
+${PYSITELIB}/mercurial/formatter.pyc
+${PYSITELIB}/mercurial/formatter.pyo
 ${PYSITELIB}/mercurial/graphmod.py
 ${PYSITELIB}/mercurial/graphmod.pyc
 ${PYSITELIB}/mercurial/graphmod.pyo
@@ -433,6 +439,9 @@ ${PYSITELIB}/mercurial/posix.pyo
 ${PYSITELIB}/mercurial/pushkey.py
 ${PYSITELIB}/mercurial/pushkey.pyc
 ${PYSITELIB}/mercurial/pushkey.pyo
+${PYSITELIB}/mercurial/pvec.py
+${PYSITELIB}/mercurial/pvec.pyc
+${PYSITELIB}/mercurial/pvec.pyo
 ${PYSITELIB}/mercurial/py3kcompat.py
 ${PYSITELIB}/mercurial/py3kcompat.pyc
 ${PYSITELIB}/mercurial/py3kcompat.pyo
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 8d61bef43f5..dca5e6daece 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.57 2012/04/07 15:08:21 wiz Exp $
+$NetBSD: distinfo,v 1.58 2012/05/03 16:16:51 wiz Exp $
 
-SHA1 (mercurial-2.1.2.tar.gz) = 6fa2f2510757e3e62efa9d8953f8b703b84075b2
-RMD160 (mercurial-2.1.2.tar.gz) = 4ac9a91e7debbe556f1c314cc3b6fc87b6cbf2f0
-Size (mercurial-2.1.2.tar.gz) = 3343349 bytes
+SHA1 (mercurial-2.2.tar.gz) = 8d2dc0b72d0e2aef70770a9eca32154f456e8afa
+RMD160 (mercurial-2.2.tar.gz) = 8dd7b78da6ebdab1882a749c5ad3198ef765eff2
+Size (mercurial-2.2.tar.gz) = 3414331 bytes
diff --git a/devel/mercurial/patches/patch-setup.py b/devel/mercurial/patches/patch-setup.py
deleted file mode 100644
index 6d925ef0b2b..00000000000
--- a/devel/mercurial/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2012/03/15 19:43:06 adam Exp $
-
-Fix double splitlines(); affects builing on Mac OS X.
-
---- setup.py.orig	2012-03-15 19:37:26.000000000 +0000
-+++ setup.py
-@@ -452,7 +452,7 @@ if os.name == 'nt':
- if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
-     # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
-     # distutils.sysconfig
--    version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()
-+    version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0]
-     if version:
-         version = version.splitlines()[0]
-         xcode4 = (version.startswith('Xcode') and