obsolete: rename bumped volatile set into phasedivergent volatile set
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D255
--- a/mercurial/context.py Fri Aug 04 19:36:27 2017 +0200
+++ b/mercurial/context.py Fri Aug 04 19:39:34 2017 +0200
@@ -224,7 +224,7 @@
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, "
--- a/mercurial/obsolete.py Fri Aug 04 19:36:27 2017 +0200
+++ b/mercurial/obsolete.py Fri Aug 04 19:39:34 2017 +0200
@@ -942,9 +942,16 @@
"""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)
--- a/mercurial/revset.py Fri Aug 04 19:36:27 2017 +0200
+++ b/mercurial/revset.py Fri Aug 04 19:39:34 2017 +0200
@@ -473,8 +473,8 @@
"""
# 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):