Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 33902:e5d104c35e51
morestatus: check whether the conflict message is None before printing
There are cases like bisect when the conflict message can be None. So we make
sure that we don't print None in that case.
Thanks to Martin for catching this.
Differential Revision: https://phab.mercurial-scm.org/D461
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 21 Aug 2017 16:43:37 +0530 |
| parents | 6f6c87888b22 |
| children | 3340efe80803 |
comparison
equal
deleted
inserted
replaced
| 33901:8d75b9effa07 | 33902:e5d104c35e51 |
|---|---|
| 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): |