Mercurial > hg
view tests/mockblackbox.py @ 40790:f07d4f94f098 stable
rebase: preserve working copy when redoing in-mem rebase on disk
When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.
Differential Revision: https://phab.mercurial-scm.org/D5356
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 30 Nov 2018 16:21:37 -0800 |
parents | a8a902d7176e |
children | 2372284d9457 |
line wrap: on
line source
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