Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Sep 15 21:28:47 2018 +0900 +++ b/mercurial/cmdutil.py Sat Sep 15 21:35:36 2018 +0900 @@ -654,16 +654,15 @@ statetuple = _getrepostate(repo) label = 'status.morestatus' if statetuple: - fm.startitem() state, statedetectionpredicate, helpfulmsg = statetuple statemsg = _('The repository is in an unfinished *%s* state.') % state - fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) + fm.plain('%s\n' % _commentlines(statemsg), label=label) conmsg = _conflictsmsg(repo) if conmsg: - fm.write('conflictsmsg', '%s\n', conmsg, label=label) + fm.plain('%s\n' % conmsg, label=label) if helpfulmsg: helpmsg = helpfulmsg() - fm.write('helpmsg', '%s\n', helpmsg, label=label) + fm.plain('%s\n' % helpmsg, label=label) def findpossible(cmd, table, strict=False): """