# HG changeset patch # User Pulkit Goyal # Date 1533809589 -10800 # Node ID 5b04b620493197503c020740ef48c93c49b26b69 # Parent cf68e2649e0ae0fce4bdb091a202d580a96a8233 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 diff -r cf68e2649e0a -r 5b04b6204931 mercurial/cmdutil.py --- 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 `.` diff -r cf68e2649e0a -r 5b04b6204931 tests/test-graft.t --- 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: