Patchwork D11370: dirstate-item: implement `removed` in a simpler way

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:11 p.m.
Message ID <differential-rev-PHID-DREV-pc2zuegzz4jn4c2tmeef-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49685/
State Superseded
Headers show

Comments

phabricator - Aug. 27, 2021, 5:11 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  We can simply use the underlying attribute.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -300,7 +300,7 @@ 
     @property
     def removed(self):
         """True if the file has been removed"""
-        return self.v1_state() == b'r'
+        return not self._wc_tracked and (self._p1_tracked or self._p2_tracked)
 
     @property
     def merged_removed(self):