comparison mercurial/dirstate.py @ 50155:4c67862a0c49

dirstate: phase-divergent update to 3433723d1b9b

Heptapod published the obsolete version of those.

50154:028fb89a0539

            msg = b"trying to change the dirstate without holding the wlock"
            raise error.ProgrammingError(msg)

        has_tr = repo.currenttransaction() is not None
        if not has_tr and self._changing_level == 0 and self._dirty:
            msg = "entering a changing context, but dirstate is already dirty"
            raise error.ProgrammingError(msg)

        assert self._changing_level >= 0
        # different type of change are mutually exclusive
        if self._change_type is None:
            assert self._changing_level == 0

50155:4c67862a0c49

            msg = b"trying to change the dirstate without holding the wlock"
            raise error.ProgrammingError(msg)

        has_tr = repo.currenttransaction() is not None
        if not has_tr and self._changing_level == 0 and self._dirty:
            msg = b"entering a changing context, but dirstate is already dirty"
            repo.ui.develwarn(msg)

        assert self._changing_level >= 0
        # different type of change are mutually exclusive
        if self._change_type is None:
            assert self._changing_level == 0