Mercurial > hg-stable
changeset 48165:c29d312657d2
dirstate-item: drop the `merged` property
It has no user anymore.
Differential Revision: https://phab.mercurial-scm.org/D11597
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 01 Oct 2021 03:30:00 +0200 |
| parents | 8f88307f8e07 |
| children | 7a8c9869e4fe |
| files | mercurial/pure/parsers.py rust/hg-core/src/dirstate/entry.rs rust/hg-cpython/src/dirstate/item.rs |
| diffstat | 3 files changed, 0 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Fri Oct 01 03:29:33 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Oct 01 03:30:00 2021 +0200 @@ -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)
--- a/rust/hg-core/src/dirstate/entry.rs Fri Oct 01 03:29:33 2021 +0200 +++ b/rust/hg-core/src/dirstate/entry.rs Fri Oct 01 03:30:00 2021 +0200 @@ -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() }
--- a/rust/hg-cpython/src/dirstate/item.rs Fri Oct 01 03:29:33 2021 +0200 +++ b/rust/hg-cpython/src/dirstate/item.rs Fri Oct 01 03:30:00 2021 +0200 @@ -83,11 +83,6 @@ } @property - def merged(&self) -> PyResult<bool> { - Ok(self.entry(py).get().merged()) - } - - @property def removed(&self) -> PyResult<bool> { Ok(self.entry(py).get().removed()) }