diff -r f0137d994c83 -r 906358d0350e mercurial/match.py
--- 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))