This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11369

dirstate-item: implement `from_p2_removed` in a simpler way
ClosedPublic

Authored by marmoute on Aug 27 2021, 1:11 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG59eddbaa5bfb: dirstate-item: implement `from_p2_removed` in a simpler way
Summary

We can simply use the underlying attribute.

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 27 2021, 1:11 PM
Alphare accepted this revision.Aug 30 2021, 5:52 AM
This revision is now accepted and ready to land.Aug 30 2021, 5:52 AM
baymax updated this revision to Diff 30146.Aug 30 2021, 9:00 AM

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

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)

Diff 30160

mercurial/pure/parsers.py

@property @property
def from_p2_removed(self): def from_p2_removed(self):
"""True if the file has been removed, but was "from_p2" initially """True if the file has been removed, but was "from_p2" initially
This property seems like an abstraction leakage and should probably be This property seems like an abstraction leakage and should probably be
dealt in this class (or maybe the dirstatemap) directly. dealt in this class (or maybe the dirstatemap) directly.
""" """
return self.v1_state() == b'r' and self.v1_size() == FROM_P2 return self.removed and self._clean_p2
@property @property
def removed(self): def removed(self):
"""True if the file has been removed""" """True if the file has been removed"""
return self.v1_state() == b'r' return self.v1_state() == b'r'
@property @property
def merged_removed(self): def merged_removed(self):