This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11161

dirstate: deprecate the `normal` method in all cases
ClosedPublic

Authored by marmoute on Jul 19 2021, 6:43 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1168e54b727c: dirstate: deprecate the `normal` method in all cases
Summary

All code have been migrated to the new APIs.

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.Jul 19 2021, 6:43 AM
pulkit added a subscriber: pulkit.Jul 19 2021, 8:38 AM

Can you add a patch that adds release notes about all these API changes?

marmoute added a comment.Jul 19 2021, 8:57 AM
In D11161#170841, @pulkit wrote:

Can you add a patch that adds release notes about all these API changes?

I can, does a final patch documenting all the changes at the end of the full series works for you ?

marmoute updated this revision to Diff 29474.Jul 19 2021, 10:53 AM
Alphare accepted this revision.Jul 19 2021, 12:28 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:28 PM
baymax updated this revision to Diff 29575.Jul 20 2021, 3:23 AM

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

pulkit accepted this revision.Jul 20 2021, 3:38 PM
pulkit added inline comments.
mercurial/dirstate.py
715

should mention set_clean too.

marmoute added a commit: rHG1168e54b727c: dirstate: deprecate the `normal` method in all cases.Jul 20 2021, 4:38 PM
Closed by commit rHG1168e54b727c: dirstate: deprecate the `normal` method in all cases (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (19 lines)

Diff 29662

mercurial/dirstate.py

self._remove(filename) self._remove(filename)
return True return True
@requires_no_parents_change @requires_no_parents_change
def set_clean(self, filename, parentfiledata=None): def set_clean(self, filename, parentfiledata=None):
"""record that the current state of the file on disk is known to be clean""" """record that the current state of the file on disk is known to be clean"""
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
self.normal(filename, parentfiledata=parentfiledata) self._normal(filename, parentfiledata=parentfiledata)
@requires_parents_change @requires_parents_change
def update_file_p1( def update_file_p1(
self, self,
filename, filename,
p1_tracked, p1_tracked,
): ):
"""Set a file as tracked in the parent (or not) """Set a file as tracked in the parent (or not)
parentfiledata: (mode, size, mtime) of the clean file parentfiledata: (mode, size, mtime) of the clean file
parentfiledata should be computed from memory (for mode, parentfiledata should be computed from memory (for mode,
size), as or close as possible from the point where we size), as or close as possible from the point where we
determined the file was clean, to limit the risk of the determined the file was clean, to limit the risk of the
file having been changed by an external process between the file having been changed by an external process between the
moment where the file was determined to be clean and now.""" moment where the file was determined to be clean and now."""
if self.pendingparentchange():
util.nouideprecwarn(
b"do not use `normal` 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 `normal` outside of update/merge context."
b" Use `set_tracked`",
pulkitUnsubmitted
Not Done

should mention set_clean too.

pulkit: should mention `set_clean` too.
b'6.0',
stacklevel=2,
)
self._normal(f, parentfiledata=parentfiledata)
def _normal(self, f, parentfiledata=None):
if parentfiledata: if parentfiledata:
(mode, size, mtime) = parentfiledata (mode, size, mtime) = parentfiledata
else: else:
(mode, size, mtime) = self._get_filedata(f) (mode, size, mtime) = self._get_filedata(f)
self._addpath(f, mode=mode, size=size, mtime=mtime) self._addpath(f, mode=mode, size=size, mtime=mtime)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
if f in self._map.nonnormalset: if f in self._map.nonnormalset:
self._map.nonnormalset.remove(f) self._map.nonnormalset.remove(f)