Patchwork D11594: dirstate-item: drop the `from_p2` property

login
register
mail settings
Submitter phabricator
Date Oct. 3, 2021, 12:40 a.m.
Message ID <differential-rev-PHID-DREV-jfuno2dxt6mrb4cjdmbp-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49918/
State Superseded
Headers show

Comments

phabricator - Oct. 3, 2021, 12:40 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  It has no user anymore.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11594

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
@@ -322,16 +322,6 @@ 
         return self._wc_tracked and self._p1_tracked and self._p2_info
 
     @property
-    def from_p2(self):
-        """True if the file have been fetched from p2 during the current merge
-
-        This is only True is the file is currently tracked.
-
-        Should only be set if a merge is in progress in the dirstate
-        """
-        return self._wc_tracked and (not self._p1_tracked) and self._p2_info
-
-    @property
     def removed(self):
         """True if the file has been removed"""
         return not self._wc_tracked and (self._p1_tracked or self._p2_info)