Mercurial > hg
changeset 39737: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 | e7ae31199ff9 |
| children | a93fe297dfb3 |
| files | mercurial/cmdutil.py tests/test-conflict.t |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
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): """
--- a/tests/test-conflict.t Sat Sep 15 21:28:47 2018 +0900 +++ b/tests/test-conflict.t Sat Sep 15 21:35:36 2018 +0900 @@ -69,11 +69,6 @@ { "path": "a.orig", "status": "?" - }, - { - "conflictsmsg": "# Unresolved merge conflicts:\n# \n# a\n# \n# To mark files as resolved: hg resolve --mark FILE\n", - "helpmsg": "# To continue: hg commit\n# To abort: hg merge --abort\n", - "statemsg": "# The repository is in an unfinished *merge* state.\n" } ]