[PATCH 7 of 8] bisect: avoid confusing use of variables with same names in nested local scopes
Mads Kiilerich
mads at kiilerich.com
Sun Nov 17 10:29:03 CST 2013
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1384634789 18000
# Sat Nov 16 15:46:29 2013 -0500
# Branch stable
# Node ID b3be2f364608c950e663e7db107bebf48f4ab912
# Parent 42bb45f0b844d959b665de133fc95c61b2f214c2
bisect: avoid confusing use of variables with same names in nested local scopes
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -700,7 +700,7 @@ def bisect(ui, repo, rev=None, extra=Non
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:
@@ -709,7 +709,7 @@ def bisect(ui, repo, rev=None, extra=Non
finally:
state['current'] = [node]
hbisect.save_state(repo, state)
- print_result(nodes, good)
+ print_result(nodes, bgood)
return
# update state
More information about the Mercurial-devel
mailing list