diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -314,14 +314,6 @@ return self._wc_tracked and self._p2_info @property - def merged(self): - """True if the file has been merged - - Should only be set if a merge is in progress in the dirstate - """ - return self._wc_tracked and 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 --git a/rust/hg-core/src/dirstate/entry.rs b/rust/hg-core/src/dirstate/entry.rs --- a/rust/hg-core/src/dirstate/entry.rs +++ b/rust/hg-core/src/dirstate/entry.rs @@ -169,11 +169,6 @@ self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO) } - pub fn merged(&self) -> bool { - self.flags - .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO) - } - pub fn added(&self) -> bool { self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent() } diff --git a/rust/hg-cpython/src/dirstate/item.rs b/rust/hg-cpython/src/dirstate/item.rs --- a/rust/hg-cpython/src/dirstate/item.rs +++ b/rust/hg-cpython/src/dirstate/item.rs @@ -83,11 +83,6 @@ } @property - def merged(&self) -> PyResult { - Ok(self.entry(py).get().merged()) - } - - @property def removed(&self) -> PyResult { Ok(self.entry(py).get().removed()) }