This is an archive of the discontinued Mercurial Phabricator instance.

Differential D254

obsolete: rename divergent volatile set into contentdivergent volatile set
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf3f06c260e9e: obsolete: rename divergent volatile set into contentdivergent 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 (8 lines)
Mmercurial/revset.py (4 lines)

Diff 808

mercurial/context.py

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):
"""Is a successors of a changeset with multiple possible successors set """Is a successors of a changeset with multiple possible successors set
Only non-public and non-obsolete changesets may be divergent. 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): def troubled(self):
msg = ("'context.troubled' is deprecated, " msg = ("'context.troubled' is deprecated, "
"use 'context.isunstable'") "use 'context.isunstable'")
self._repo.ui.deprecwarn(msg, '4.4') self._repo.ui.deprecwarn(msg, '4.4')
return self.unstable() return self.unstable()
def isunstable(self): def isunstable(self):

mercurial/obsolete.py

if (prev is not None) and (phase(repo, prev) <= public): if (prev is not None) and (phase(repo, prev) <= public):
# we have a public predecessor # we have a public predecessor
bumped.add(rev) bumped.add(rev)
break # Next draft! break # Next draft!
return bumped return bumped
@cachefor('divergent') @cachefor('divergent')
def _computedivergentset(repo): def _computedivergentset(repo):
msg = ("'divergent' volatile set is deprecated, "
"use 'contentdivergent'")
repo.ui.deprecwarn(msg, '4.4')
return _computecontentdivergentset(repo)
@cachefor('contentdivergent')
def _computecontentdivergentset(repo):
"""the set of rev that compete to be the final successors of some revision. """the set of rev that compete to be the final successors of some revision.
""" """
divergent = set() divergent = set()
obsstore = repo.obsstore obsstore = repo.obsstore
newermap = {} newermap = {}
for ctx in repo.set('(not public()) - obsolete()'): for ctx in repo.set('(not public()) - obsolete()'):
mark = obsstore.predecessors.get(ctx.node(), ()) mark = obsstore.predecessors.get(ctx.node(), ())
toprocess = set(mark) toprocess = set(mark)

mercurial/revset.py

@predicate('contentdivergent()', safe=True) @predicate('contentdivergent()', safe=True)
def contentdivergent(repo, subset, x): def contentdivergent(repo, subset, x):
""" """
Final successors of changesets with an alternative set of final successors. Final successors of changesets with an alternative set of final successors.
""" """
# i18n: "contentdivergent" is a keyword # i18n: "contentdivergent" is a keyword
getargs(x, 0, 0, _("contentdivergent takes no arguments")) getargs(x, 0, 0, _("contentdivergent takes no arguments"))
divergent = obsmod.getrevs(repo, 'divergent') contentdivergent = obsmod.getrevs(repo, 'contentdivergent')
return subset & divergent return subset & contentdivergent
@predicate('extinct()', safe=True) @predicate('extinct()', safe=True)
def extinct(repo, subset, x): def extinct(repo, subset, x):
"""Obsolete changesets with obsolete descendants only. """Obsolete changesets with obsolete descendants only.
""" """
# i18n: "extinct" is a keyword # i18n: "extinct" is a keyword
getargs(x, 0, 0, _("extinct takes no arguments")) getargs(x, 0, 0, _("extinct takes no arguments"))
extincts = obsmod.getrevs(repo, 'extinct') extincts = obsmod.getrevs(repo, 'extinct')