Mercurial > public > mercurial-scm > hg-stable
diff mercurial/tagmerge.py @ 22200:b27c3beaaf30
cleanup: avoid local vars shadowing imports
This will mute some pyflakes "import ... shadowed by loop variable" warnings.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 15 Aug 2014 16:20:47 +0200 |
| parents | 50e20154cb68 |
| children | e53f6b72a0e4 |
line wrap: on
line diff
--- a/mercurial/tagmerge.py Fri Aug 15 16:20:47 2014 +0200 +++ b/mercurial/tagmerge.py Fri Aug 15 16:20:47 2014 +0200 @@ -71,7 +71,7 @@ # - put blocks whose nodes come all from p2 first # - write the tag blocks in the sorted order -import tags +import tags as tagsmod import util from node import nullid, hex from i18n import _ @@ -85,8 +85,8 @@ with each tag. Rhis is done because only the line numbers of the first parent are useful for merging ''' - filetags = tags._readtaghist(ui, repo, lines, fn=fn, recode=None, - calcnodelines=True)[1] + filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None, + calcnodelines=True)[1] for tagname, taginfo in filetags.items(): if not keeplinenums: for el in taginfo: