[Updated] D11371: dirstate-item: implement `merged_removed` in a simpler way

[marmoute (Pierre-Yves David)]

Closed by commit rHGf94cc63df859: dirstate-item: implement `merged_removed` in a simpler way (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11371?vs=30148&id=30162

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11371/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11371

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -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):



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210830/50a93c9a/attachment-0002.html>