view tests/mockblackbox.py @ 42804:7b80ad5af239

merge: hint about using `hg resolve` for resolving conflicts

This was suggested by one of our users at Google. Makes sense to me.

Differential Revision: https://phab.mercurial-scm.org/D6755

from __future__ import absolute_import
from mercurial.utils import (
    procutil,
)

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

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