This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11314

dirstate: forward `remove` call to newer `API`
ClosedPublic

Authored by marmoute on Aug 21 2021, 5:55 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6614ab9f061d: dirstate: forward `remove` call to newer `API`
Summary

The _remove method was only called in the deprecated remove function. We
merge the two and express it in terms of call to new API methods.

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 21 2021, 5:55 AM
Alphare accepted this revision.Aug 25 2021, 9:39 AM
This revision is now accepted and ready to land.Aug 25 2021, 9:39 AM
baymax updated this revision to Diff 30040.Aug 26 2021, 8:59 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG6614ab9f061d: dirstate: forward `remove` call to newer `API`.Aug 27 2021, 8:37 AM
Closed by commit rHG6614ab9f061d: dirstate: forward `remove` call to newer `API` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (13 lines)

Diff 30082

mercurial/dirstate.py

) )
else: else:
util.nouideprecwarn( util.nouideprecwarn(
b"do not use `remove` outside of update/merge context." b"do not use `remove` outside of update/merge context."
b" Use `set_untracked`", b" Use `set_untracked`",
b'6.0', b'6.0',
stacklevel=2, stacklevel=2,
) )
self._remove(f)
def _remove(self, filename):
"""internal function to mark a file removed"""
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(f)
self._map.removefile(filename, in_merge=self.in_merge) 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',