( )⚙ D11348 dirstate: drop the deprecated `remove` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11348

dirstate: drop the deprecated `remove` method
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3911c61f09c6: dirstate: drop the deprecated `remove` 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:21 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: rHG3911c61f09c6: dirstate: drop the deprecated `remove` method.Aug 27 2021, 8:39 AM
Closed by commit rHG3911c61f09c6: dirstate: drop the deprecated `remove` method (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30064

contrib/dirstatenonnormalcheck.py

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, 'write', _checkdirstate) extensions.wrapfunction(dirstatecl, 'write', _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)

hgext/sparse.py

extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild) extensions.wrapfunction(dirstate.dirstate, b'rebuild', _rebuild)
# Prevent adding files that are outside the sparse checkout # Prevent adding files that are outside the sparse checkout
editfuncs = [ editfuncs = [
b'set_tracked', b'set_tracked',
b'set_untracked', b'set_untracked',
b'copy', b'copy',
b'remove',
b'merge', b'merge',
] ]
hint = _( hint = _(
b'include file with `hg debugsparse --include <pattern>` or use ' b'include file with `hg debugsparse --include <pattern>` or use '
+ b'`hg add -s <file>` to include file directory while adding' + b'`hg add -s <file>` to include file directory while adding'
) )
for func in editfuncs: for func in editfuncs:

mercurial/dirstate.py

self._addpath(f, from_p2=True) self._addpath(f, from_p2=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def _add(self, filename): def _add(self, filename):
"""internal function to mark a file as added""" """internal function to mark a file as added"""
self._addpath(filename, added=True) self._addpath(filename, added=True)
self._map.copymap.pop(filename, None) self._map.copymap.pop(filename, None)
def remove(self, f):
'''Mark a file removed'''
if self.pendingparentchange():
util.nouideprecwarn(
b"do not use `remove` insde of update/merge context."
b" Use `update_file` or `update_file_p1`",
b'6.0',
stacklevel=2,
)
else:
util.nouideprecwarn(
b"do not use `remove` outside of update/merge context."
b" Use `set_untracked`",
b'6.0',
stacklevel=2,
)
self._dirty = True
self._updatedfiles.add(f)
entry = self._map.get(f)
if entry is None:
# Assuming we are in a update/merge case
self.update_file(f, p1_tracked=True, wc_tracked=False)
else:
self.set_untracked(f)
def merge(self, f): def merge(self, f):
'''Mark a file merged.''' '''Mark a file merged.'''
if self.pendingparentchange(): if self.pendingparentchange():
util.nouideprecwarn( util.nouideprecwarn(
b"do not use `merge` inside of update/merge context." b"do not use `merge` inside of update/merge context."
b" Use `update_file`", b" Use `update_file`",
b'6.0', b'6.0',
stacklevel=2, stacklevel=2,

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 remove(f):
'''Mark a file removed.'''
def merge(f): def merge(f):
'''Mark a file merged.''' '''Mark a file merged.'''
def drop(f): def drop(f):
'''Drop a file from the dirstate''' '''Drop a file from the dirstate'''
def normalize(path, isknown=False, ignoremissing=False): def normalize(path, isknown=False, ignoremissing=False):
""" """