# HG changeset patch # User Nathaniel Manista # Date 1460661978 14400 # Node ID 80be5dbe6e74a1b2f20ee118791a6e046a78cccf # Parent e1dd0de26557d9f36dbd82943a5f5ffd0167a833 cmdutil: avoid recycling variable name "name" in namespaces code This just feels like asking for future trouble and confusion. diff -r e1dd0de26557 -r 80be5dbe6e74 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Tue Apr 05 06:53:33 2016 +0200 +++ b/mercurial/cmdutil.py Thu Apr 14 15:26:18 2016 -0400 @@ -1275,10 +1275,10 @@ self.ui.write(_("branch: %s\n") % branch, label='log.branch') - for name, ns in self.repo.names.iteritems(): + for nsname, ns in self.repo.names.iteritems(): # branches has special logic already handled above, so here we just # skip it - if name == 'branches': + if nsname == 'branches': continue # we will use the templatename as the color name since those two # should be the same