( )⚙ D11371 dirstate-item: implement `merged_removed` in a simpler way

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11371

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

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

Details

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

We can simply use the underlying attribute.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

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

mercurial/pure/parsers.py

@property @property
def merged_removed(self): def merged_removed(self):
"""True if the file has been removed, but was "merged" initially """True if the file has been removed, but was "merged" 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() == NONNORMAL return self.removed and self._merged
@property @property
def dm_nonnormal(self): def dm_nonnormal(self):
"""True is the entry is non-normal in the dirstatemap sense """True is the entry is non-normal in the dirstatemap sense
There is no reason for any code, but the dirstatemap one to use this. There is no reason for any code, but the dirstatemap one to use this.
""" """
return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME