comparison mercurial/dirstatemap.py @ 47686:e43128ee436f

dirstate-item: introduce a `dm_otherparent` property

See inline documentation for details.

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

47685:265cdfaad372

        if old_entry is None and "_alldirs" in self.__dict__:
            self._alldirs.addpath(f)
        e = self._map[f] = DirstateItem(state, mode, size, mtime)
        if e.dm_nonnormal:
            self.nonnormalset.add(f)
        if size == FROM_P2:
            self.otherparentset.add(f)

    def removefile(self, f, in_merge=False):
        """
        Mark a file as removed in the dirstate.

47686:e43128ee436f

        if old_entry is None and "_alldirs" in self.__dict__:
            self._alldirs.addpath(f)
        e = self._map[f] = DirstateItem(state, mode, size, mtime)
        if e.dm_nonnormal:
            self.nonnormalset.add(f)
        if e.dm_otherparent:
            self.otherparentset.add(f)

    def removefile(self, f, in_merge=False):
        """
        Mark a file as removed in the dirstate.