# HG changeset patch # User Mads Kiilerich # Date 1384634789 18000 # Node ID 79d3b6a45351600aa1abf613f8cf8909d3b6529b # Parent b988b3b19303463927b5f405a213f0766ba969b7 bisect: avoid confusing use of variables with same names in nested local scopes diff -r b988b3b19303 -r 79d3b6a45351 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