# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1517164784 -19800
# Node ID 14cd04ff968ea8acf2ec7fb1b41e302d4a4a41d3
# Parent  4544067b831bb7f8e2d10a32f9060711a787ddea
evolve: show the updated working directory after `hg evolve --continue`

`hg evolve` shows a nice message about the new working directory when the evolve
ends but if the evolve is interrupted by conflicts and you continue the evolve
resolving the conflicts, that nice message is lost. Let's have that in case of
`--continue` too.

diff -r 4544067b831b -r 14cd04ff968e hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sun Jan 28 23:49:46 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Jan 29 00:09:44 2018 +0530
@@ -1147,6 +1147,7 @@
             evolvestate['replacements'][ctx.node()] = node
             category = evolvestate['category']
             confirm = evolvestate['confirm']
+            startnode = evolvestate['startnode']
             unfi = repo.unfiltered()
             for rev in evolvestate['revs']:
                 # XXX: prevent this lookup by storing nodes instead of revnums
@@ -1156,6 +1157,8 @@
                                         confirm, progresscb, category)
                     if newnode[0]:
                         evolvestate['replacements'][curctx.node()] = newnode[1]
+
+            _cleanup(ui, repo, unfi[startnode], True)
             evolvestate.delete()
             return
 
@@ -1173,7 +1176,7 @@
         revs = _orderrevs(repo, revs)
 
     stateopts = {'category': targetcat, 'replacements': {}, 'revs': revs,
-                 'confirm': confirmopt}
+                 'confirm': confirmopt, 'startnode': startnode.node()}
     evolvestate.addopts(stateopts)
     for rev in revs:
         curctx = repo[rev]
diff -r 4544067b831b -r 14cd04ff968e tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-evolve-continue.t	Mon Jan 29 00:09:44 2018 +0530
@@ -70,6 +70,7 @@
 
   $ hg evolve --continue
   evolving 4:c41c793e0ef1 "added d"
+  working directory is now at 2a4e03d422e2
 
   $ hg glog
   @  6:2a4e03d422e2 added d
@@ -172,6 +173,7 @@
   atop:[10] added b
   move:[8] added d
   atop:[11] added c
+  working directory is now at 6642d2c9176e
 
   $ hg glog
   @  12:6642d2c9176e added d
@@ -272,6 +274,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 15:09becba8f97d "added h"
+  working directory is now at 3ba9d3d1b089
 
 Make sure, confirmopt is respected while continue
 
@@ -327,6 +330,7 @@
   move:[20] added h
   atop:[22] added g
   perform evolve? [Ny] y
+  working directory is now at af6bd002a48d
 
   $ hg glog
   @  23:af6bd002a48d added h
diff -r 4544067b831b -r 14cd04ff968e tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-evolve-phase.t	Mon Jan 29 00:09:44 2018 +0530
@@ -118,6 +118,7 @@
   continue: hg evolve --continue
   $ hg evolve -c
   evolving 2:13833940840c "c"
+  working directory is now at 3d2080c198e5
 
   $ hg glog
   @  4 - 3d2080c198e5 c (secret)
diff -r 4544067b831b -r 14cd04ff968e tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-issue-5720.t	Mon Jan 29 00:09:44 2018 +0530
@@ -75,6 +75,7 @@
 Continue the evolution
   $ hg evolve --continue
   evolving 2:13833940840c "c"
+  working directory is now at 3d2080c198e5
 
 Tip should stay in secret phase
   $ hg log -G -T "{rev}: {phase}"
diff -r 4544067b831b -r 14cd04ff968e tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Mon Jan 29 00:09:44 2018 +0530
@@ -170,6 +170,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:71c18f70c34f "babar count up to fifteen"
+  working directory is now at 1836b91c6c1d
   $ hg resolve -l
   $ hg log -G
   @  changeset:   6:1836b91c6c1d
diff -r 4544067b831b -r 14cd04ff968e tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-stabilize-result.t	Mon Jan 29 00:09:44 2018 +0530
@@ -101,6 +101,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:3655f0f50885 "newer a"
+  working directory is now at 1cf0aacfd363
 
 Stabilize latecomer with different parent
 =========================================