diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -224,7 +224,7 @@ class basectx(object): Only non-public and non-obsolete changesets may be bumped. """ - return self.rev() in obsmod.getrevs(self._repo, 'bumped') + return self.rev() in obsmod.getrevs(self._repo, 'phasedivergent') def divergent(self): msg = ("'context.divergent' is deprecated, " diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -942,9 +942,16 @@ def _computeextinctset(repo): """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""" bumped = set() # util function (avoid attribute lookup in the loop) diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -473,8 +473,8 @@ def phasedivergent(repo, subset, x): """ # i18n: "phasedivergent" is a keyword getargs(x, 0, 0, _("phasedivergent takes no arguments")) - bumped = obsmod.getrevs(repo, 'bumped') - return subset & bumped + phasedivergent = obsmod.getrevs(repo, 'phasedivergent') + return subset & phasedivergent @predicate('bundle()', safe=True) def bundle(repo, subset, x):