This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11319

rust-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
rHG226c7dbeea11: rust-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.

The Rust dirstate map will need an overall once the durst settle anyway.

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 30045.Aug 26 2021, 9:00 AM

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (2 lines)

Diff 30087

mercurial/dirstatemap.py

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( self.addfile(
filename, added=True, possibly_dirty=possibly_dirty 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 ?
self[filename] = DirstateItem(b'r', 0, 0, 0) self[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