Mercurial > public > mercurial-scm > hg
diff mercurial/pure/parsers.py @ 48065:870100c0209b
dirstate: drop the merged_removed method
It it no longer in use.
Differential Revision: https://phab.mercurial-scm.org/D11513
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 28 Sep 2021 19:15:46 +0200 |
| parents | 2943955304b3 |
| children | 7a2de2bd9fcd |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Tue Sep 28 19:12:44 2021 +0200 +++ b/mercurial/pure/parsers.py Tue Sep 28 19:15:46 2021 +0200 @@ -352,15 +352,6 @@ """True if the file has been removed""" return not self._wc_tracked and (self._p1_tracked or self._p2_tracked) - @property - def merged_removed(self): - """True if the file has been removed, but was "merged" initially - - This property seems like an abstraction leakage and should probably be - dealt in this class (or maybe the dirstatemap) directly. - """ - return self.removed and self._merged - def v1_state(self): """return a "state" suitable for v1 serialization""" if not (self._p1_tracked or self._p2_tracked or self._wc_tracked):