Revbump to fix an endless grep search (needed by tortoisehg)

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 55 insertions, 2 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 752d52589e62..452dd0d393f6 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.87 2012/11/11 18:04:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.88 2012/11/24 22:42:49 polynomial-c Exp $
+
+*mercurial-2.4-r1 (24 Nov 2012)
+
+  24 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -mercurial-2.4.ebuild,
+  +mercurial-2.4-r1.ebuild, +files/mercurial-2.4-dont_grep_indefinitely.patch:
+  non-maintainer commit: Revbump to fix an endless grep search (needed by
+  tortoisehg).
 
 *mercurial-2.4 (11 Nov 2012)
 
diff --git a/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch b/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch
new file mode 100644
index 000000000000..0f95724ffa11
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-2.4-dont_grep_indefinitely.patch
@@ -0,0 +1,43 @@
+
+# HG changeset patch
+# User Idan Kamara <idankk86@gmail.com>
+# Date 1352741223 -7200
+# Node ID 35ba170c0f82dba18f0207ef4bd93216e6de8bbf
+# Parent  45bd0cd7ca04f8cda0a61cddded8838dd312675a
+grep: don't search past the end of the searched string
+
+'*' causes the resulting RE to match 0 or more repetitions of the preceding RE:
+
+>>> bool(re.search('.*', ''))
+>>> True
+
+This causes an infinite loop because currently we're only checking if there was
+a match without looking at where we are in the searched string.
+
+diff -r 45bd0cd7ca04 -r 35ba170c0f82 mercurial/commands.py
+--- a/mercurial/commands.py	Tue Nov 13 08:41:56 2012 -0800
++++ b/mercurial/commands.py	Mon Nov 12 19:27:03 2012 +0200
+@@ -2935,7 +2935,7 @@
+     def matchlines(body):
+         begin = 0
+         linenum = 0
+-        while True:
++        while True and begin < len(body):
+             match = regexp.search(body, begin)
+             if not match:
+                 break
+diff -r 45bd0cd7ca04 -r 35ba170c0f82 tests/test-grep.t
+--- a/tests/test-grep.t	Tue Nov 13 08:41:56 2012 -0800
++++ b/tests/test-grep.t	Mon Nov 12 19:27:03 2012 +0200
+@@ -23,6 +23,10 @@
+ 
+ simple
+ 
++  $ hg grep '.*'
++  port:4:export
++  port:4:vaportight
++  port:4:import/export
+   $ hg grep port port
+   port:4:export
+   port:4:vaportight
+
diff --git a/dev-vcs/mercurial/mercurial-2.4.ebuild b/dev-vcs/mercurial/mercurial-2.4-r1.ebuild
index 1d755cfa9616..c707f47ee784 100644
--- a/dev-vcs/mercurial/mercurial-2.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.ebuild,v 1.1 2012/11/11 18:04:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4-r1.ebuild,v 1.1 2012/11/24 22:42:49 polynomial-c Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -41,6 +41,9 @@ src_prepare() {
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	# Fix an endless grep search (needed by tortoisehg)
+	epatch "${FILESDIR}"/${P}-dont_grep_indefinitely.patch
 }
 
 src_compile() {