# HG changeset patch # User Pierre-Yves David # Date 1630077294 -7200 # Node ID f94cc63df859c27851c2711aeaaad39b9e00daf0 # Parent 774e235d13c3b58875ed3dbacd934dcf68d6ab17 dirstate-item: implement `merged_removed` in a simpler way We can simply use the underlying attribute. Differential Revision: https://phab.mercurial-scm.org/D11371 diff -r 774e235d13c3 -r f94cc63df859 mercurial/pure/parsers.py --- 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):