This is an archive of the discontinued Mercurial Phabricator instance.

Differential D241

context: rename bumped into phasedivergent
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG8413cbeae275: context: rename bumped into phasedivergent
Summary

Rename bumped context method into phasedivergent and add a deprecation warning
on bumped.

Only update all callers to keep the patch straightforward.

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.

Event Timeline

lothiraldan created this revision.Aug 7 2017, 6:08 AM
indygreg requested changes to this revision.Aug 8 2017, 12:39 AM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/context.py
220

Shouldn't this be self.phasedivergent()?

This revision now requires changes to proceed.Aug 8 2017, 12:39 AM
lothiraldan added inline comments.Aug 8 2017, 5:09 AM
mercurial/context.py
220

Yes definitely, thanks for the catch

lothiraldan edited edge metadata.Aug 8 2017, 5:33 AM
lothiraldan updated this revision to Diff 622.
lothiraldan marked 2 inline comments as done.Aug 8 2017, 5:36 AM
Closed by commit rHG8413cbeae275: context: rename bumped into phasedivergent (authored by lothiraldan). · Explain WhyAug 9 2017, 11:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (12 lines)

Diff 697

mercurial/context.py

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, 'unstable')
def bumped(self): def bumped(self):
msg = ("'context.bumped' is deprecated, "
"use 'context.phasedivergent'")
self._repo.ui.deprecwarn(msg, '4.4')
return self.phasedivergent()
indygregUnsubmitted
Done

Shouldn't this be self.phasedivergent()?

indygreg: Shouldn't this be `self.phasedivergent()`?
lothiraldanAuthorUnsubmitted
Done

Yes definitely, thanks for the catch

lothiraldan: Yes definitely, thanks for the catch
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, 'bumped')
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):
"""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, 'divergent')
def troubled(self): def troubled(self):
"""True if the changeset is either unstable, bumped or divergent""" """True if the changeset is either unstable, bumped or divergent"""
return self.orphan() or self.bumped() or self.contentdivergent() return self.orphan() or self.phasedivergent() or self.contentdivergent()
def troubles(self): def troubles(self):
"""Keep the old version around in order to avoid breaking extensions """Keep the old version around in order to avoid breaking extensions
about different return values. about different return values.
""" """
msg = ("'context.troubles' is deprecated, " msg = ("'context.troubles' is deprecated, "
"use 'context.instabilities'") "use 'context.instabilities'")
self._repo.ui.deprecwarn(msg, '4.4') self._repo.ui.deprecwarn(msg, '4.4')
troubles = [] troubles = []
if self.orphan(): if self.orphan():
troubles.append('orphan') troubles.append('orphan')
if self.bumped(): if self.phasedivergent():
troubles.append('bumped') troubles.append('bumped')
if self.contentdivergent(): if self.contentdivergent():
troubles.append('divergent') troubles.append('divergent')
return troubles return troubles
def instabilities(self): def instabilities(self):
"""return the list of instabilities affecting this changeset. """return the list of instabilities affecting this changeset.
Instabilities are returned as strings. possible values are: Instabilities are returned as strings. possible values are:
- orphan, - orphan,
- phase-divergent, - phase-divergent,
- content-divergent. - content-divergent.
""" """
instabilities = [] instabilities = []
if self.orphan(): if self.orphan():
instabilities.append('orphan') instabilities.append('orphan')
if self.bumped(): if self.phasedivergent():
instabilities.append('phase-divergent') instabilities.append('phase-divergent')
if self.contentdivergent(): if self.contentdivergent():
instabilities.append('content-divergent') instabilities.append('content-divergent')
return instabilities return instabilities
def parents(self): def parents(self):
"""return contexts for each parent changeset""" """return contexts for each parent changeset"""
return self._parents return self._parents