Page MenuHomePhabricator

dirstate-v2: adjust the meaning of directory flags
ClosedPublic

Authored by marmoute on Oct 19 2021, 2:18 PM.

Details

Summary

Tracking directory "explicitly" give use the opportunity to distinct between
entry that are untracked because they are part of the directory structure and
entry that are ignored/unknown files on the files system.

The help is adjusted to the new semantic and the code now comply to it for both
read and write.

Diff Detail

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

Event Timeline

marmoute created this revision.Oct 19 2021, 2:18 PM
spectral accepted this revision.Oct 19 2021, 5:08 PM
Alphare requested changes to this revision.Oct 20 2021, 4:52 AM
Alphare added a subscriber: Alphare.

Since this needs a bit of work, you can also go back to add the docstring I asked in the earlier patch in the same update.

mercurial/dirstateutils/v2.py
59

mercurial*

mercurial/helptext/internals/dirstate-v2.txt
493–515

Unchanged*

502

that exists*

509

unknown file*

513

mtime matches*

517

taken into account*

rust/hg-core/src/dirstate_tree/on_disk.rs
332–336

to handle the absence of ALL_UNKNOWN_RECORDED

This revision now requires changes to proceed.Oct 20 2021, 4:52 AM
marmoute updated this revision to Diff 30934.Oct 20 2021, 5:12 AM
Alphare accepted this revision.Oct 20 2021, 5:26 AM
Alphare added inline comments.
mercurial/helptext/internals/dirstate-v2.txt
513

This is not done, commenting to remember to amend

This revision is now accepted and ready to land.Oct 20 2021, 5:26 AM
This revision was automatically updated to reflect the committed changes.