Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 39004:5b04b6204931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Pulkit Goyal <pulkit@yandex-team.ru>
date Thu, 09 Aug 2018 13:13:09 +0300
parents cf68e2649e0a
children 3f0ef8d19413
comparison
equal deleted inserted replaced
39003:cf68e2649e0a 39004:5b04b6204931
611 warning = _('warning: this will discard uncommitted changes') 611 warning = _('warning: this will discard uncommitted changes')
612 return 'hg update --clean %s (%s)' % (dest or '.', warning) 612 return 'hg update --clean %s (%s)' % (dest or '.', warning)
613 613
614 def _graftmsg(): 614 def _graftmsg():
615 # tweakdefaults requires `update` to have a rev hence the `.` 615 # tweakdefaults requires `update` to have a rev hence the `.`
616 return _helpmessage('hg graft --continue', _updatecleanmsg()) 616 return _helpmessage('hg graft --continue', 'hg graft --abort')
617 617
618 def _mergemsg(): 618 def _mergemsg():
619 # tweakdefaults requires `update` to have a rev hence the `.` 619 # tweakdefaults requires `update` to have a rev hence the `.`
620 return _helpmessage('hg commit', 'hg merge --abort') 620 return _helpmessage('hg commit', 'hg merge --abort')
621 621