671 fm.startitem() |
671 fm.startitem() |
672 state, statedetectionpredicate, helpfulmsg = statetuple |
672 state, statedetectionpredicate, helpfulmsg = statetuple |
673 statemsg = _('The repository is in an unfinished *%s* state.') % state |
673 statemsg = _('The repository is in an unfinished *%s* state.') % state |
674 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) |
674 fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) |
675 conmsg = _conflictsmsg(repo) |
675 conmsg = _conflictsmsg(repo) |
676 fm.write('conflictsmsg', '%s\n', conmsg, label=label) |
676 if conmsg: |
|
677 fm.write('conflictsmsg', '%s\n', conmsg, label=label) |
677 if helpfulmsg: |
678 if helpfulmsg: |
678 helpmsg = helpfulmsg() |
679 helpmsg = helpfulmsg() |
679 fm.write('helpmsg', '%s\n', helpmsg, label=label) |
680 fm.write('helpmsg', '%s\n', helpmsg, label=label) |
680 |
681 |
681 def findpossible(cmd, table, strict=False): |
682 def findpossible(cmd, table, strict=False): |