Show More
@@ -654,16 +654,15 b' 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. |
|
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. |
|
662 | fm.plain('%s\n' % conmsg, label=label) | |
664 | if helpfulmsg: |
|
663 | if helpfulmsg: | |
665 | helpmsg = helpfulmsg() |
|
664 | helpmsg = helpfulmsg() | |
666 |
fm. |
|
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 | """ |
@@ -69,11 +69,6 b'' | |||||
69 | { |
|
69 | { | |
70 | "path": "a.orig", |
|
70 | "path": "a.orig", | |
71 | "status": "?" |
|
71 | "status": "?" | |
72 | }, |
|
|||
73 | { |
|
|||
74 | "conflictsmsg": "# Unresolved merge conflicts:\n# \n# a\n# \n# To mark files as resolved: hg resolve --mark FILE\n", |
|
|||
75 | "helpmsg": "# To continue: hg commit\n# To abort: hg merge --abort\n", |
|
|||
76 | "statemsg": "# The repository is in an unfinished *merge* state.\n" |
|
|||
77 | } |
|
72 | } | |
78 | ] |
|
73 | ] | |
79 |
|
74 |
General Comments 0
You need to be logged in to leave comments.
Login now