Mercurial > evolve

changeset 4592:e489c10add37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use consistent message and just re-raise InterventionRequired
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Apr 2019 10:52:16 -0700
parents 9242b05eb593
children f6b9c409c12e
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 10:47:12 2019 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Apr 19 10:52:16 2019 -0700
@@ -184,8 +184,7 @@
             ops = {'current': orig.node()}
             evolvestate.addopts(ops)
             evolvestate.save()
-            raise error.InterventionRequired(_("fix conflicts and see `hg help "
-                                               "evolve.interrupted`"))
+            raise
 
 def _solvephasedivergence(ui, repo, bumped, evolvestate, displayer,
                           dryrun=False, confirm=False, progresscb=None):
@@ -253,8 +252,7 @@
             evolvestate['current'] = bumped.hex()
             evolvestate['precursor'] = prec.hex()
             evolvestate.save()
-            raise error.InterventionRequired(_("fix conflicts and see `hg help "
-                                               "evolve.interrupted`"))
+            raise
 
     return _resolvephasedivergent(ui, repo, prec, bumped)
 
@@ -517,8 +515,7 @@
         except error.InterventionRequired:
             evolvestate['current'] = other.node()
             evolvestate.save()
-            raise error.InterventionRequired(_("fix conflicts and see `hg help "
-                                               "evolve.interrupted`"))
+            raise
         evolvestate['old-other'] = other.node()
         other = repo[newother]
         evolvestate['relocating'] = False
@@ -988,8 +985,8 @@
                                    orig.p1().rev())
             dirstatedance(repo, dest, orig.node(), None)
             tr.close() # to keep changes in this transaction (e.g. dirstate)
-        raise error.InterventionRequired(_('unresolved merge conflicts '
-                                           '(see hg help resolve)'))
+        raise error.InterventionRequired(_("fix conflicts and see `hg help "
+                                           "evolve.interrupted`"))
     nodenew = _relocatecommit(repo, orig, commitmsg)
     _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate)
     return nodenew