# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1644594902 -10800
# Node ID 10ccdee05ec0a156abe94750c8f0fa3e0f22e813
# Parent  4ac6ca50bb2ec045d58a65d06bd170a94518f9df
pick: show abort message after pick is aborted for consistency

Other commands, like evolve, rebase and graft, show such a message after
they've already been aborted, and this is also an opportunity to use the common
"working directory is now at" message.

diff -r 4ac6ca50bb2e -r 10ccdee05ec0 hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Feb 11 18:20:13 2022 +0300
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Feb 11 18:55:02 2022 +0300
@@ -1430,10 +1430,11 @@
         raise error.Abort(_(b"no interrupted pick state exists"))
     pickstate.load()
     pctxnode = pickstate[b'oldpctx']
-    ui.status(_(b"aborting pick, updating to %s\n") %
-              node.short(pctxnode))
     compat.clean_update(repo[pctxnode])
     pickstate.delete()
+    ui.status(_(b'pick aborted\n'))
+    ui.status(_(b'working directory is now at %s\n')
+              % node.short(pctxnode))
     return 0
 
 def hgabortpick(ui, repo):
diff -r 4ac6ca50bb2e -r 10ccdee05ec0 tests/test-pick.t
--- a/tests/test-pick.t	Fri Feb 11 18:20:13 2022 +0300
+++ b/tests/test-pick.t	Fri Feb 11 18:55:02 2022 +0300
@@ -269,7 +269,8 @@
   pick in progress, will be aborted
 #endif
   $ hg abort
-  aborting pick, updating to c437988de89f
+  pick aborted
+  working directory is now at c437988de89f
 
   $ hg glog
   @  10:c437988de89f foo to b