# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1633051572 -7200
# Node ID d71feb05d5b6aaf2a3e77c7d2ad4765785c37a09
# Parent  6ac2b417d5d7698d884947316d129f6db000e344
dirstate-item: drop the `from_p2` property

It has no user anymore.

Differential Revision: https://phab.mercurial-scm.org/D11594

diff -r 6ac2b417d5d7 -r d71feb05d5b6 mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py	Fri Oct 01 03:24:57 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:26:12 2021 +0200
@@ -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)
diff -r 6ac2b417d5d7 -r d71feb05d5b6 rust/hg-core/src/dirstate/entry.rs
--- a/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:24:57 2021 +0200
+++ b/rust/hg-core/src/dirstate/entry.rs	Fri Oct 01 03:26:12 2021 +0200
@@ -178,11 +178,6 @@
         self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
     }
 
-    pub fn from_p2(&self) -> bool {
-        self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
-            && !self.flags.contains(Flags::P1_TRACKED)
-    }
-
     pub fn maybe_clean(&self) -> bool {
         if !self.flags.contains(Flags::WDIR_TRACKED) {
             false
diff -r 6ac2b417d5d7 -r d71feb05d5b6 rust/hg-cpython/src/dirstate/item.rs
--- a/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 03:24:57 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/item.rs	Fri Oct 01 03:26:12 2021 +0200
@@ -93,11 +93,6 @@
     }
 
     @property
-    def from_p2(&self) -> PyResult<bool> {
-        Ok(self.entry(py).get().from_p2())
-    }
-
-    @property
     def maybe_clean(&self) -> PyResult<bool> {
         Ok(self.entry(py).get().maybe_clean())
     }