This is an archive of the discontinued Mercurial Phabricator instance.

Differential D253

obsolete: rename unstable volatile set into orphan volatile set
ClosedPublic

Authored by lothiraldan on Aug 7 2017, 6:10 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd4b7496f7d0b: obsolete: rename unstable volatile set into orphan volatile set
Summary

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)
Mmercurial/obsolete.py (10 lines)
Mmercurial/revset.py (4 lines)

Diff 807

mercurial/context.py

def unstable(self): def unstable(self):
msg = ("'context.unstable' is deprecated, " msg = ("'context.unstable' is deprecated, "
"use 'context.orphan'") "use 'context.orphan'")
self._repo.ui.deprecwarn(msg, '4.4') self._repo.ui.deprecwarn(msg, '4.4')
return self.orphan() return self.orphan()
def orphan(self): def orphan(self):
"""True if the changeset is not obsolete but it's ancestor are""" """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): def bumped(self):
msg = ("'context.bumped' is deprecated, " msg = ("'context.bumped' is deprecated, "
"use 'context.phasedivergent'") "use 'context.phasedivergent'")
self._repo.ui.deprecwarn(msg, '4.4') self._repo.ui.deprecwarn(msg, '4.4')
return self.phasedivergent() return self.phasedivergent()
def phasedivergent(self): def phasedivergent(self):

mercurial/obsolete.py

getnode = repo.changelog.node getnode = repo.changelog.node
notpublic = _mutablerevs(repo) notpublic = _mutablerevs(repo)
isobs = repo.obsstore.successors.__contains__ isobs = repo.obsstore.successors.__contains__
obs = set(r for r in notpublic if isobs(getnode(r))) obs = set(r for r in notpublic if isobs(getnode(r)))
return obs return obs
@cachefor('unstable') @cachefor('unstable')
def _computeunstableset(repo): 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""" """the set of non obsolete revisions with obsolete parents"""
pfunc = repo.changelog.parentrevs pfunc = repo.changelog.parentrevs
mutable = _mutablerevs(repo) mutable = _mutablerevs(repo)
obsolete = getrevs(repo, 'obsolete') obsolete = getrevs(repo, 'obsolete')
others = mutable - obsolete others = mutable - obsolete
unstable = set() unstable = set()
for r in sorted(others): for r in sorted(others):
# A rev is unstable if one of its parent is obsolete or unstable # A rev is unstable if one of its parent is obsolete or unstable
# this works since we traverse following growing rev order # this works since we traverse following growing rev order
for p in pfunc(r): for p in pfunc(r):
if p in obsolete or p in unstable: if p in obsolete or p in unstable:
unstable.add(r) unstable.add(r)
break break
return unstable return unstable
@cachefor('suspended') @cachefor('suspended')
def _computesuspendedset(repo): def _computesuspendedset(repo):
"""the set of obsolete parents with non obsolete descendants""" """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) return set(r for r in getrevs(repo, 'obsolete') if r in suspended)
@cachefor('extinct') @cachefor('extinct')
def _computeextinctset(repo): def _computeextinctset(repo):
"""the set of obsolete parents without non obsolete descendants""" """the set of obsolete parents without non obsolete descendants"""
return getrevs(repo, 'obsolete') - getrevs(repo, 'suspended') return getrevs(repo, 'obsolete') - getrevs(repo, 'suspended')

mercurial/revset.py

return orphan(repo, subset, x) return orphan(repo, subset, x)
@predicate('orphan()', safe=True) @predicate('orphan()', safe=True)
def orphan(repo, subset, x): def orphan(repo, subset, x):
"""Non-obsolete changesets with obsolete ancestors. """Non-obsolete changesets with obsolete ancestors.
""" """
# i18n: "orphan" is a keyword # i18n: "orphan" is a keyword
getargs(x, 0, 0, _("orphan takes no arguments")) getargs(x, 0, 0, _("orphan takes no arguments"))
unstables = obsmod.getrevs(repo, 'unstable') orphan = obsmod.getrevs(repo, 'orphan')
return subset & unstables return subset & orphan
@predicate('user(string)', safe=True) @predicate('user(string)', safe=True)
def user(repo, subset, x): def user(repo, subset, x):
"""User name contains string. The match is case-insensitive. """User name contains string. The match is case-insensitive.
Pattern matching is supported for `string`. See Pattern matching is supported for `string`. See
:hg:`help revisions.patterns`. :hg:`help revisions.patterns`.