Update mercurial to 2.4 and git to 1.8.0

dev-vcs/mercurial/patches/mercurial-2.1.patch

@@ -1,12 +0,0 @@
-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

dev-vcs/mercurial/patches/mercurial-2.2.1.patch

@@ -1,12 +0,0 @@
-diff -up mercurial-2.2.1/mercurial/ui.py.orig mercurial-2.2.1/mercurial/ui.py
---- mercurial-2.2.1/mercurial/ui.py.orig	2012-05-03 15:06:29.013369344 -0600
-+++ mercurial-2.2.1/mercurial/ui.py	2012-05-03 20:21:26.126091264 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or

dev-vcs/mercurial/patches/mercurial-2.4.patch

@@ -1,7 +1,7 @@
-diff -up mercurial-2.2/mercurial/ui.py.orig mercurial-2.2/mercurial/ui.py
---- mercurial-2.2/mercurial/ui.py.orig	2012-05-02 21:41:24.391643136 -0600
-+++ mercurial-2.2/mercurial/ui.py	2012-05-02 21:42:15.730595328 -0600
-@@ -693,7 +693,7 @@ class ui(object):
+diff -up mercurial-2.4/mercurial/ui.py.orig mercurial-2.4/mercurial/ui.py
+--- mercurial-2.4/mercurial/ui.py.orig	2012-08-02 00:49:31.022544384 -0600
++++ mercurial-2.4/mercurial/ui.py	2012-08-02 01:06:19.942407680 -0600
+@@ -701,7 +701,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else: