changeset 44310:beea86e4d332

context: use manifest.walk() instead of manifest.match() to get file list The former doesn't create a whole extra manifest in order to produce the matching file list, which is all we actually cared about here. Sigh. Differential Revision: https://phab.mercurial-scm.org/D8080
author Augie Fackler <augie@google.com>
date Wed, 05 Feb 2020 15:15:18 -0500
parents c86256bd4eb8
children d3f776c4760e
files mercurial/context.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Wed Feb 05 15:01:22 2020 -0500
+++ b/mercurial/context.py	Wed Feb 05 15:15:18 2020 -0500
@@ -2357,8 +2357,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([path], default=b'path')
-        matches = self.p1().manifest().matches(match)
-        mfiles = matches.keys()
+        mfiles = list(self.p1().manifest().walk(match))
         if len(mfiles) > 0:
             if len(mfiles) == 1 and mfiles[0] == path:
                 return