obsolete: rename divergent volatile set into contentdivergent volatile set
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D254
--- a/mercurial/context.py Fri Aug 04 19:27:39 2017 +0200
+++ b/mercurial/context.py Fri Aug 04 19:36:27 2017 +0200
@@ -237,7 +237,7 @@
Only non-public and non-obsolete changesets may be divergent.
"""
- return self.rev() in obsmod.getrevs(self._repo, 'divergent')
+ return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent')
def troubled(self):
msg = ("'context.troubled' is deprecated, "
--- a/mercurial/obsolete.py Fri Aug 04 19:27:39 2017 +0200
+++ b/mercurial/obsolete.py Fri Aug 04 19:36:27 2017 +0200
@@ -968,6 +968,14 @@
@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.
"""
divergent = set()
--- a/mercurial/revset.py Fri Aug 04 19:27:39 2017 +0200
+++ b/mercurial/revset.py Fri Aug 04 19:36:27 2017 +0200
@@ -732,8 +732,8 @@
"""
# i18n: "contentdivergent" is a keyword
getargs(x, 0, 0, _("contentdivergent takes no arguments"))
- divergent = obsmod.getrevs(repo, 'divergent')
- return subset & divergent
+ contentdivergent = obsmod.getrevs(repo, 'contentdivergent')
+ return subset & contentdivergent
@predicate('extinct()', safe=True)
def extinct(repo, subset, x):