Mercurial > hg

diff mercurial/exchange.py @ 33730:52c5ff856b49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: rename troubled into isunstable 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. Differential Revision: https://phab.mercurial-scm.org/D242
author Boris Feld <boris.feld@octobus.net>
date Wed, 02 Aug 2017 19:13:56 +0200
parents ab0c55c2ad9a
children f2befc1f4cf4
line wrap: on
line diff
--- a/mercurial/exchange.py	Wed Aug 02 19:09:00 2017 +0200
+++ b/mercurial/exchange.py	Wed Aug 02 19:13:56 2017 +0200
@@ -680,7 +680,7 @@
                 ctx = unfi[node]
                 if ctx.obsolete():
                     raise error.Abort(mso % ctx)
-                elif ctx.troubled():
+                elif ctx.isunstable():
                     # TODO print more than one instability in the abort
                     # message
                     raise error.Abort(mst[ctx.instabilities()[0]] % ctx)