Mercurial > public > mercurial-scm > hg-stable

diff mercurial/revset.py @ 29216:ead25aa27a43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert to next() function next(..) was introduced in py2.6 and .next() is not available in py3 https://docs.python.org/2/library/functions.html#next
author timeless <timeless@mozdev.org>
date Mon, 16 May 2016 21:30:53 +0000
parents f5983805574e
children e150c1d5f262
line wrap: on
line diff
--- a/mercurial/revset.py	Mon May 16 21:30:32 2016 +0000
+++ b/mercurial/revset.py	Mon May 16 21:30:53 2016 +0000
@@ -2821,9 +2821,9 @@
         # Consume both iterators in an ordered way until one is empty
         while True:
             if val1 is None:
-                val1 = iter1.next()
+                val1 = next(iter1)
             if val2 is None:
-                val2 = iter2.next()
+                val2 = next(iter2)
             n = choice(val1, val2)
             yield n
             if val1 == n: