comparison mercurial/dirstate.py @ 47516:b8ffe85e399b

dirstate-entry: `merged_removed` and `from_p2_removed` properties

Lets start to define and use more semantic property. These two might be a bit
too low level and could be shaved off later, however this seems an improvement
for now.

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

47515:c94d3ff46fd5

            # if there is a merge going on and the file was either
            # "merged" or coming from other parent (-2) before
            # being removed, restore that state.
            entry = self._map.get(f)
            if entry is not None:
                if entry.removed and (entry[2] == NONNORMAL or entry.from_p2):
                    source = self._map.copymap.get(f)
                    if entry[2] == NONNORMAL:
                        self.merge(f)
                    elif entry.from_p2:
                        self.otherparent(f)
                    if source:
                        self.copy(source, f)
                    return
                if entry.merged or entry.state == b'n' and entry.from_p2:
                    return
        self._addpath(f, b'n', 0, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def otherparent(self, f):

47516:b8ffe85e399b

            # if there is a merge going on and the file was either
            # "merged" or coming from other parent (-2) before
            # being removed, restore that state.
            entry = self._map.get(f)
            if entry is not None:
                # XXX this should probably be dealt with a a lower level
                # (see `merged_removed` and `from_p2_removed`)
                if entry.merged_removed or entry.from_p2_removed:
                    source = self._map.copymap.get(f)
                    if entry.merged_removed:
                        self.merge(f)
                    elif entry.from_p2_removed:
                        self.otherparent(f)
                    if source is not None:
                        self.copy(source, f)
                    return
                elif entry.merged or entry.state == b'n' and entry.from_p2:
                    return
        self._addpath(f, b'n', 0, possibly_dirty=True)
        self._map.copymap.pop(f, None)

    def otherparent(self, f):