Patchwork D11369: dirstate-item: implement `from_p2_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-2ya773z6g46cto6xthyj-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49684/
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/D11369

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
@@ -295,7 +295,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() == FROM_P2
+        return self.removed and self._clean_p2
 
     @property
     def removed(self):