Patchwork D11367: dirstate-item: implement `merged` in a simpler way

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:11 p.m.
Message ID <differential-rev-PHID-DREV-6uqsb3w37nvug2e54g3i-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49682/
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/D11367

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
@@ -276,7 +276,7 @@ 
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self.v1_state() == b'm'
+        return self._wc_tracked and self._merged
 
     @property
     def from_p2(self):