From 626ed41ad9b4c08c3420798e8b2307c0f41c6f67 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Tue, 21 Feb 2012 06:14:46 +0000
Subject: [PATCH] Update mercurial to 2.1.

---
 dev-vcs/mercurial/mercurial-2.1.bep           | 30 +++++++++++++++++++
 dev-vcs/mercurial/patches/mercurial-2.1.patch | 12 ++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 dev-vcs/mercurial/mercurial-2.1.bep
 create mode 100644 dev-vcs/mercurial/patches/mercurial-2.1.patch

diff --git a/dev-vcs/mercurial/mercurial-2.1.bep b/dev-vcs/mercurial/mercurial-2.1.bep
new file mode 100644
index 000000000..bef0bb485
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.1.bep
@@ -0,0 +1,30 @@
+DESCRIPTION="Mercurial is a free, distributed source control management tool" 
+HOMEPAGE="http://mercurial.selenic.com/" 
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.1.tar.gz"
+CHECKSUM_MD5="d2ca44f8d0129ab50639143af99d9363"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-lang/python >= 2.3"
+BUILD {
+	cd mercurial-2.1
+	python setup.py build --force
+}
+
+INSTALL {
+	cd mercurial-2.1
+	if [ -n "${DESTDIR}" ];then
+		python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
+	else
+		python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force
+	fi
+}
+
+TEST {
+	cd mercurial-2.1/tests
+	shopt -s extglob
+	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
+	python run-tests.py
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Matt Mackall et al."
diff --git a/dev-vcs/mercurial/patches/mercurial-2.1.patch b/dev-vcs/mercurial/patches/mercurial-2.1.patch
new file mode 100644
index 000000000..21dd65a07
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-2.1.patch
@@ -0,0 +1,12 @@
+diff -up mercurial-2.1/mercurial/ui.py.orig mercurial-2.1/mercurial/ui.py
+--- mercurial-2.1/mercurial/ui.py.orig	2012-02-01 13:23:54.044040192 -0700
++++ mercurial-2.1/mercurial/ui.py	2012-02-20 23:13:31.630980608 -0700
+@@ -687,7 +687,7 @@ class ui(object):
+         return (os.environ.get("HGEDITOR") or
+                 self.config("ui", "editor") or
+                 os.environ.get("VISUAL") or
+-                os.environ.get("EDITOR", "vi"))
++                os.environ.get("EDITOR", "nano"))
+ 
+     def progress(self, topic, pos, item="", unit="", total=None):
+         '''show a progress message