Mercurial > evolve
changeset 4270:c8f96f4cb600
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 27 Nov 2018 03:56:27 +0100 |
| parents | d5a2cc19903f (current diff) d2599da04bb5 (diff) |
| children | 70043c934e1c |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Mon Nov 26 16:43:39 2018 +0300 +++ b/hgext3rd/evolve/evolvecmd.py Tue Nov 27 03:56:27 2018 +0100 @@ -769,17 +769,18 @@ returns the node of new commit which is formed """ if orig.rev() == dest.rev(): - raise error.Abort(_('tried to relocate a node on top of itself'), - hint=_("This shouldn't happen. If you still " - "need to move changesets, please do so " - "manually with nothing to rebase - working " - "directory parent is also destination")) + msg = _('tried to relocate a node on top of itself') + hint = _("This shouldn't happen. If you still need to move changesets, " + "please do so manually with nothing to rebase - working " + "directory parent is also destination") + raise error.ProgrammingError(msg, hint=hint) if pctx is None: if len(orig.parents()) == 2: - raise error.Abort(_("tried to relocate a merge commit without " - "specifying which parent should be moved"), - hint=_("Specify the parent by passing in pctx")) + msg = _("tried to relocate a merge commit without specifying which " + "parent should be moved") + hint = _("Specify the parent by passing in pctx") + raise error.ProgrammingError(msg, hint) pctx = orig.p1() commitmsg = orig.description() @@ -1440,7 +1441,7 @@ interrupted evolve - `hg evolve --stop`: - stops the current interrupted evolve,. keeping all the successful steps, + stops the current interrupted evolve, keeping all the successful steps, but delaying to resolution of the remaining step for later. - `hg evolve --abort`: