[PATCH 1 of 3] revset: rename variable to avoid shadowing with builtin next() function

[timeless]

# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1463434232 0
#      Mon May 16 21:30:32 2016 +0000
# Node ID 41e57b118c22aa02c80c91903a0774c5f8581463
# Parent  5e0077e9c6c0e36a6eb8ab6c12bb8045f07bd2d1
# Available At bb://timeless/mercurial-crew
#              hg pull bb://timeless/mercurial-crew -r 41e57b118c22
revset: rename variable to avoid shadowing with builtin next() function

https://docs.python.org/2/library/functions.html#next

diff -r 5e0077e9c6c0 -r 41e57b118c22 mercurial/revset.py
--- a/mercurial/revset.py	Wed May 11 01:56:59 2016 +0000
+++ 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