Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 23:43:40 -0400] rev 47952
tests: manual cleanup now that dummyssh usage is implied
Differential Revision: https://phab.mercurial-scm.org/D11246
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 21:25:01 -0400] rev 47951
tests: rely on dummyssh being the default
This commit is exactly the result of running this command:
sed -i -e 's! *\(-e \|--ssh \|--config ui.ssh=\)[ \"]*$PYTHON[ \"]*$\(RUN\|\)TESTDIR/dummyssh[\"]* *! !g' -e '/^[ >]*ssh *=[ "]*$PYTHON[ "]*$\(RUN\|\)TESTDIR\/dummyssh[ "]*$/d' -e 's/^\( [$] .*[^ ]\) *$/\1/' *.t *.sh
Sometimes the tests can be simplified further, but I think it's
preferable to do the simplification separately.
Differential Revision: https://phab.mercurial-scm.org/D11245
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 21:10:42 -0400] rev 47950
tests: setup dummyssh as the default ssh
To significantly reduce boilerplate in tests. One test is updated to
show that it works, I expect to do the rest in follow up commits.
Differential Revision: https://phab.mercurial-scm.org/D11244
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:25:35 +0200] rev 47949
dirstate: drop the `_otherparent` method
It only has one caller with a lot of the logic already implemented. So lets
inline it and cleans things up further.
Differential Revision: https://phab.mercurial-scm.org/D11353
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:18:28 +0200] rev 47948
dirstate: drop the `_normal` method
It only has one caller so lets inline it and cleans things up further.
Differential Revision: https://phab.mercurial-scm.org/D11352
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:16:48 +0200] rev 47947
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:12:39 +0200] rev 47946
dirstate: drop the deprecated `drop` method
eh ;-)
Differential Revision: https://phab.mercurial-scm.org/D11350
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:11:57 +0200] rev 47945
dirstate: drop the deprecated `merge` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11349
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:11:42 +0200] rev 47944
dirstate: drop the deprecated `remove` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11348
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:09:20 +0200] rev 47943
dirstate: drop the deprecated `add` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11347
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:09:01 +0200] rev 47942
dirstate: drop the deprecated `otherparent` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11346
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:08:37 +0200] rev 47941
dirstate: drop the deprecated `normallookup` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11345
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:08:09 +0200] rev 47940
dirstate: drop the deprecated `normal` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11344
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 22:07:50 +0200] rev 47939
dirstate: also wrap the new method in `dirstatenonnormalcheck`
The goal of this is to make sure we set the data right, so we need to make sure
it run after the new method, that we actually call, in addition to the old one,
that we no longer call.
Differential Revision: https://phab.mercurial-scm.org/D11343
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 16:12:33 +0200] rev 47938
dirstatemap: also discard item from sets
This seems more consistent to do that. I don't think any test was actually
barking about it, but the code feels a bit more robust now.
Differential Revision: https://phab.mercurial-scm.org/D11332