( )⚙ D11345 dirstate: drop the deprecated `normallookup` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11345

dirstate: drop the deprecated `normallookup` method
ClosedPublic

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

Details

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

Revision Contents
Changeset List

Diff 30061

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

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'add', b'add',
b'normallookup',
b'copy', b'copy',
b'remove', 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'
) )

mercurial/dirstate.py

if f in self._map.nonnormalset: if f in self._map.nonnormalset:
self._map.nonnormalset.remove(f) self._map.nonnormalset.remove(f)
if mtime > self._lastnormaltime: if mtime > self._lastnormaltime:
# Remember the most recent modification timeslot for status(), # Remember the most recent modification timeslot for status(),
# to make sure we won't miss future size-preserving file content # to make sure we won't miss future size-preserving file content
# modifications that happen within the same timeslot. # modifications that happen within the same timeslot.
self._lastnormaltime = mtime self._lastnormaltime = mtime
def normallookup(self, f):
'''Mark a file normal, but possibly dirty.'''
if self.pendingparentchange():
util.nouideprecwarn(
b"do not use `normallookup` 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 `normallookup` outside of update/merge context."
b" Use `set_possibly_dirty` or `set_tracked`",
b'6.0',
stacklevel=2,
)
self._normallookup(f)
def _normallookup(self, f): def _normallookup(self, f):
'''Mark a file normal, but possibly dirty.''' '''Mark a file normal, but possibly dirty.'''
if self.in_merge: if self.in_merge:
# if there is a merge going on and the file was either # if there is a merge going on and the file was either
# "merged" or coming from other parent (-2) before # "merged" or coming from other parent (-2) before
# being removed, restore that state. # being removed, restore that state.
entry = self._map.get(f) entry = self._map.get(f)
if entry is not None: if entry is not None:

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 normallookup(f):
'''Mark a file normal, but possibly dirty.'''
def otherparent(f): def otherparent(f):
'''Mark as coming from the other parent, always dirty.''' '''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.'''