D242: context: rename troubled into isunstable
lothiraldan (Boris Feld)
phabricator at mercurial-scm.org
Mon Aug 7 10:09:21 UTC 2017
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As we changed the meaning of unstable between the old vocabulary and the new
one, we can't reuse the unstable method name at the risk of breaking
extensions calling unstable and getting a wrong result.
Instead rename troubled into isunstable so extensions will continue to work.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D242
AFFECTED FILES
mercurial/cmdutil.py
mercurial/commands.py
mercurial/context.py
mercurial/exchange.py
CHANGE DETAILS
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -690,7 +690,7 @@
ctx = unfi[node]
if ctx.obsolete():
raise error.Abort(mso % ctx)
- elif ctx.troubled():
+ elif ctx.isunstable():
raise error.Abort(mst[ctx.instabilities()[0]] % ctx)
discovery.checkheads(pushop)
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -240,6 +240,12 @@
return self.rev() in obsmod.getrevs(self._repo, 'divergent')
def troubled(self):
+ msg = ("'context.troubled' is deprecated, "
+ "use 'context.unstable'")
+ self._repo.ui.deprecwarn(msg, '4.4')
+ return self.unstable()
+
+ def isunstable(self):
"""True if the changeset is either unstable, bumped or divergent"""
return self.orphan() or self.phasedivergent() or self.contentdivergent()
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4849,7 +4849,7 @@
ui.write(_(' (no revision checked out)'))
if p.obsolete():
ui.write(_(' (obsolete)'))
- if p.troubled():
+ if p.isunstable():
instabilities = (ui.label(instability, 'trouble.%s' % instability)
for instability in p.instabilities())
ui.write(' ('
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1464,7 +1464,7 @@
labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
if ctx.obsolete():
labels.append('changeset.obsolete')
- if ctx.troubled():
+ if ctx.isunstable():
labels.append('changeset.troubled')
for instability in ctx.instabilities():
labels.append('trouble.%s' % instability)
@@ -1577,7 +1577,7 @@
self.ui.write(_("date: %s\n") % date,
label='log.date')
- if ctx.troubled():
+ if ctx.isunstable():
# i18n: column positioning for "hg log"
instabilities = ctx.instabilities()
self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list