# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1517067927 -19800
# Node ID 05bd493d496d1a279ca81176bdd209b651b41fc4
# Parent  ece5cd58147d660ddaac67f7ef0bdef031147772
evolve: add evolve info to cmdutil.afterresolvedstates

Adding evolve info to cmdutil.afterresolvedstate will improve the ui when we run
into merge conflicts while evolving. Once we resolve all the conflicts using `hg
resolve`, this will show a message saying "continue: hg evolve --continue".
Other extensions like rebase and shelve also use it and it's very helpful.

diff -r ece5cd58147d -r 05bd493d496d hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Fri Jan 19 19:32:34 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Sat Jan 27 21:15:27 2018 +0530
@@ -1346,6 +1346,9 @@
             _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
     cmdutil.unfinishedstates.append(data)
 
+    afterresolved = ('evolvestate', _('hg evolve --continue'))
+    cmdutil.afterresolvedstates.append(afterresolved)
+
 @eh.wrapfunction(hg, 'clean')
 def clean(orig, repo, *args, **kwargs):
     ret = orig(repo, *args, **kwargs)
diff -r ece5cd58147d -r 05bd493d496d tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Fri Jan 19 19:32:34 2018 +0530
+++ b/tests/test-evolve-phase.t	Sat Jan 27 21:15:27 2018 +0530
@@ -115,6 +115,7 @@
   $ echo c2 > a
   $ hg resolve -m
   (no more unresolved files)
+  continue: hg evolve --continue
   $ hg evolve -c
   evolving 2:13833940840c "c"
 
diff -r ece5cd58147d -r 05bd493d496d tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Fri Jan 19 19:32:34 2018 +0530
+++ b/tests/test-issue-5720.t	Sat Jan 27 21:15:27 2018 +0530
@@ -70,6 +70,7 @@
   $ echo c2 > a
   $ hg resolve -m
   (no more unresolved files)
+  continue: hg evolve --continue
 
 Continue the evolution
   $ hg evolve --continue
diff -r ece5cd58147d -r 05bd493d496d tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Jan 19 19:32:34 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Sat Jan 27 21:15:27 2018 +0530
@@ -167,6 +167,7 @@
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m
   (no more unresolved files)
+  continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
diff -r ece5cd58147d -r 05bd493d496d tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Fri Jan 19 19:32:34 2018 +0530
+++ b/tests/test-stabilize-result.t	Sat Jan 27 21:15:27 2018 +0530
@@ -98,6 +98,7 @@
   [255]
   $ hg resolve -m a
   (no more unresolved files)
+  continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:3655f0f50885 "newer a"