Mon, 02 Aug 2021 21:10:42 -0400 tests: setup dummyssh as the default ssh
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Mon, 02 Aug 2021 21:10:42 -0400] rev 47919
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
Tue, 24 Aug 2021 21:25:35 +0200 dirstate: drop the `_otherparent` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:25:35 +0200] rev 47918
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
Tue, 24 Aug 2021 21:18:28 +0200 dirstate: drop the `_normal` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:18:28 +0200] rev 47917
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
Tue, 24 Aug 2021 21:16:48 +0200 dirstate: drop the `_merge` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:16:48 +0200] rev 47916
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
Tue, 24 Aug 2021 21:12:39 +0200 dirstate: drop the deprecated `drop` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:12:39 +0200] rev 47915
dirstate: drop the deprecated `drop` method eh ;-) Differential Revision: https://phab.mercurial-scm.org/D11350
Tue, 24 Aug 2021 21:11:57 +0200 dirstate: drop the deprecated `merge` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:11:57 +0200] rev 47914
dirstate: drop the deprecated `merge` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11349
Tue, 24 Aug 2021 21:11:42 +0200 dirstate: drop the deprecated `remove` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:11:42 +0200] rev 47913
dirstate: drop the deprecated `remove` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11348
Tue, 24 Aug 2021 21:09:20 +0200 dirstate: drop the deprecated `add` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:09:20 +0200] rev 47912
dirstate: drop the deprecated `add` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11347
Tue, 24 Aug 2021 21:09:01 +0200 dirstate: drop the deprecated `otherparent` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:09:01 +0200] rev 47911
dirstate: drop the deprecated `otherparent` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11346
Tue, 24 Aug 2021 21:08:37 +0200 dirstate: drop the deprecated `normallookup` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:08:37 +0200] rev 47910
dirstate: drop the deprecated `normallookup` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11345
Tue, 24 Aug 2021 21:08:09 +0200 dirstate: drop the deprecated `normal` method
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 21:08:09 +0200] rev 47909
dirstate: drop the deprecated `normal` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11344
Tue, 24 Aug 2021 22:07:50 +0200 dirstate: also wrap the new method in `dirstatenonnormalcheck`
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Aug 2021 22:07:50 +0200] rev 47908
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
Fri, 20 Aug 2021 16:12:33 +0200 dirstatemap: also discard item from sets
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 16:12:33 +0200] rev 47907
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
Fri, 16 Jul 2021 18:25:01 +0200 dirstatemap: drop unused internal constant definition
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 18:25:01 +0200] rev 47906
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
Fri, 16 Jul 2021 18:12:27 +0200 dirstate-item: add dedicated "legacy" constructor for `addfile` case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 18:12:27 +0200] rev 47905
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
Fri, 16 Jul 2021 17:32:40 +0200 dirstatemap: use the default code to handle "merged" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:32:40 +0200] rev 47904
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
Fri, 16 Jul 2021 17:29:16 +0200 dirstatemap: use the default code to handle "added" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:29:16 +0200] rev 47903
dirstatemap: use the default code to handle "added" case This one is very easy too. Differential Revision: https://phab.mercurial-scm.org/D11328
Fri, 16 Jul 2021 17:23:40 +0200 dirstatemap: use the default code to handle "removed" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:23:40 +0200] rev 47902
dirstatemap: use the default code to handle "removed" case This one is very easy. Differential Revision: https://phab.mercurial-scm.org/D11327
Fri, 16 Jul 2021 17:20:17 +0200 dirstatemap: use the default code to handle "clean-p2" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:20:17 +0200] rev 47901
dirstatemap: use the default code to handle "clean-p2" case This simplify the conditionnal a bit since most of it is handled by the common code. Differential Revision: https://phab.mercurial-scm.org/D11326
Fri, 16 Jul 2021 17:14:56 +0200 dirstatemap: use the default code to handle "p2-tracked" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:14:56 +0200] rev 47900
dirstatemap: use the default code to handle "p2-tracked" case We juste have to do minor value adjustement and the default code will do the rest. This kind of change highglight that "clean_p2" is probably not the right name, for that value. However this is all thing to be figured out and cleaned up once are done moving logic at lower level. Differential Revision: https://phab.mercurial-scm.org/D11325
Fri, 16 Jul 2021 17:10:52 +0200 dirstatemap: use the default code to handle "possibly_dirty" case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:10:52 +0200] rev 47899
dirstatemap: use the default code to handle "possibly_dirty" case This case is quite simple too Differential Revision: https://phab.mercurial-scm.org/D11324
Fri, 16 Jul 2021 17:08:41 +0200 dirstatemap: use the default code to handle normal entry
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:08:41 +0200] rev 47898
dirstatemap: use the default code to handle normal entry This case is quite simple. Differential Revision: https://phab.mercurial-scm.org/D11323
Fri, 16 Jul 2021 17:03:39 +0200 dirstatemap: conclude `reset_state` with logic using the new __init__
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 17:03:39 +0200] rev 47897
dirstatemap: conclude `reset_state` with logic using the new __init__ Now the DirstateItem can deal with most of the logic related to its initialization, our goal is to migrate the function to a more "unified" way were minimal processing is done early before more generic code gets into play. Nobody is calling this code yet, but this is about to change. Differential Revision: https://phab.mercurial-scm.org/D11322
Fri, 16 Jul 2021 16:29:16 +0200 dirstatemap: temporarily return early in `reset_state`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 16:29:16 +0200] rev 47896
dirstatemap: temporarily return early in `reset_state` We are about to migrate `addfile` to the new `DirstateItem__init__` and having these early return will the new series of patches to be clearer. Differential Revision: https://phab.mercurial-scm.org/D11321
Fri, 16 Jul 2021 16:52:53 +0200 dirstate-item: feed more information to `__init__`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 16:52:53 +0200] rev 47895
dirstate-item: feed more information to `__init__` Instead of processing the "rich" value at the `dirstatemap` level, we can now directly pass them to the DirstateItem object. This will make the object free to store whatever its want and to implements it logic whatever its want. For now… we simply process the flag and store the same good old value. However this pave the way for doing things differently once the rest of dirstatemap code is updated. Nobody call this code yet. Differential Revision: https://phab.mercurial-scm.org/D11320
Fri, 20 Aug 2021 22:35:52 +0200 rust-dirstatemap: temporarily use `from_v1_data` in `addfile`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 22:35:52 +0200] rev 47894
rust-dirstatemap: temporarily use `from_v1_data` in `addfile` We are about to change the `__init__` for `DirstateItem`. To make the transition easier, we move existing caller to `DirstateItem.from_v1_data`. The Rust dirstate map will need an overall once the durst settle anyway. Differential Revision: https://phab.mercurial-scm.org/D11319
Fri, 16 Jul 2021 16:30:52 +0200 dirstatemap: temporarily use `from_v1_data` in `addfile`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 16 Jul 2021 16:30:52 +0200] rev 47893
dirstatemap: temporarily use `from_v1_data` in `addfile` We are about to change the `__init__` for `DirstateItem`. To make the transition easier, we move existing caller to `DirstateItem.from_v1_data`. Differential Revision: https://phab.mercurial-scm.org/D11318
Fri, 20 Aug 2021 18:11:49 +0200 dirstate-item: fix the declaration of the Cext `from_v1_meth`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 18:11:49 +0200] rev 47892
dirstate-item: fix the declaration of the Cext `from_v1_meth` This method is apparently not called from anywhere since the declaration was garbage. We will start calling it in the next changeset. Differential Revision: https://phab.mercurial-scm.org/D11317
Fri, 20 Aug 2021 22:30:30 +0200 dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 22:30:30 +0200] rev 47891
dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent These are property, not method. Differential Revision: https://phab.mercurial-scm.org/D11316
Fri, 20 Aug 2021 11:27:01 +0200 dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 11:27:01 +0200] rev 47890
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()` All the other caller goes through `reset_state`, so we can safely have an explicit method on `DirstateItem` object. This means that all the logic to preserve the previous state (from p2, merged, etc) is now properly encapsulated within the DirstateItem. This pave the way to using different storage for these information. Differential Revision: https://phab.mercurial-scm.org/D11315
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip