# HG changeset patch # User Matt Harbison # Date 1517633131 18000 # Node ID 75d9dcb64e7d4b5e6676f76e926744b42344664c # Parent 44bc37d20271d14ea470bb6ab682caa9f6333694 obsolete: drop deprecated methods (API) .. api:: The following deprecated methods have been removed from obsolete, with replacements: - _addprecursors() -> _addpredecessors() - obsstore.precursors -> obsstore.predecessors - allprecursors() -> obsutil.allprecursors() - allsuccessors() -> obsutil.allsuccessors() - marker() -> obsutil.marker - getmarkers() -> obsutil.getmarkers() - exclusivemarkers() -> obsutil.exclusivemarkers() - foreground() -> obsutil.foreground() - successorssets() -> obsutil.successorsset() - unstable() -> orphan() - bumped() -> phasedivergent() - divergent() -> contentdivergent() diff -r 44bc37d20271 -r 75d9dcb64e7d mercurial/obsolete.py --- a/mercurial/obsolete.py Fri Feb 02 23:27:30 2018 -0500 +++ b/mercurial/obsolete.py Fri Feb 02 23:45:31 2018 -0500 @@ -506,13 +506,6 @@ for mark in markers: successors.setdefault(mark[0], set()).add(mark) -def _addprecursors(*args, **kwargs): - msg = ("'obsolete._addprecursors' is deprecated, " - "use 'obsolete._addpredecessors'") - util.nouideprecwarn(msg, '4.4') - - return _addpredecessors(*args, **kwargs) - @util.nogc def _addpredecessors(predecessors, markers): for mark in markers: @@ -700,14 +693,6 @@ _addsuccessors(successors, self._all) return successors - @property - def precursors(self): - msg = ("'obsstore.precursors' is deprecated, " - "use 'obsstore.predecessors'") - util.nouideprecwarn(msg, '4.4') - - return self.predecessors - @propertycache def predecessors(self): predecessors = {} @@ -843,42 +828,6 @@ repo.invalidatevolatilesets() return True -# keep compatibility for the 4.3 cycle -def allprecursors(obsstore, nodes, ignoreflags=0): - movemsg = 'obsolete.allprecursors moved to obsutil.allprecursors' - util.nouideprecwarn(movemsg, '4.3') - return obsutil.allprecursors(obsstore, nodes, ignoreflags) - -def allsuccessors(obsstore, nodes, ignoreflags=0): - movemsg = 'obsolete.allsuccessors moved to obsutil.allsuccessors' - util.nouideprecwarn(movemsg, '4.3') - return obsutil.allsuccessors(obsstore, nodes, ignoreflags) - -def marker(repo, data): - movemsg = 'obsolete.marker moved to obsutil.marker' - repo.ui.deprecwarn(movemsg, '4.3') - return obsutil.marker(repo, data) - -def getmarkers(repo, nodes=None, exclusive=False): - movemsg = 'obsolete.getmarkers moved to obsutil.getmarkers' - repo.ui.deprecwarn(movemsg, '4.3') - return obsutil.getmarkers(repo, nodes=nodes, exclusive=exclusive) - -def exclusivemarkers(repo, nodes): - movemsg = 'obsolete.exclusivemarkers moved to obsutil.exclusivemarkers' - repo.ui.deprecwarn(movemsg, '4.3') - return obsutil.exclusivemarkers(repo, nodes) - -def foreground(repo, nodes): - movemsg = 'obsolete.foreground moved to obsutil.foreground' - repo.ui.deprecwarn(movemsg, '4.3') - return obsutil.foreground(repo, nodes) - -def successorssets(repo, initialnode, cache=None): - movemsg = 'obsolete.successorssets moved to obsutil.successorssets' - repo.ui.deprecwarn(movemsg, '4.3') - return obsutil.successorssets(repo, initialnode, cache=cache) - # mapping of 'set-name' -> cachefuncs = {} def cachefor(name): @@ -933,14 +882,6 @@ obs = set(r for r in notpublic if isobs(getnode(r))) return obs -@cachefor('unstable') -def _computeunstableset(repo): - msg = ("'unstable' volatile set is deprecated, " - "use 'orphan'") - repo.ui.deprecwarn(msg, '4.4') - - return _computeorphanset(repo) - @cachefor('orphan') def _computeorphanset(repo): """the set of non obsolete revisions with obsolete parents""" @@ -969,14 +910,6 @@ """the set of obsolete parents without non obsolete descendants""" return getrevs(repo, 'obsolete') - getrevs(repo, 'suspended') -@cachefor('bumped') -def _computebumpedset(repo): - msg = ("'bumped' volatile set is deprecated, " - "use 'phasedivergent'") - repo.ui.deprecwarn(msg, '4.4') - - return _computephasedivergentset(repo) - @cachefor('phasedivergent') def _computephasedivergentset(repo): """the set of revs trying to obsolete public revisions""" @@ -1000,14 +933,6 @@ break # Next draft! return bumped -@cachefor('divergent') -def _computedivergentset(repo): - msg = ("'divergent' volatile set is deprecated, " - "use 'contentdivergent'") - repo.ui.deprecwarn(msg, '4.4') - - return _computecontentdivergentset(repo) - @cachefor('contentdivergent') def _computecontentdivergentset(repo): """the set of rev that compete to be the final successors of some revision.