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 `add` method
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 24 Aug 2021 21:09:20 +0200
changeset 47943 91afee6f959e
parent 47942 3d2c17c5d7f2
child 47944 3911c61f09c6
dirstate: drop the deprecated `add` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11347
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 21:09:01 2021 +0200
+++ b/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:09:20 2021 +0200
@@ -60,7 +60,6 @@
             # We don't do all these checks when paranoid is disable as it would
             # make the extension run very slowly on large repos
             extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
-            extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
--- a/hgext/sparse.py	Tue Aug 24 21:09:01 2021 +0200
+++ b/hgext/sparse.py	Tue Aug 24 21:09:20 2021 +0200
@@ -257,7 +257,6 @@
     editfuncs = [
         b'set_tracked',
         b'set_untracked',
-        b'add',
         b'copy',
         b'remove',
         b'merge',
--- a/mercurial/dirstate.py	Tue Aug 24 21:09:01 2021 +0200
+++ b/mercurial/dirstate.py	Tue Aug 24 21:09:20 2021 +0200
@@ -757,24 +757,6 @@
             self._addpath(f, from_p2=True)
         self._map.copymap.pop(f, None)
 
-    def add(self, f):
-        '''Mark a file added.'''
-        if self.pendingparentchange():
-            util.nouideprecwarn(
-                b"do not use `add` inside of update/merge context."
-                b" Use `update_file`",
-                b'6.0',
-                stacklevel=2,
-            )
-        else:
-            util.nouideprecwarn(
-                b"do not use `add` outside of update/merge context."
-                b" Use `set_tracked`",
-                b'6.0',
-                stacklevel=2,
-            )
-        self._add(f)
-
     def _add(self, filename):
         """internal function to mark a file as added"""
         self._addpath(filename, added=True)
--- a/mercurial/interfaces/dirstate.py	Tue Aug 24 21:09:01 2021 +0200
+++ b/mercurial/interfaces/dirstate.py	Tue Aug 24 21:09:20 2021 +0200
@@ -132,9 +132,6 @@
     def copies():
         pass
 
-    def add(f):
-        '''Mark a file added.'''
-
     def remove(f):
         '''Mark a file removed.'''
hg-stable