dirstate: fix typo in docstring Spotted while repairing git extension tests. Differential Revision: https://phab.mercurial-scm.org/D11233

typing: add several assertions to dirstatemap to appease pytype I think it's been mentioned in IRC that these can't be None in this case. This fixes: File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 213, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands] No attribute '__and__' on None or '__rand__' on int Called from (traceback): line 290, in reset_state File "/mnt/c/Users/Matt/hg/mercurial/dirstatemap.py", line 214, in addfile: unsupported operand type(s) for &: 'None' and 'int' [unsupported-operands] No attribute '__and__' on None or '__rand__' on int Called from (traceback): line 290, in reset_state Differential Revision: https://phab.mercurial-scm.org/D11235

help: indicate how to run downgrade a repository using persistent nodemap We have a couple of report of people needing this. I am not fan of pointing people to a debug command, but we don't have much better to offer right now Differential Revision: https://phab.mercurial-scm.org/D11214

help: use the correct spelling for `slow-path` in persistent nodemap help Differential Revision: https://phab.mercurial-scm.org/D11213

fix: use scmutil.movedirstate() instead of reimplementing I wrote this patch 2 years ago as a little cleanup. I wanted to generally used `scmutil.movedirstate()` instead of manually updating the dirstate because that is easy to get wrong. I didn't know until today that the current code had a bug. So I added the test case two patches before this one and dusted off this one patch. This is a little slower than the previous code, as it diffs two manifests. However, it fixes the bug and I don't think it's going to be noticeably slower anyway. Differential Revision: https://phab.mercurial-scm.org/D11210

fix: rewrite writeworkingdir() to explicitly not work with merges `hg fix` errors out early if there is an unfinished merge, so we should have only one parent here. Making that explicit makes my next patches simpler. Differential Revision: https://phab.mercurial-scm.org/D11209

tests: demonstrate bug in `hg fix` with incorrectly dirty working copy If the parent commit needs formatting but the working copy already has the correct formatting, then the working copy will be reported as modified even though it's clean (because the size in the dirstate is incorrect). Because the bug only occurs when the size changes, I modified the formatter used in the test case to remove repeated spaces. Differential Revision: https://phab.mercurial-scm.org/D11208

upgrade: byteify an i18n message Differential Revision: https://phab.mercurial-scm.org/D11207

typing: convert an annotation to an assertion in commands.py Pytype was happy with the annotation at one point, but 2021.04.15 now complains. Differential Revision: https://phab.mercurial-scm.org/D11206

test: remove `sleep` usage in `test-nointerrupt.t` (issue6271) We move from sleep based synchronisation to file creation based synchronisation. Sleeps is the path to the dark side. Sleeps leads to flakiness. Flakiness leads to anger. Anger leads to hate. Hate leads to suffering. Differential Revision: https://phab.mercurial-scm.org/D11205