From patchwork Fri Aug 27 17:11:35 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D11371: dirstate-item: implement `merged_removed` in a simpler way
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49686
Message-Id: <differential-rev-PHID-DREV-xg23f2uts4ul7la7lr54-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Fri, 27 Aug 2021 17:11:35 +0000

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/D11371

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS




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

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):