# HG changeset patch # User Pierre-Yves David # Date 1488474800 -3600 # Node ID 10d80adec0c2dcca37a0d46dd88ad6a83acda09e # Parent 40f4b0146db88e85da2fa56fda3481ca244bce0f evolve: prevent global variable shadowing Small and harmless pyflake complains. diff -r 40f4b0146db8 -r 10d80adec0c2 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Thu Mar 02 18:13:03 2017 +0100 +++ b/hgext3rd/evolve/__init__.py Thu Mar 02 18:13:20 2017 +0100 @@ -2332,8 +2332,8 @@ # a revision we have to only delete the bookmark and not strip # anything. revsets cannot detect that case. nodetobookmarks = {} - for mark, node in repomarks.iteritems(): - nodetobookmarks.setdefault(node, []).append(mark) + for mark, bnode in repomarks.iteritems(): + nodetobookmarks.setdefault(bnode, []).append(mark) for marks in nodetobookmarks.values(): if bookmarks.issuperset(marks): rsrevs = repair.stripbmrevset(repo, marks[0])