view tests/mockblackbox.py @ 33883: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

from __future__ import absolute_import
from mercurial import (
    util,
)

# XXX: we should probably offer a devel option to do this in blackbox directly
def getuser():
    return 'bob'
def getpid():
    return 5000

# mock the date and user apis so the output is always the same
def uisetup(ui):
    util.getuser = getuser
    util.getpid = getpid