( )⚙ D11349 dirstate: drop the deprecated `merge` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11349

dirstate: drop the deprecated `merge` method
ClosedPublic

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

Details

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

Revision Contents
Changeset List

Diff 30065

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, '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'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:
def _wrapper(orig, self, *args, **kwargs): def _wrapper(orig, self, *args, **kwargs):

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 merge(self, f):
'''Mark a file merged.'''
if self.pendingparentchange():
util.nouideprecwarn(
b"do not use `merge` inside of update/merge context."
b" Use `update_file`",
b'6.0',
stacklevel=2,
)
else:
util.nouideprecwarn(
b"do not use `merge` outside of update/merge context."
b"It should have been set by the update/merge code",
b'6.0',
stacklevel=2,
)
self._merge(f)
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): def drop(self, f):
'''Drop a file from the dirstate''' '''Drop a file from the dirstate'''
if self.pendingparentchange(): if self.pendingparentchange():

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 merge(f):
'''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):
""" """
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