D5999: context: use includematcher when checking dir/file conflicts
This revision was automatically updated to reflect the committed changes. Closed by commit rHGcd7059d17cb2: context: use includematcher when checking dir/file conflicts (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5999?vs=14182=14189 REVISION DETAIL https://phab.mercurial-scm.org/D5999 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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: To: spectral, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D5999: context: use includematcher when checking dir/file conflicts
martinvonz accepted this revision. martinvonz added a comment. This revision is now accepted and ready to land. I suppose `includematcher` can be optimized that way because it's always recursive? Perhaps it should have been called `recursivematcher` or something. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5999 To: spectral, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D5999: context: use includematcher when checking dir/file conflicts
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5999 AFFECTED FILES mercurial/context.py CHANGE DETAILS diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1885,7 +1885,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: To: spectral, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
