Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 27 Nov 2018 03:56:27 +0100
changeset 4270 c8f96f4cb600
parent 4268 d5a2cc19903f (current diff)
parent 4269 d2599da04bb5 (diff)
child 4271 70043c934e1c
branching: merge with stable
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- 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`:
evolve