This is an archive of the discontinued Mercurial Phabricator instance.

Differential D255

obsolete: rename bumped volatile set into phasedivergent volatile set
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9fa874fb34e1: obsolete: rename bumped volatile set into phasedivergent 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 (9 lines)
Mmercurial/revset.py (4 lines)

Diff 809

mercurial/context.py

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):
"""True if the changeset try to be a successor of a public changeset """True if the changeset try to be a successor of a public changeset
Only non-public and non-obsolete changesets may be bumped. Only non-public and non-obsolete changesets may be bumped.
""" """
return self.rev() in obsmod.getrevs(self._repo, 'bumped') return self.rev() in obsmod.getrevs(self._repo, 'phasedivergent')
def divergent(self): def divergent(self):
msg = ("'context.divergent' is deprecated, " msg = ("'context.divergent' is deprecated, "
"use 'context.contentdivergent'") "use 'context.contentdivergent'")
self._repo.ui.deprecwarn(msg, '4.4') self._repo.ui.deprecwarn(msg, '4.4')
return self.contentdivergent() return self.contentdivergent()
def contentdivergent(self): def contentdivergent(self):

mercurial/obsolete.py

suspended = repo.changelog.ancestors(getrevs(repo, 'orphan')) 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')
@cachefor('bumped') @cachefor('bumped')
def _computebumpedset(repo): def _computebumpedset(repo):
msg = ("'bumped' volatile set is deprecated, "
"use 'phasedivergent'")
repo.ui.deprecwarn(msg, '4.4')
return _computephasedivergentset(repo)
@cachefor('phasedivergent')
def _computephasedivergentset(repo):
"""the set of revs trying to obsolete public revisions""" """the set of revs trying to obsolete public revisions"""
bumped = set() bumped = set()
# util function (avoid attribute lookup in the loop) # util function (avoid attribute lookup in the loop)
phase = repo._phasecache.phase # would be faster to grab the full list phase = repo._phasecache.phase # would be faster to grab the full list
public = phases.public public = phases.public
cl = repo.changelog cl = repo.changelog
torev = cl.nodemap.get torev = cl.nodemap.get
for ctx in repo.set('(not public()) and (not obsolete())'): for ctx in repo.set('(not public()) and (not obsolete())'):

mercurial/revset.py

@predicate('phasedivergent()', safe=True) @predicate('phasedivergent()', safe=True)
def phasedivergent(repo, subset, x): def phasedivergent(repo, subset, x):
"""Mutable changesets marked as successors of public changesets. """Mutable changesets marked as successors of public changesets.
Only non-public and non-obsolete changesets can be `phasedivergent`. Only non-public and non-obsolete changesets can be `phasedivergent`.
""" """
# i18n: "phasedivergent" is a keyword # i18n: "phasedivergent" is a keyword
getargs(x, 0, 0, _("phasedivergent takes no arguments")) getargs(x, 0, 0, _("phasedivergent takes no arguments"))
bumped = obsmod.getrevs(repo, 'bumped') phasedivergent = obsmod.getrevs(repo, 'phasedivergent')
return subset & bumped return subset & phasedivergent
@predicate('bundle()', safe=True) @predicate('bundle()', safe=True)
def bundle(repo, subset, x): def bundle(repo, subset, x):
"""Changesets in the bundle. """Changesets in the bundle.
Bundle must be specified by the -R option.""" Bundle must be specified by the -R option."""
try: try: