bisect: avoid confusing use of variables with same names in nested local scopes
authorMads Kiilerich <madski@unity3d.com>
Sat, 16 Nov 2013 15:46:29 -0500
changeset 20052 79d3b6a45351
parent 20051 b988b3b19303
child 20053 2455e96ec73b
bisect: avoid confusing use of variables with same names in nested local scopes
mercurial/commands.py
--- a/mercurial/commands.py	Sat Nov 16 15:46:29 2013 -0500
+++ b/mercurial/commands.py	Sat Nov 16 15:46:29 2013 -0500
@@ -701,7 +701,7 @@
                 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
                 check_state(state, interactive=False)
                 # bisect
-                nodes, changesets, good = hbisect.bisect(repo.changelog, state)
+                nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
                 # update to next check
                 node = nodes[0]
                 if not noupdate:
@@ -710,7 +710,7 @@
         finally:
             state['current'] = [node]
             hbisect.save_state(repo, state)
-        print_result(nodes, good)
+        print_result(nodes, bgood)
         return
 
     # update state