changeset 47962:7033d1d5bd18

dirstate-item: implement `from_p2` in a simpler way We can simply use the underlying attribute. Differential Revision: https://phab.mercurial-scm.org/D11368
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 27 Aug 2021 17:09:49 +0200
parents 7c37d153c22d
children 59eddbaa5bfb
files mercurial/pure/parsers.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/pure/parsers.py	Fri Aug 27 17:09:06 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Aug 27 17:09:49 2021 +0200
@@ -286,7 +286,7 @@
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self.v1_state() == b'n' and self.v1_size() == FROM_P2
+        return self._wc_tracked and self._clean_p2
 
     @property
     def from_p2_removed(self):