Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 38341:50f5fc232c16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
morestatus: remove some extra spaces The information about unfinished states in `hg status -v` had a lot of spaces which are not required and feels weird. Let's limit the spacing to four spaces. Differential Revision: https://phab.mercurial-scm.org/D3730
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 13 Jun 2018 22:50:32 +0530
parents 47f5454a30ed
children b8f45fc27370
comparison
equal deleted inserted replaced
38340:9abe91a503da 38341:50f5fc232c16
586 msg = _('No unresolved merge conflicts.') 586 msg = _('No unresolved merge conflicts.')
587 587
588 return _commentlines(msg) 588 return _commentlines(msg)
589 589
590 def _helpmessage(continuecmd, abortcmd): 590 def _helpmessage(continuecmd, abortcmd):
591 msg = _('To continue: %s\n' 591 msg = _('To continue: %s\n'
592 'To abort: %s') % (continuecmd, abortcmd) 592 'To abort: %s') % (continuecmd, abortcmd)
593 return _commentlines(msg) 593 return _commentlines(msg)
594 594
595 def _rebasemsg(): 595 def _rebasemsg():
596 return _helpmessage('hg rebase --continue', 'hg rebase --abort') 596 return _helpmessage('hg rebase --continue', 'hg rebase --abort')
597 597
601 def _unshelvemsg(): 601 def _unshelvemsg():
602 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort') 602 return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
603 603
604 def _updatecleanmsg(dest=None): 604 def _updatecleanmsg(dest=None):
605 warning = _('warning: this will discard uncommitted changes') 605 warning = _('warning: this will discard uncommitted changes')
606 return 'hg update --clean %s (%s)' % (dest or '.', warning) 606 return 'hg update --clean %s (%s)' % (dest or '.', warning)
607 607
608 def _graftmsg(): 608 def _graftmsg():
609 # tweakdefaults requires `update` to have a rev hence the `.` 609 # tweakdefaults requires `update` to have a rev hence the `.`
610 return _helpmessage('hg graft --continue', _updatecleanmsg()) 610 return _helpmessage('hg graft --continue', _updatecleanmsg())
611 611