comparison mercurial/context.py @ 44263: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

44262:c86256bd4eb8

                fail(path, component)

        # 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()
        if len(mfiles) > 0:
            if len(mfiles) == 1 and mfiles[0] == path:
                return
            # omit the files which are deleted in current IMM wctx
            mfiles = [m for m in mfiles if m in self]

44263:beea86e4d332

                fail(path, component)

        # 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')
        mfiles = list(self.p1().manifest().walk(match))
        if len(mfiles) > 0:
            if len(mfiles) == 1 and mfiles[0] == path:
                return
            # omit the files which are deleted in current IMM wctx
            mfiles = [m for m in mfiles if m in self]