Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 26 Jul 2021 21:52:10 +0200] rev 47768
help: use the correct spelling for `slow-path` in persistent nodemap help
Differential Revision: https://phab.mercurial-scm.org/D11213
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Mar 2019 10:59:35 -0700] rev 47767
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
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Mar 2019 10:56:56 -0700] rev 47766
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
Martin von Zweigbergk <martinvonz@google.com> [Thu, 22 Jul 2021 17:12:56 -0700] rev 47765
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
Matt Harbison <matt_harbison@yahoo.com> [Wed, 21 Jul 2021 15:50:17 -0400] rev 47764
upgrade: byteify an i18n message
Differential Revision: https://phab.mercurial-scm.org/D11207
Matt Harbison <matt_harbison@yahoo.com> [Wed, 21 Jul 2021 15:34:35 -0400] rev 47763
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
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 20 Jul 2021 23:04:28 +0200] rev 47762
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