D254: obsolete: rename divergent volatile set into contentdivergent volatile set
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Fri Aug 11 16:04:56 EDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf3f06c260e9e: obsolete: rename divergent volatile set into contentdivergent volatile set (authored by lothiraldan).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D254?vs=599&id=808
REVISION DETAIL
https://phab.mercurial-scm.org/D254
AFFECTED FILES
mercurial/context.py
mercurial/obsolete.py
mercurial/revset.py
CHANGE DETAILS
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -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):
diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -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)
+
+ at cachefor('contentdivergent')
+def _computecontentdivergentset(repo):
"""the set of rev that compete to be the final successors of some revision.
"""
divergent = set()
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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, "
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list