Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dirstate.py @ 43752:95d2eab0a7b9
dirstate: include explicit matches in match.traversedir calls
The caller should not have to register to get both explicit and
non-explicit matches.
Differential Revision: https://phab.mercurial-scm.org/D7439
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 15 Nov 2019 15:36:09 -0800 |
| parents | 794426e96970 |
| children | deacffd227e2 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Fri Nov 15 14:47:31 2019 -0800 +++ b/mercurial/dirstate.py Fri Nov 15 15:36:09 2019 -0800 @@ -939,6 +939,11 @@ # step 1: find all explicit files results, work, dirsnotfound = self._walkexplicit(match, subrepos) + if matchtdir: + for d in work: + matchtdir(d[0]) + for d in dirsnotfound: + matchtdir(d) skipstep3 = skipstep3 and not (work or dirsnotfound) work = [d for d in work if not dirignore(d[0])]