mercurial/context.py

42100:b63b8b7ca5fa

            if component in self:
                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(include=[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

42101:f4b1f5537d4c

            if component in self:
                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