( )⚙ D11318 dirstatemap: temporarily use `from_v1_data` in `addfile`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11318

dirstatemap: temporarily use `from_v1_data` in `addfile`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0b35bc0b8636: dirstatemap: temporarily use `from_v1_data` in `addfile`
Summary

We are about to change the __init__ for DirstateItem. To make the
transition easier, we move existing caller to DirstateItem.from_v1_data.

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
Alphare accepted this revision.Aug 25 2021, 9:53 AM
This revision is now accepted and ready to land.Aug 25 2021, 9:53 AM
baymax updated this revision to Diff 30044.Aug 26 2021, 9:00 AM

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (4 lines)

Diff 30086

mercurial/dirstatemap.py

state = b'n' state = b'n'
size = size & rangemask size = size & rangemask
mtime = mtime & rangemask mtime = mtime & rangemask
assert state is not None assert state is not None
assert size is not None assert size is not None
assert mtime is not None assert mtime is not None
old_entry = self.get(f) old_entry = self.get(f)
self._dirs_incr(f, old_entry) self._dirs_incr(f, old_entry)
e = self._map[f] = DirstateItem(state, mode, size, mtime) e = self._map[f] = DirstateItem.from_v1_data(state, mode, size, mtime)
if e.dm_nonnormal: if e.dm_nonnormal:
self.nonnormalset.add(f) self.nonnormalset.add(f)
if e.dm_otherparent: if e.dm_otherparent:
self.otherparentset.add(f) self.otherparentset.add(f)
def reset_state( def reset_state(
self, self,
filename, filename,
else: else:
self.addfile(filename, from_p2=True) self.addfile(filename, from_p2=True)
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)
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(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)
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