# HG changeset patch # User Matt Harbison # Date 2018-02-03 04:20:55 # Node ID cd23423029287e299d65bbece497ff09a2a673f4 # Parent 887bbce7f491afc07c5cdd87f87823047b9e5897 bookmarks: drop deprecated methods (API) The ProgrammingError prevents accidental usage of the dict base class methods. .. api:: The following deprecated methods have been removed from bookmarks: __setitem__(), __delitem__(), update(), and recordchange(). Use bookmarks.applychanges() instead. diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -103,30 +103,21 @@ class bmstore(dict): self._aclean = False def __setitem__(self, *args, **kwargs): - msg = ("'bookmarks[name] = node' is deprecated, " - "use 'bookmarks.applychanges'") - self._repo.ui.deprecwarn(msg, '4.3') - self._set(*args, **kwargs) + raise error.ProgrammingError("use 'bookmarks.applychanges' instead") def _set(self, key, value): self._clean = False return dict.__setitem__(self, key, value) def __delitem__(self, key): - msg = ("'del bookmarks[name]' is deprecated, " - "use 'bookmarks.applychanges'") - self._repo.ui.deprecwarn(msg, '4.3') - self._del(key) + raise error.ProgrammingError("use 'bookmarks.applychanges' instead") def _del(self, key): self._clean = False return dict.__delitem__(self, key) def update(self, *others): - msg = ("bookmarks.update(...)' is deprecated, " - "use 'bookmarks.applychanges'") - self._repo.ui.deprecwarn(msg, '4.5') - return dict.update(self, *others) + raise error.ProgrammingError("use 'bookmarks.applychanges' instead") def applychanges(self, repo, tr, changes): """Apply a list of changes to bookmarks @@ -146,12 +137,6 @@ class bmstore(dict): bmchanges[name] = (old, node) self._recordchange(tr) - def recordchange(self, tr): - msg = ("'bookmarks.recorchange' is deprecated, " - "use 'bookmarks.applychanges'") - self._repo.ui.deprecwarn(msg, '4.3') - return self._recordchange(tr) - def _recordchange(self, tr): """record that bookmarks have been changed in a transaction