This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11346

dirstate: drop the deprecated `otherparent` method
ClosedPublic

Authored by marmoute on Aug 26 2021, 10:20 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3d2c17c5d7f2: dirstate: drop the deprecated `otherparent` method
Summary

The method was deprecated in 5.9.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 26 2021, 10:20 AM
Alphare accepted this revision.Aug 27 2021, 5:47 AM
This revision is now accepted and ready to land.Aug 27 2021, 5:47 AM
marmoute added a commit: rHG3d2c17c5d7f2: dirstate: drop the deprecated `otherparent` method.Aug 27 2021, 8:39 AM
Closed by commit rHG3d2c17c5d7f2: dirstate: drop the deprecated `otherparent` method (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30062

contrib/dirstatenonnormalcheck.py

dirstatecl = dirstate.dirstate dirstatecl = dirstate.dirstate
devel = ui.configbool(b'devel', b'all-warnings') devel = ui.configbool(b'devel', b'all-warnings')
paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck') paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck')
if devel: if devel:
extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate) extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate)
if paranoid: if paranoid:
# We don't do all these checks when paranoid is disable as it would # We don't do all these checks when paranoid is disable as it would
# make the extension run very slowly on large repos # make the extension run very slowly on large repos
extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'add', _checkdirstate) extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate) extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate) extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate) extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate) extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate) extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)
extensions.wrapfunction( extensions.wrapfunction(
dirstatecl, 'set_possibly_dirty', _checkdirstate dirstatecl, 'set_possibly_dirty', _checkdirstate
) )
extensions.wrapfunction( extensions.wrapfunction(
dirstatecl, 'update_file_p1', _checkdirstate dirstatecl, 'update_file_p1', _checkdirstate
) )
extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate) extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate)

mercurial/dirstate.py

if source is not None: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
elif entry.merged or entry.from_p2: elif entry.merged or entry.from_p2:
return return
self._addpath(f, possibly_dirty=True) self._addpath(f, possibly_dirty=True)
self._map.copymap.pop(f, None) 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): def _otherparent(self, f):
if not self.in_merge: if not self.in_merge:
msg = _(b"setting %r to other parent only allowed in merges") % f msg = _(b"setting %r to other parent only allowed in merges") % f
raise error.Abort(msg) raise error.Abort(msg)
entry = self._map.get(f) entry = self._map.get(f)
if entry is not None and entry.tracked: if entry is not None and entry.tracked:
# merge-like # merge-like
self._addpath(f, merged=True) self._addpath(f, merged=True)

mercurial/interfaces/dirstate.py

"""Mark dest as a copy of source. Unmark dest if source is None.""" """Mark dest as a copy of source. Unmark dest if source is None."""
def copied(file): def copied(file):
pass pass
def copies(): def copies():
pass pass
def otherparent(f):
'''Mark as coming from the other parent, always dirty.'''
def add(f): def add(f):
'''Mark a file added.''' '''Mark a file added.'''
def remove(f): def remove(f):
'''Mark a file removed.''' '''Mark a file removed.'''
def merge(f): def merge(f):
'''Mark a file merged.''' '''Mark a file merged.'''