--- a/mercurial/revset.py Thu Aug 03 13:48:39 2017 +0200
+++ b/mercurial/revset.py Thu Aug 03 14:01:51 2017 +0200
@@ -711,11 +711,19 @@
@predicate('divergent()', safe=True)
def divergent(repo, subset, x):
+ msg = ("'divergent()' is deprecated, "
+ "use 'contentdivergent()'")
+ repo.ui.deprecwarn(msg, '4.4')
+
+ return contentdivergent(repo, subset, x)
+
+@predicate('contentdivergent()', safe=True)
+def contentdivergent(repo, subset, x):
"""
Final successors of changesets with an alternative set of final successors.
"""
- # i18n: "divergent" is a keyword
- getargs(x, 0, 0, _("divergent takes no arguments"))
+ # i18n: "contentdivergent" is a keyword
+ getargs(x, 0, 0, _("contentdivergent takes no arguments"))
divergent = obsmod.getrevs(repo, 'divergent')
return subset & divergent