( )⚙ D11321 dirstatemap: temporarily return early in `reset_state`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11321

dirstatemap: temporarily return early in `reset_state`
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:56 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd5b54917eb92: dirstatemap: temporarily return early in `reset_state`
Summary

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.

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.Aug 21 2021, 5:56 AM
baymax updated this revision to Diff 30047.Aug 26 2021, 9:00 AM

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

Alphare accepted this revision.Aug 26 2021, 9:11 AM
This revision is now accepted and ready to land.Aug 26 2021, 9:11 AM
marmoute added a commit: rHGd5b54917eb92: dirstatemap: temporarily return early in `reset_state`.Aug 27 2021, 8:38 AM
Closed by commit rHGd5b54917eb92: dirstatemap: temporarily return early 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 (10 lines)

Diff 30089

mercurial/dirstatemap.py

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) self.dropfile(filename)
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 not None and entry.tracked: if entry is not None and 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 the else clause will show # actually mean merged. Dropping the else clause will show
# failure in `test-graft.t` # failure in `test-graft.t`
self.addfile(filename, merged=True) self.addfile(filename, merged=True)
return
else: else:
self.addfile(filename, from_p2=True) self.addfile(filename, from_p2=True)
return
elif not (p1_tracked or p2_tracked) and wc_tracked: elif not (p1_tracked or p2_tracked) and wc_tracked:
self.addfile(filename, added=True, possibly_dirty=possibly_dirty) self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
return
elif (p1_tracked or p2_tracked) and not wc_tracked: elif (p1_tracked or p2_tracked) and not wc_tracked:
# XXX might be merged and removed ? # XXX might be merged and removed ?
old_entry = self._map.get(filename) old_entry = self._map.get(filename)
self._dirs_decr(filename, old_entry=old_entry, remove_variant=True) self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0) self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
self.nonnormalset.add(filename) self.nonnormalset.add(filename)
return
elif clean_p2 and wc_tracked: elif clean_p2 and wc_tracked:
if p1_tracked or self.get(filename) is not None: if p1_tracked or self.get(filename) is not None:
# XXX the `self.get` call is catching some case in # XXX the `self.get` call is catching some case in
# `test-merge-remove.t` where the file is tracked in p1, the # `test-merge-remove.t` where the file is tracked in p1, the
# p1_tracked argument is False. # p1_tracked argument is False.
# #
# In addition, this seems to be a case where the file is marked # In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge # as merged without actually being the result of a merge
# action. So thing are not ideal here. # action. So thing are not ideal here.
self.addfile(filename, merged=True) self.addfile(filename, merged=True)
return
else: else:
self.addfile(filename, from_p2=True) self.addfile(filename, from_p2=True)
return
elif not p1_tracked and p2_tracked and wc_tracked: elif not p1_tracked and p2_tracked and wc_tracked:
self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
return
elif possibly_dirty: elif possibly_dirty:
self.addfile(filename, possibly_dirty=possibly_dirty) self.addfile(filename, possibly_dirty=possibly_dirty)
return
elif wc_tracked: elif wc_tracked:
# this is a "normal" file # this is a "normal" file
if parentfiledata is None: if parentfiledata is None:
msg = b'failed to pass parentfiledata for a normal file: %s' msg = b'failed to pass parentfiledata for a normal file: %s'
msg %= filename msg %= filename
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
mode, size, mtime = parentfiledata mode, size, mtime = parentfiledata
self.addfile(filename, mode=mode, size=size, mtime=mtime) self.addfile(filename, mode=mode, size=size, mtime=mtime)
self.nonnormalset.discard(filename) self.nonnormalset.discard(filename)
return
else: else:
assert False, 'unreachable' assert False, 'unreachable'
def set_untracked(self, f): def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map""" """Mark a file as no longer tracked in the dirstate map"""
entry = self[f] entry = self[f]
self._dirs_decr(f, old_entry=entry, remove_variant=True) self._dirs_decr(f, old_entry=entry, remove_variant=True)
if entry.from_p2: if entry.from_p2: