status: advertise --abort instead of 'update -C .' to abort graft
Recent release got us a --abort flag for 'hg graft' command which is nice UI and
we should advertise that to stop the graft instead of 'update -C .' which is
kind of ugly.
Differential Revision: https://phab.mercurial-scm.org/D4169
--- a/mercurial/cmdutil.py Thu Aug 09 12:32:11 2018 +0300
+++ b/mercurial/cmdutil.py Thu Aug 09 13:13:09 2018 +0300
@@ -613,7 +613,7 @@
def _graftmsg():
# tweakdefaults requires `update` to have a rev hence the `.`
- return _helpmessage('hg graft --continue', _updatecleanmsg())
+ return _helpmessage('hg graft --continue', 'hg graft --abort')
def _mergemsg():
# tweakdefaults requires `update` to have a rev hence the `.`
--- a/tests/test-graft.t Thu Aug 09 12:32:11 2018 +0300
+++ b/tests/test-graft.t Thu Aug 09 13:13:09 2018 +0300
@@ -237,7 +237,7 @@
# To mark files as resolved: hg resolve --mark FILE
# To continue: hg graft --continue
- # To abort: hg update --clean . (warning: this will discard uncommitted changes)
+ # To abort: hg graft --abort
Commit while interrupted should fail: