Mercurial > hg
changeset 47934:f94cc63df859
dirstate-item: implement `merged_removed` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11371
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 27 Aug 2021 17:14:54 +0200 |
| parents | 774e235d13c3 |
| children | 97e9f3fd9324 |
| files | mercurial/pure/parsers.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Fri Aug 27 17:12:39 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Aug 27 17:14:54 2021 +0200 @@ -309,7 +309,7 @@ This property seems like an abstraction leakage and should probably be 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 def dm_nonnormal(self):