##// END OF EJS Templates
dirstate: drop the deprecated `drop` method...
marmoute -
r48726:51cd60c0 default
parent child Browse files
Show More
@@ -60,7 +60,6 b' def extsetup(ui):'
60 # We don't do all these checks when paranoid is disable as it would
60 # We don't do all these checks when paranoid is disable as it would
61 # make the extension run very slowly on large repos
61 # make the extension run very slowly on large repos
62 extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
62 extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
63 extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
64 extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
63 extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
65 extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)
64 extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)
66 extensions.wrapfunction(
65 extensions.wrapfunction(
@@ -767,24 +767,6 b' class dirstate(object):'
767 return self._normallookup(f)
767 return self._normallookup(f)
768 return self._otherparent(f)
768 return self._otherparent(f)
769
769
770 def drop(self, f):
771 '''Drop a file from the dirstate'''
772 if self.pendingparentchange():
773 util.nouideprecwarn(
774 b"do not use `drop` inside of update/merge context."
775 b" Use `update_file`",
776 b'6.0',
777 stacklevel=2,
778 )
779 else:
780 util.nouideprecwarn(
781 b"do not use `drop` outside of update/merge context."
782 b" Use `set_untracked`",
783 b'6.0',
784 stacklevel=2,
785 )
786 self._drop(f)
787
788 def _drop(self, filename):
770 def _drop(self, filename):
789 """internal function to drop a file from the dirstate"""
771 """internal function to drop a file from the dirstate"""
790 if self._map.dropfile(filename):
772 if self._map.dropfile(filename):
@@ -132,9 +132,6 b' class idirstate(interfaceutil.Interface)'
132 def copies():
132 def copies():
133 pass
133 pass
134
134
135 def drop(f):
136 '''Drop a file from the dirstate'''
137
138 def normalize(path, isknown=False, ignoremissing=False):
135 def normalize(path, isknown=False, ignoremissing=False):
139 """
136 """
140 normalize the case of a pathname when on a casefolding filesystem
137 normalize the case of a pathname when on a casefolding filesystem
General Comments 0
You need to be logged in to leave comments. Login now