# HG changeset patch # User Sushil khanchi # Date 1543286766 -3600 # Node ID d2599da04bb5cc039cf161eb0e900cd4bc8de14c # Parent 4d62095d9fe6c1de41c090aaa7902550b0246354 evolve: update the abort to a ProgrammingError This error should be a ProgrammingError and as Pierre-Yves David said ProgrammingError type did not existed when this code was written, so lets update this now. diff -r 4d62095d9fe6 -r d2599da04bb5 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Tue Nov 20 11:33:38 2018 -0500 +++ b/hgext3rd/evolve/evolvecmd.py Tue Nov 27 03:46:06 2018 +0100 @@ -772,17 +772,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()