mercurial/dirstate.py

47523:b76d54b90dc9

        size=None,
        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')

                    raise error.Abort(msg)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map.addfile(
            f,
            oldstate,
            state=state,
            mode=mode,
            size=size,
            mtime=mtime,
            from_p2=from_p2,

47524:69a463a4f193

        size=None,
        mtime=None,
        from_p2=False,
        possibly_dirty=False,
    ):
        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')

                    raise error.Abort(msg)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map.addfile(
            f,
            state=state,
            mode=mode,
            size=size,
            mtime=mtime,
            from_p2=from_p2,