comparison mercurial/dirstate.py @ 47523:b76d54b90dc9

dirstate: stop using `oldstate` in `dirstate._addpath`

We don't need to pass the oldstate around, so lets use the new property
instead.

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

47522:587bb99ea311

        mtime=None,
        from_p2=False,
        possibly_dirty=False,
    ):
        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')
                msg %= pycompat.bytestr(f)
                raise error.Abort(msg)

47523:b76d54b90dc9

        mtime=None,
        from_p2=False,
        possibly_dirty=False,
    ):
        oldstate = self[f]
        entry = self._map.get(f)
        if state == b'a' or entry is not None and entry.removed:
            scmutil.checkfilename(f)
            if self._map.hastrackeddir(f):
                msg = _(b'directory %r already in dirstate')
                msg %= pycompat.bytestr(f)
                raise error.Abort(msg)