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
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 18:25:01 +0200] rev 47937
dirstatemap: drop unused internal constant definition
All that logic now moved within the DirstateItem itself, so we can finally drop
this implementation details from the "higher" level.
Differential Revision: https://phab.mercurial-scm.org/D11331
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 18:12:27 +0200] rev 47936
dirstate-item: add dedicated "legacy" constructor for `addfile` case
This way the internal details of how a DirstateItem is encoded is encapsulated
within the DirstateItem. This will finally give use some latitude to change the
data we store in a DirstateItem.
The addfile logic will likely be rewritten eventually and these dedicated
constructor can be removed at that time.
In the mean-time this should help with hiding internal details of DirstateItem
and to migrate it to new internal storage and logic.
Differential Revision: https://phab.mercurial-scm.org/D11330
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:32:40 +0200] rev 47935
dirstatemap: use the default code to handle "merged" case
This simplify the conditionnal a bit since most of it is handled by the common
code.
Differential Revision: https://phab.mercurial-scm.org/D11329
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:29:16 +0200] rev 47934
dirstatemap: use the default code to handle "added" case
This one is very easy too.
Differential Revision: https://phab.mercurial-scm.org/D11328