Mercurial > hg
diff mercurial/dirstate.py @ 47909:f89ac1ed2bc6
dirstate: drop the deprecated `normal` method
The method was deprecated in 5.9.
Differential Revision: https://phab.mercurial-scm.org/D11344
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:08:09 +0200 |
parents | 3853e6ee160d |
children | 50bed873a765 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Tue Aug 24 22:07:50 2021 +0200 +++ b/mercurial/dirstate.py Tue Aug 24 21:08:09 2021 +0200 @@ -705,32 +705,6 @@ mtime = s[stat.ST_MTIME] return (mode, size, mtime) - def normal(self, f, parentfiledata=None): - """Mark a file normal and clean. - - parentfiledata: (mode, size, mtime) of the clean file - - parentfiledata should be computed from memory (for mode, - size), as or close as possible from the point where we - determined the file was clean, to limit the risk of the - file having been changed by an external process between the - 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`", - b'6.0', - stacklevel=2, - ) - self._normal(f, parentfiledata=parentfiledata) - def _normal(self, f, parentfiledata=None): if parentfiledata: (mode, size, mtime) = parentfiledata