Mercurial > hg
comparison mercurial/dirstate.py @ 50155:4c67862a0c49
dirstate: phase-divergent update to 3433723d1b9b
Heptapod published the obsolete version of those.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 19 Feb 2023 03:21:12 +0100 |
parents | 028fb89a0539 |
children | 7e6c5cfaba6a |
comparison
equal
deleted
inserted
replaced
50154:028fb89a0539 | 50155:4c67862a0c49 |
---|---|
283 msg = b"trying to change the dirstate without holding the wlock" | 283 msg = b"trying to change the dirstate without holding the wlock" |
284 raise error.ProgrammingError(msg) | 284 raise error.ProgrammingError(msg) |
285 | 285 |
286 has_tr = repo.currenttransaction() is not None | 286 has_tr = repo.currenttransaction() is not None |
287 if not has_tr and self._changing_level == 0 and self._dirty: | 287 if not has_tr and self._changing_level == 0 and self._dirty: |
288 msg = "entering a changing context, but dirstate is already dirty" | 288 msg = b"entering a changing context, but dirstate is already dirty" |
289 raise error.ProgrammingError(msg) | 289 repo.ui.develwarn(msg) |
290 | 290 |
291 assert self._changing_level >= 0 | 291 assert self._changing_level >= 0 |
292 # different type of change are mutually exclusive | 292 # different type of change are mutually exclusive |
293 if self._change_type is None: | 293 if self._change_type is None: |
294 assert self._changing_level == 0 | 294 assert self._changing_level == 0 |