Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 39753:fd805a44b89d
status: remove "morestatus" message from formatter data (BC)
They are just printable messages, not data that should be fed to JSON or
templater.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 15 Sep 2018 21:35:36 +0900 |
parents | 1cbe19eb496d |
children | 24e493ec2229 |
comparison
equal
deleted
inserted
replaced
39752:e7ae31199ff9 | 39753:fd805a44b89d |
---|---|
652 | 652 |
653 def morestatus(repo, fm): | 653 def morestatus(repo, fm): |
654 statetuple = _getrepostate(repo) | 654 statetuple = _getrepostate(repo) |
655 label = 'status.morestatus' | 655 label = 'status.morestatus' |
656 if statetuple: | 656 if statetuple: |
657 fm.startitem() | |
658 state, statedetectionpredicate, helpfulmsg = statetuple | 657 state, statedetectionpredicate, helpfulmsg = statetuple |
659 statemsg = _('The repository is in an unfinished *%s* state.') % state | 658 statemsg = _('The repository is in an unfinished *%s* state.') % state |
660 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) | 659 fm.plain('%s\n' % _commentlines(statemsg), label=label) |
661 conmsg = _conflictsmsg(repo) | 660 conmsg = _conflictsmsg(repo) |
662 if conmsg: | 661 if conmsg: |
663 fm.write('conflictsmsg', '%s\n', conmsg, label=label) | 662 fm.plain('%s\n' % conmsg, label=label) |
664 if helpfulmsg: | 663 if helpfulmsg: |
665 helpmsg = helpfulmsg() | 664 helpmsg = helpfulmsg() |
666 fm.write('helpmsg', '%s\n', helpmsg, label=label) | 665 fm.plain('%s\n' % helpmsg, label=label) |
667 | 666 |
668 def findpossible(cmd, table, strict=False): | 667 def findpossible(cmd, table, strict=False): |
669 """ | 668 """ |
670 Return cmd -> (aliases, command table entry) | 669 Return cmd -> (aliases, command table entry) |
671 for each matching command. | 670 for each matching command. |