This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11350

dirstate: drop the deprecated `drop` method
ClosedPublic

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

Details

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

eh ;-)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

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: rHG51cd60c0a345: dirstate: drop the deprecated `drop` method.Aug 27 2021, 8:40 AM
Closed by commit rHG51cd60c0a345: dirstate: drop the deprecated `drop` method (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30108

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, '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

self._addpath(filename, added=True) self._addpath(filename, added=True)
self._map.copymap.pop(filename, None) self._map.copymap.pop(filename, None)
def _merge(self, f): def _merge(self, f):
if not self.in_merge: if not self.in_merge:
return self._normallookup(f) return self._normallookup(f)
return self._otherparent(f) return self._otherparent(f)
def drop(self, f):
'''Drop a file from the dirstate'''
if self.pendingparentchange():
util.nouideprecwarn(
b"do not use `drop` inside of update/merge context."
b" Use `update_file`",
b'6.0',
stacklevel=2,
)
else:
util.nouideprecwarn(
b"do not use `drop` outside of update/merge context."
b" Use `set_untracked`",
b'6.0',
stacklevel=2,
)
self._drop(f)
def _drop(self, filename): def _drop(self, filename):
"""internal function to drop a file from the dirstate""" """internal function to drop a file from the dirstate"""
if self._map.dropfile(filename): if self._map.dropfile(filename):
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
self._map.copymap.pop(filename, None) self._map.copymap.pop(filename, None)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):

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 drop(f):
'''Drop a file from the dirstate'''
def normalize(path, isknown=False, ignoremissing=False): def normalize(path, isknown=False, ignoremissing=False):
""" """
normalize the case of a pathname when on a casefolding filesystem normalize the case of a pathname when on a casefolding filesystem
isknown specifies whether the filename came from walking the isknown specifies whether the filename came from walking the
disk, to avoid extra filesystem access. disk, to avoid extra filesystem access.
If ignoremissing is True, missing path are returned If ignoremissing is True, missing path are returned