Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop the deprecated `normal` method
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 24 Aug 2021 21:08:09 +0200
changeset 47940 f89ac1ed2bc6
parent 47939 74a8d5c6fdc6
child 47941 50bed873a765
dirstate: drop the deprecated `normal` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11344
contrib/dirstatenonnormalcheck.py file | annotate | diff | comparison | revisions
hgext/sparse.py file | annotate | diff | comparison | revisions
mercurial/dirstate.py file | annotate | diff | comparison | revisions
mercurial/interfaces/dirstate.py file | annotate | diff | comparison | revisions 
--- a/contrib/dirstatenonnormalcheck.py	Tue Aug 24 22:07:50 2021 +0200
+++ b/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:08:09 2021 +0200
@@ -61,7 +61,6 @@
             # make the extension run very slowly on large repos
             extensions.wrapfunction(dirstatecl, 'normallookup', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)
-            extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
--- a/hgext/sparse.py	Tue Aug 24 22:07:50 2021 +0200
+++ b/hgext/sparse.py	Tue Aug 24 21:08:09 2021 +0200
@@ -255,7 +255,6 @@
 
     # Prevent adding files that are outside the sparse checkout
     editfuncs = [
-        b'normal',
         b'set_tracked',
         b'set_untracked',
         b'add',
--- 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
--- a/mercurial/interfaces/dirstate.py	Tue Aug 24 22:07:50 2021 +0200
+++ b/mercurial/interfaces/dirstate.py	Tue Aug 24 21:08:09 2021 +0200
@@ -132,18 +132,6 @@
     def copies():
         pass
 
-    def normal(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."""
-        pass
-
     def normallookup(f):
         '''Mark a file normal, but possibly dirty.'''
hg-stable