Mercurial > hg

changeset 29215:f5983805574e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: rename variable to avoid shadowing with builtin next() function https://docs.python.org/2/library/functions.html#next
author timeless <timeless@mozdev.org>
date Mon, 16 May 2016 21:30:32 +0000
parents ceca932c080d
children ead25aa27a43
files mercurial/revset.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revset.py	Fri May 06 18:12:36 2016 -0700
+++ b/mercurial/revset.py	Mon May 16 21:30:32 2016 +0000
@@ -2824,11 +2824,11 @@
                 val1 = iter1.next()
             if val2 is None:
                 val2 = iter2.next()
-            next = choice(val1, val2)
-            yield next
-            if val1 == next:
+            n = choice(val1, val2)
+            yield n
+            if val1 == n:
                 val1 = None
-            if val2 == next:
+            if val2 == n:
                 val2 = None
     except StopIteration:
         # Flush any remaining values and consume the other one