comparison mercurial/context.py @ 39592:fa4d16daf1be

context: don't count deleted files as candidates for path conflicts in IMM

This patch makes sure we don't consider the deleted files in our IMM wctx
as potential conflicts while calculating paths conflicts. This fixes the bug
demonstrated in previous patch.

Differential Revision: https://phab.mercurial-scm.org/D4543

39591:aa022f8873ea

        # Test the other direction -- that this path from p2 isn't a directory
        # in p1 (test that p1 doesn't any paths matching `path/*`).
        match = matchmod.match('/', '', [path + '/'], default=b'relpath')
        matches = self.p1().manifest().matches(match)
        if len(matches) > 0:
            if len(matches) == 1 and matches.keys()[0] == path:
                return
            raise error.Abort("error: file '%s' cannot be written because "
                              " '%s/' is a folder in %s (containing %d "
                              "entries: %s)"
                              % (path, path, self.p1(), len(matches),
                                 ', '.join(matches.keys())))

    def write(self, path, data, flags='', **kwargs):
        if data is None:
            raise error.ProgrammingError("data must be non-None")
        self._auditconflicts(path)

39592:fa4d16daf1be

        # Test the other direction -- that this path from p2 isn't a directory
        # in p1 (test that p1 doesn't any paths matching `path/*`).
        match = matchmod.match('/', '', [path + '/'], default=b'relpath')
        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 self._cache[m]['exists']]
            if not mfiles:
                return
            raise error.Abort("error: file '%s' cannot be written because "
                              " '%s/' is a folder in %s (containing %d "
                              "entries: %s)"
                              % (path, path, self.p1(), len(mfiles),
                                 ', '.join(mfiles)))

    def write(self, path, data, flags='', **kwargs):
        if data is None:
            raise error.ProgrammingError("data must be non-None")
        self._auditconflicts(path)