Mercurial > hg
changeset 41766:cd7059d17cb2
context: use includematcher when checking dir/file conflicts
This is for performance; patternmatcher can't easily interpret its results to
make visitchildrenset be the "optimal" set of paths to inspect, but
includematcher can. Since there aren't any special patterns being used here, I
believe that the two matchers are equivalent.
Differential Revision: https://phab.mercurial-scm.org/D5999
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 21 Feb 2019 19:11:35 -0800 |
| parents | 0b2361c2c493 |
| children | 1c1c4ef8b72e |
| files | mercurial/context.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Thu Feb 21 19:11:28 2019 -0800 +++ b/mercurial/context.py Thu Feb 21 19:11:35 2019 -0800 @@ -1951,7 +1951,7 @@ # Test the other direction -- that this path from p2 isn't a directory # in p1 (test that p1 doesn't have any paths matching `path/*`). - match = self.match(pats=[path + '/'], default=b'path') + match = self.match(include=[path + '/'], default=b'path') matches = self.p1().manifest().matches(match) mfiles = matches.keys() if len(mfiles) > 0: