This is an archive of the discontinued Mercurial Phabricator instance.

Differential D384

context: fix troubled deprecation
ClosedPublic

Authored by lothiraldan on Aug 14 2017, 5:46 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4abf34f47526: context: fix troubled deprecation
Summary

troubled has been renamed into isunstable but troubled was calling unstable
instead. Fix the mistake.

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 14 2017, 5:46 AM
Closed by commit rHG4abf34f47526: context: fix troubled deprecation (authored by lothiraldan). · Explain WhyAug 15 2017, 3:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (2 lines)

Diff 920

mercurial/context.py

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, 'contentdivergent') 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.isunstable()
def isunstable(self): def isunstable(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.phasedivergent() 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.