Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 41687:0531dff73d0b
match: delete unused root and cwd arguments from {always,never,exact}() (API)
Differential Revision: https://phab.mercurial-scm.org/D5930
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 09 Feb 2019 22:50:53 -0800 |
| parents | ddbebce94665 |
| children | 91701785c2c5 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Sun Feb 10 14:35:36 2019 -0800 +++ b/mercurial/subrepo.py Sat Feb 09 22:50:53 2019 -0800 @@ -323,7 +323,7 @@ def matchfileset(self, expr, badfn=None): """Resolve the fileset expression for this repo""" - return matchmod.never(self.wvfs.base, '', badfn=badfn) + return matchmod.never(badfn=badfn) def printfiles(self, ui, m, fm, fmt, subrepos): """handle the files command for this subrepo""" @@ -807,12 +807,11 @@ @annotatesubrepoerror def matchfileset(self, expr, badfn=None): - repo = self._repo if self._ctx.rev() is None: - ctx = repo[None] + ctx = self._repo[None] else: rev = self._state[1] - ctx = repo[rev] + ctx = self._repo[rev] matchers = [ctx.matchfileset(expr, badfn=badfn)]