Mercurial > hg-stable
changeset 47942:3d2c17c5d7f2
dirstate: drop the deprecated `otherparent` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11346
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 24 Aug 2021 21:09:01 +0200 |
| parents | 50bed873a765 |
| children | 91afee6f959e |
| files | contrib/dirstatenonnormalcheck.py mercurial/dirstate.py mercurial/interfaces/dirstate.py |
| diffstat | 3 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/dirstatenonnormalcheck.py Tue Aug 24 21:08:37 2021 +0200 +++ b/contrib/dirstatenonnormalcheck.py Tue Aug 24 21:09:01 2021 +0200 @@ -59,7 +59,6 @@ if paranoid: # We don't do all these checks when paranoid is disable as it would # make the extension run very slowly on large repos - extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate) extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) extensions.wrapfunction(dirstatecl, 'add', _checkdirstate) extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
--- a/mercurial/dirstate.py Tue Aug 24 21:08:37 2021 +0200 +++ b/mercurial/dirstate.py Tue Aug 24 21:09:01 2021 +0200 @@ -744,24 +744,6 @@ self._addpath(f, possibly_dirty=True) self._map.copymap.pop(f, None) - def otherparent(self, f): - '''Mark as coming from the other parent, always dirty.''' - if self.pendingparentchange(): - util.nouideprecwarn( - b"do not use `otherparent` inside of update/merge context." - b" Use `update_file` or `update_file_p1`", - b'6.0', - stacklevel=2, - ) - else: - util.nouideprecwarn( - b"do not use `otherparent` outside of update/merge context." - b"It should have been set by the update/merge code", - b'6.0', - stacklevel=2, - ) - self._otherparent(f) - def _otherparent(self, f): if not self.in_merge: msg = _(b"setting %r to other parent only allowed in merges") % f