This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11438

dirstate: support file tracked nowhere in `reset_state`
ClosedPublic

Authored by marmoute on Sep 16 2021, 10:45 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG938a7769050c: dirstate: support file tracked nowhere in `reset_state`
Summary

This let the dirstatemap decide when to drop files.

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.Sep 16 2021, 10:45 AM
Alphare accepted this revision.Sep 20 2021, 9:52 AM
Alphare added a subscriber: Alphare.

This should maybe note that the Rust implementation will be updated later to reflect the new API changes, hence the lack of changes.

This revision is now accepted and ready to land.Sep 20 2021, 9:52 AM
marmoute added a commit: rHG938a7769050c: dirstate: support file tracked nowhere in `reset_state`.Sep 20 2021, 10:08 AM
Closed by commit rHG938a7769050c: dirstate: support file tracked nowhere in `reset_state` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (13 lines)

Diff 30320

mercurial/dirstatemap.py

size = size & rangemask size = size & rangemask
entry.set_clean(mode, size, mtime) entry.set_clean(mode, size, mtime)
self.copymap.pop(filename, None) self.copymap.pop(filename, None)
self.nonnormalset.discard(filename) self.nonnormalset.discard(filename)
def reset_state( def reset_state(
self, self,
filename, filename,
wc_tracked, wc_tracked=False,
p1_tracked, p1_tracked=False,
p2_tracked=False, p2_tracked=False,
merged=False, merged=False,
clean_p1=False, clean_p1=False,
clean_p2=False, clean_p2=False,
possibly_dirty=False, possibly_dirty=False,
parentfiledata=None, parentfiledata=None,
): ):
"""Set a entry to a given state, diregarding all previous state """Set a entry to a given state, diregarding all previous state
This is to be used by the part of the dirstate API dedicated to This is to be used by the part of the dirstate API dedicated to
adjusting the dirstate after a update/merge. adjusting the dirstate after a update/merge.
note: calling this might result to no entry existing at all if the note: calling this might result to no entry existing at all if the
dirstate map does not see any point at having one for this file dirstate map does not see any point at having one for this file
anymore. anymore.
""" """
if merged and (clean_p1 or clean_p2): if merged and (clean_p1 or clean_p2):
msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
# copy information are now outdated # copy information are now outdated
# (maybe new information should be in directly passed to this function) # (maybe new information should be in directly passed to this function)
self.copymap.pop(filename, None) self.copymap.pop(filename, None)
if not (p1_tracked or p2_tracked or wc_tracked): if not (p1_tracked or p2_tracked or wc_tracked):
self.dropfile(filename) old_entry = self._map.pop(filename, None)
self._dirs_decr(filename, old_entry=old_entry)
self.nonnormalset.discard(filename)
self.copymap.pop(filename, None)
return return
elif merged: elif merged:
# XXX might be merged and removed ? # XXX might be merged and removed ?
entry = self.get(filename) entry = self.get(filename)
if entry is None or not entry.tracked: if entry is None or not entry.tracked:
# XXX mostly replicate dirstate.other parent. We should get # XXX mostly replicate dirstate.other parent. We should get
# the higher layer to pass us more reliable data where `merged` # the higher layer to pass us more reliable data where `merged`
# actually mean merged. Dropping this clause will show failure # actually mean merged. Dropping this clause will show failure
) )
if added: if added:
self.copymap.pop(f, None) self.copymap.pop(f, None)
return ret return ret
def reset_state( def reset_state(
self, self,
filename, filename,
wc_tracked, wc_tracked=False,
p1_tracked, p1_tracked=False,
p2_tracked=False, p2_tracked=False,
merged=False, merged=False,
clean_p1=False, clean_p1=False,
clean_p2=False, clean_p2=False,
possibly_dirty=False, possibly_dirty=False,
parentfiledata=None, parentfiledata=None,
): ):
"""Set a entry to a given state, disregarding all previous state """Set a entry to a given state, disregarding all previous state