Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

1 files changed, 6 insertions, 31 deletions

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
index 5c1f7eb..95a2c17 100644
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -199,7 +199,7 @@ def binary(mctx, x):
     """
     # i18n: "binary" is a keyword
     getargs(x, 0, 0, _("binary takes no arguments"))
-    return [f for f in mctx.existing() if util.binary(mctx.ctx[f].data())]
+    return [f for f in mctx.subset if util.binary(mctx.ctx[f].data())]
 
 def exec_(mctx, x):
     """``exec()``
@@ -207,7 +207,7 @@ def exec_(mctx, x):
     """
     # i18n: "exec" is a keyword
     getargs(x, 0, 0, _("exec takes no arguments"))
-    return [f for f in mctx.existing() if mctx.ctx.flags(f) == 'x']
+    return [f for f in mctx.subset if mctx.ctx.flags(f) == 'x']
 
 def symlink(mctx, x):
     """``symlink()``
@@ -215,7 +215,7 @@ def symlink(mctx, x):
     """
     # i18n: "symlink" is a keyword
     getargs(x, 0, 0, _("symlink takes no arguments"))
-    return [f for f in mctx.existing() if mctx.ctx.flags(f) == 'l']
+    return [f for f in mctx.subset if mctx.ctx.flags(f) == 'l']
 
 def resolved(mctx, x):
     """``resolved()``
@@ -253,7 +253,7 @@ def grep(mctx, x):
     """
     pat = getstring(x, _("grep requires a pattern"))
     r = re.compile(pat)
-    return [f for f in mctx.existing() if r.search(mctx.ctx[f].data())]
+    return [f for f in mctx.subset if r.search(mctx.ctx[f].data())]
 
 _units = dict(k=2**10, K=2**10, kB=2**10, KB=2**10,
               M=2**20, MB=2**20, G=2**30, GB=2**30)
@@ -320,7 +320,7 @@ def size(mctx, x):
     else:
         raise error.ParseError(_("couldn't parse size: %s") % expr)
 
-    return [f for f in mctx.existing() if m(mctx.ctx[f].size())]
+    return [f for f in mctx.subset if m(mctx.ctx[f].size())]
 
 def encoding(mctx, x):
     """``encoding(name)``
@@ -333,7 +333,7 @@ def encoding(mctx, x):
     enc = getstring(x, _("encoding requires an encoding name"))
 
     s = []
-    for f in mctx.existing():
+    for f in mctx.subset:
         d = mctx.ctx[f].data()
         try:
             d.decode(enc)
@@ -358,28 +358,6 @@ def copied(mctx, x):
             s.append(f)
     return s
 
-def subrepo(mctx, x):
-    """``subrepo([pattern])``
-    Subrepositories whose paths match the given pattern.
-    """
-    # i18n: "subrepo" is a keyword
-    getargs(x, 0, 1, _("subrepo takes at most one argument"))
-    ctx = mctx.ctx
-    sstate = ctx.substate
-    if x:
-        pat = getstring(x, _("subrepo requires a pattern or no arguments"))
-
-        import match as matchmod # avoid circular import issues
-        fast = not matchmod.patkind(pat)
-        if fast:
-            def m(s):
-                return (s == pat)
-        else:
-            m = matchmod.match(ctx._repo.root, '', [pat], ctx=ctx)
-        return [sub for sub in sstate if m(sub)]
-    else:
-        return [sub for sub in sstate]
-
 symbols = {
     'added': added,
     'binary': binary,
@@ -398,7 +376,6 @@ symbols = {
     'symlink': symlink,
     'unknown': unknown,
     'unresolved': unresolved,
-    'subrepo': subrepo,
 }
 
 methods = {
@@ -423,8 +400,6 @@ class matchctx(object):
         return self.ctx.match(patterns)
     def filter(self, files):
         return [f for f in files if f in self.subset]
-    def existing(self):
-        return (f for f in self.subset if f in self.ctx)
     def narrow(self, files):
         return matchctx(self.ctx, self.filter(files), self._status)