This is an archive of the discontinued Mercurial Phabricator instance.

Differential D239

context: rename unstable into orphan
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf163edb45c47: context: rename unstable into orphan
Summary

Rename unstable context method into orphan and add a deprecation
warning on unstable.

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 accepted this revision.Aug 8 2017, 12:37 AM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/context.py
208

Typo. Can be fixed in flight if you don't submit a new series.

This revision is now accepted and ready to land.Aug 8 2017, 12:37 AM
lothiraldan updated this revision to Diff 623.Aug 8 2017, 5:42 AM
lothiraldan marked an inline comment as done.Aug 8 2017, 5:47 AM
lothiraldan added inline comments.
mercurial/context.py
208

I have made the fix as I sent another series

lothiraldan marked an inline comment as done.Aug 9 2017, 11:36 AM
Closed by commit rHGf163edb45c47: context: rename unstable into orphan (authored by lothiraldan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (12 lines)

Diff 695

mercurial/context.py

"""True if the changeset is obsolete""" """True if the changeset is obsolete"""
return self.rev() in obsmod.getrevs(self._repo, 'obsolete') return self.rev() in obsmod.getrevs(self._repo, 'obsolete')
def extinct(self): def extinct(self):
"""True if the changeset is extinct""" """True if the changeset is extinct"""
return self.rev() in obsmod.getrevs(self._repo, 'extinct') return self.rev() in obsmod.getrevs(self._repo, 'extinct')
def unstable(self): def unstable(self):
msg = ("'context.unstable' is deprecated, "
"use 'context.orphan'")
indygregUnsubmitted
Done

Typo. Can be fixed in flight if you don't submit a new series.

indygreg: Typo. Can be fixed in flight if you don't submit a new series.
lothiraldanAuthorUnsubmitted
Not Done

I have made the fix as I sent another series

lothiraldan: I have made the fix as I sent another series
self._repo.ui.deprecwarn(msg, '4.4')
return self.orphan()
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):
"""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):
"""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.unstable() or self.bumped() or self.divergent() return self.orphan() or self.bumped() or self.divergent()
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.unstable(): if self.orphan():
troubles.append('orphan') troubles.append('orphan')
if self.bumped(): if self.bumped():
troubles.append('bumped') troubles.append('bumped')
if self.divergent(): if self.divergent():
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.unstable(): if self.orphan():
instabilities.append('orphan') instabilities.append('orphan')
if self.bumped(): if self.bumped():
instabilities.append('phase-divergent') instabilities.append('phase-divergent')
if self.divergent(): if self.divergent():
instabilities.append('content-divergent') instabilities.append('content-divergent')
return instabilities return instabilities
def parents(self): def parents(self):