# HG changeset patch # User Yuya Nishihara # Date 1528551321 -32400 # Node ID 370ff3e34160563d5f00c0fc7d312e2613f65d0e # Parent 5d9749c598f07352c501bc0a97375a59bc240d7f fileset: remove subset and unused filtering functions from matchctx diff -r 5d9749c598f0 -r 370ff3e34160 mercurial/fileset.py --- a/mercurial/fileset.py Sat Jun 09 22:31:51 2018 +0900 +++ b/mercurial/fileset.py Sat Jun 09 22:35:21 2018 +0900 @@ -553,9 +553,8 @@ } class matchctx(object): - def __init__(self, ctx, subset, status=None, badfn=None): + def __init__(self, ctx, status=None, badfn=None): self.ctx = ctx - self.subset = subset self._status = status self._badfn = badfn @@ -611,19 +610,14 @@ return matchmod.nevermatcher(repo.root, repo.getcwd(), badfn=self._badfn) - def filter(self, files): - return [f for f in files if f in self.subset] - def switch(self, ctx, status=None): - subset = self.filter(_buildsubset(ctx, status)) - return matchctx(ctx, subset, status, self._badfn) + return matchctx(ctx, status, self._badfn) class fullmatchctx(matchctx): """A match context where any files in any revisions should be valid""" def __init__(self, ctx, status=None, badfn=None): - subset = _buildsubset(ctx, status) - super(fullmatchctx, self).__init__(ctx, subset, status, badfn) + super(fullmatchctx, self).__init__(ctx, status, badfn) def switch(self, ctx, status=None): return fullmatchctx(ctx, status, self._badfn) @@ -646,15 +640,6 @@ return True return False -def _buildsubset(ctx, status): - if status: - subset = [] - for c in status: - subset.extend(c) - return subset - else: - return list(ctx.walk(ctx.match([]))) - def match(ctx, expr, badfn=None): """Create a matcher for a single fileset expression""" tree = parse(expr)