[Request] [+ ] D11368: dirstate-item: implement `from_p2` in a simpler way
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Aug 27 17:11:20 UTC 2021
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/D11368
AFFECTED FILES
mercurial/pure/parsers.py
CHANGE DETAILS
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -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):
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/3694e7fe/attachment-0001.html>
More information about the Mercurial-patches
mailing list