Mercurial > public > mercurial-scm > hg
diff mercurial/match.py @ 20401:906358d0350e
match: use ctx.getfileset() instead of fileset.getfileset()
Resolves an import cycle involving match and merge.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Tue, 04 Feb 2014 14:54:42 -0500 |
| parents | f962870712da |
| children | b02ab6486a78 |
line wrap: on
line diff
--- a/mercurial/match.py Tue Feb 04 15:27:49 2014 -0500 +++ b/mercurial/match.py Tue Feb 04 14:54:42 2014 -0500 @@ -6,7 +6,7 @@ # GNU General Public License version 2 or any later version. import re -import util, fileset, pathutil +import util, pathutil from i18n import _ def _rematcher(pat): @@ -26,7 +26,7 @@ if kind == 'set': if not ctx: raise util.Abort("fileset expression with no context") - s = fileset.getfileset(ctx, expr) + s = ctx.getfileset(expr) fset.update(s) continue other.append((kind, expr))