# HG changeset patch # User Boris Feld # Date 1501867659 -7200 # Node ID d4b7496f7d0b204410646eece6b2aa588632a9cf # Parent ed99d3afef889177ef37be21fb0ea0dbb18b0027 obsolete: rename unstable volatile set into orphan volatile set The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D253 diff -r ed99d3afef88 -r d4b7496f7d0b mercurial/context.py --- a/mercurial/context.py Thu Aug 03 14:08:39 2017 +0200 +++ b/mercurial/context.py Fri Aug 04 19:27:39 2017 +0200 @@ -211,7 +211,7 @@ def orphan(self): """True if the changeset is not obsolete but it's ancestor are""" - return self.rev() in obsmod.getrevs(self._repo, 'unstable') + return self.rev() in obsmod.getrevs(self._repo, 'orphan') def bumped(self): msg = ("'context.bumped' is deprecated, " diff -r ed99d3afef88 -r d4b7496f7d0b mercurial/obsolete.py --- a/mercurial/obsolete.py Thu Aug 03 14:08:39 2017 +0200 +++ b/mercurial/obsolete.py Fri Aug 04 19:27:39 2017 +0200 @@ -908,6 +908,14 @@ @cachefor('unstable') def _computeunstableset(repo): + msg = ("'unstable' volatile set is deprecated, " + "use 'orphan'") + repo.ui.deprecwarn(msg, '4.4') + + return _computeorphanset(repo) + +@cachefor('orphan') +def _computeorphanset(repo): """the set of non obsolete revisions with obsolete parents""" pfunc = repo.changelog.parentrevs mutable = _mutablerevs(repo) @@ -926,7 +934,7 @@ @cachefor('suspended') def _computesuspendedset(repo): """the set of obsolete parents with non obsolete descendants""" - suspended = repo.changelog.ancestors(getrevs(repo, 'unstable')) + suspended = repo.changelog.ancestors(getrevs(repo, 'orphan')) return set(r for r in getrevs(repo, 'obsolete') if r in suspended) @cachefor('extinct') diff -r ed99d3afef88 -r d4b7496f7d0b mercurial/revset.py --- a/mercurial/revset.py Thu Aug 03 14:08:39 2017 +0200 +++ b/mercurial/revset.py Fri Aug 04 19:27:39 2017 +0200 @@ -1947,8 +1947,8 @@ """ # i18n: "orphan" is a keyword getargs(x, 0, 0, _("orphan takes no arguments")) - unstables = obsmod.getrevs(repo, 'unstable') - return subset & unstables + orphan = obsmod.getrevs(repo, 'orphan') + return subset & orphan @predicate('user(string)', safe=True)