Mercurial > hg-stable
comparison mercurial/exchange.py @ 33752:ab0c55c2ad9a
context: rename troubles into instabilities
Rename troubles context method into instabilities.
Copy the old troubles method and add a deprecation warning. This way
extensions calling troubles will see the deprecation warning but will not
break due to new return values.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D238
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 02 Aug 2017 18:34:39 +0200 |
parents | 033484935391 |
children | 52c5ff856b49 |
comparison
equal
deleted
inserted
replaced
33751:86ea201eaeb9 | 33752:ab0c55c2ad9a |
---|---|
679 for node in outgoing.missingheads: | 679 for node in outgoing.missingheads: |
680 ctx = unfi[node] | 680 ctx = unfi[node] |
681 if ctx.obsolete(): | 681 if ctx.obsolete(): |
682 raise error.Abort(mso % ctx) | 682 raise error.Abort(mso % ctx) |
683 elif ctx.troubled(): | 683 elif ctx.troubled(): |
684 raise error.Abort(mst[ctx.troubles()[0]] % ctx) | 684 # TODO print more than one instability in the abort |
685 # message | |
686 raise error.Abort(mst[ctx.instabilities()[0]] % ctx) | |
685 | 687 |
686 discovery.checkheads(pushop) | 688 discovery.checkheads(pushop) |
687 return True | 689 return True |
688 | 690 |
689 # List of names of steps to perform for an outgoing bundle2, order matters. | 691 # List of names of steps to perform for an outgoing bundle2, order matters. |