diff mercurial/obsolete.py @ 33799:f3f06c260e9e

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/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()