comparison mercurial/dirstate.py @ 47479:e6b303eb8f7d

dirstate: split a not-so-one-liner

This is shorter and simpler to read.

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

47478:ca8121d26732

        self._map.copymap.pop(f, None)

    def otherparent(self, f):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == self._nodeconstants.nullid:
            raise error.Abort(
                _(b"setting %r to other parent only allowed in merges") % f
            )
        if f in self and self[f] == b'n':
            # merge-like
            self._addpath(f, b'm', 0, -2, -1)
        else:
            # add-like

47479:e6b303eb8f7d

        self._map.copymap.pop(f, None)

    def otherparent(self, f):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == self._nodeconstants.nullid:
            msg = _(b"setting %r to other parent only allowed in merges") % f
            raise error.Abort(msg)
        if f in self and self[f] == b'n':
            # merge-like
            self._addpath(f, b'm', 0, -2, -1)
        else:
            # add-like