Mercurial > public > mercurial-scm > hg
diff mercurial/revset.py @ 12085:6f833fc3ccab
Consistently import foo as foomod when foo to avoid shadowing
This is in the style of 5f091fc1bab7.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Mon, 30 Aug 2010 14:38:24 +0200 |
| parents | df52ff0980fe |
| children | 11db6fa2961e |
line wrap: on
line diff
--- a/mercurial/revset.py Mon Aug 30 13:00:22 2010 +0200 +++ b/mercurial/revset.py Mon Aug 30 14:38:24 2010 +0200 @@ -7,7 +7,7 @@ import re import parser, util, error, discovery -import match as _match +import match as matchmod from i18n import _ elements = { @@ -292,7 +292,7 @@ def hasfile(repo, subset, x): pat = getstring(x, _("file wants a pattern")) - m = _match.match(repo.root, repo.getcwd(), [pat]) + m = matchmod.match(repo.root, repo.getcwd(), [pat]) s = [] for r in subset: for f in repo[r].files(): @@ -303,7 +303,7 @@ def contains(repo, subset, x): pat = getstring(x, _("contains wants a pattern")) - m = _match.match(repo.root, repo.getcwd(), [pat]) + m = matchmod.match(repo.root, repo.getcwd(), [pat]) s = [] if m.files() == [pat]: for r in subset: @@ -319,7 +319,7 @@ return s def checkstatus(repo, subset, pat, field): - m = _match.match(repo.root, repo.getcwd(), [pat]) + m = matchmod.match(repo.root, repo.getcwd(), [pat]) s = [] fast = (m.files() == [pat]) for r in subset: