This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-map: move most of `dirstate.update_file` logic in the dsmap

Authored by marmoute on Jul 19 2021, 6:40 AM.



A new reset_state method is introduced to deal with most of that logic. This
move things one layer lower, but the ultimate goal is to deal with most of this
at the DirstateItem level.

This reveal various imperfection with the data passed to update_file by
mergestate.recordupdates, however this is orthogonal to this patch and should
be dealt with at a higher level.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 19 2021, 6:40 AM
Alphare accepted this revision.Jul 19 2021, 12:28 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:28 PM
baymax updated this revision to Diff 29553.Jul 20 2021, 3:21 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jul 20 2021, 3:29 PM