Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: implement `merged_removed` in a simpler way
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 27 Aug 2021 17:14:54 +0200
changeset 47934 f94cc63df859
parent 47933 774e235d13c3
child 47935 97e9f3fd9324
dirstate-item: implement `merged_removed` in a simpler way We can simply use the underlying attribute. Differential Revision: https://phab.mercurial-scm.org/D11371
mercurial/pure/parsers.py file | annotate | diff | comparison | revisions 
--- 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):
mercurial