This is an archive of the discontinued Mercurial Phabricator instance.

Differential D461

morestatus: check whether the conflict message is None before printing
ClosedPublic

Authored by pulkit on Aug 21 2017, 7:14 AM.

Details

Reviewers
dsp
durin42
Group Reviewers
hg-reviewers
Commits
rHGe5d104c35e51: morestatus: check whether the conflict message is None before printing
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 21 2017, 7:14 AM
dsp accepted this revision.Aug 21 2017, 11:17 AM
durin42 accepted this revision.Aug 23 2017, 11:49 AM
This revision is now accepted and ready to land.Aug 23 2017, 11:49 AM
Closed by commit rHGe5d104c35e51: morestatus: check whether the conflict message is None before printing (authored by pulkit). · Explain WhyAug 23 2017, 11:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (3 lines)
Mtests/test-bisect.t (1 line)

Diff 1122

mercurial/cmdutil.py

statetuple = _getrepostate(repo) statetuple = _getrepostate(repo)
label = 'status.morestatus' label = 'status.morestatus'
if statetuple: if statetuple:
fm.startitem() fm.startitem()
state, statedetectionpredicate, helpfulmsg = statetuple state, statedetectionpredicate, helpfulmsg = statetuple
statemsg = _('The repository is in an unfinished *%s* state.') % state statemsg = _('The repository is in an unfinished *%s* state.') % state
fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label) fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label)
conmsg = _conflictsmsg(repo) conmsg = _conflictsmsg(repo)
if conmsg:
fm.write('conflictsmsg', '%s\n', conmsg, label=label) fm.write('conflictsmsg', '%s\n', conmsg, label=label)
if helpfulmsg: if helpfulmsg:
helpmsg = helpfulmsg() helpmsg = helpfulmsg()
fm.write('helpmsg', '%s\n', helpmsg, label=label) fm.write('helpmsg', '%s\n', helpmsg, label=label)
def findpossible(cmd, table, strict=False): def findpossible(cmd, table, strict=False):
""" """
Return cmd -> (aliases, command table entry) Return cmd -> (aliases, command table entry)
for each matching command. for each matching command.

tests/test-bisect.t

bisect test bisect test
$ hg bisect -r $ hg bisect -r
$ hg bisect -b $ hg bisect -b
$ hg status -v $ hg status -v
# The repository is in an unfinished *bisect* state. # The repository is in an unfinished *bisect* state.
None
# To mark the changeset good: hg bisect --good # To mark the changeset good: hg bisect --good
# To mark the changeset bad: hg bisect --bad # To mark the changeset bad: hg bisect --bad
# To abort: hg bisect --reset # To abort: hg bisect --reset
$ hg status -v --config commands.status.skipstates=bisect $ hg status -v --config commands.status.skipstates=bisect
$ hg summary $ hg summary
parent: 31:58c80a7c8a40 tip parent: 31:58c80a7c8a40 tip
msg 31 msg 31