From patchwork Thu Feb 6 16:11:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D8080: context: use manifest.walk() instead of manifest.match() to get file list From: phabricator X-Patchwork-Id: 44993 Message-Id: <653b17b95cc8fa66406393a2191557a0@localhost.localdomain> To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Thu, 6 Feb 2020 16:11:35 +0000 Closed by commit rHGbeea86e4d332: context: use manifest.walk() instead of manifest.match() to get file list (authored by durin42). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8080?vs=19923&id=19951 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8080/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8080 AFFECTED FILES mercurial/context.py CHANGE DETAILS To: durin42, #hg-reviewers Cc: mercurial-devel diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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