Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/revset.py
changeset 29216 ead25aa27a43
parent 29215 f5983805574e
child 29238 e150c1d5f262 
--- 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:
Mercurial