view tests/mockblackbox.py @ 34552:33c8a6837181

merge: check for path conflicts when updating (issue5628)

When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.

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

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