comparison mercurial/dirstate.py @ 47486:523c00383e79

dirstate: add default value to _addpath

We want to remove the magic value usage from the higher level, so lets stop
passing them explicitely when possible.

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

47485:5eb65ec12465

        return self._map.copymap.get(file, None)

    def copies(self):
        return self._map.copymap

    def _addpath(self, f, state, mode, size, mtime):
        oldstate = self[f]
        if state == b'a' or oldstate == b'r':
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):
                msg = _(b'directory %r already in dirstate')

                    if source:
                        self.copy(source, f)
                    return
                if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2:
                    return
        self._addpath(f, b'n', 0, NONNORMAL, AMBIGUOUS_TIME)
        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, FROM_P2, AMBIGUOUS_TIME)
        else:
            # add-like
            self._addpath(f, b'n', 0, FROM_P2, AMBIGUOUS_TIME)
        self._map.copymap.pop(f, None)

    def add(self, f):
        '''Mark a file added.'''
        self._addpath(f, b'a', 0, NONNORMAL, AMBIGUOUS_TIME)
        self._map.copymap.pop(f, None)

    def remove(self, f):
        '''Mark a file removed.'''
        self._dirty = True

47486:523c00383e79

        return self._map.copymap.get(file, None)

    def copies(self):
        return self._map.copymap

    def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME):
        oldstate = self[f]
        if state == b'a' or oldstate == b'r':
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):
                msg = _(b'directory %r already in dirstate')

                    if source:
                        self.copy(source, f)
                    return
                if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2:
                    return
        self._addpath(f, b'n', 0)
        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, FROM_P2)
        else:
            # add-like
            self._addpath(f, b'n', 0, FROM_P2)
        self._map.copymap.pop(f, None)

    def add(self, f):
        '''Mark a file added.'''
        self._addpath(f, b'a', 0)
        self._map.copymap.pop(f, None)

    def remove(self, f):
        '''Mark a file removed.'''
        self._dirty = True