Mercurial > evolve
changeset 6128:10ccdee05ec0
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.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 11 Feb 2022 18:55:02 +0300 |
| parents | 4ac6ca50bb2e |
| children | d3b77e5ee04e |
| files | hgext3rd/evolve/cmdrewrite.py tests/test-pick.t |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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