##// END OF EJS Templates
rebase: adds storing collapse message (issue4792)...
rebase: adds storing collapse message (issue4792) Before this patch collapse message wasn't stored so when you ran into the merge conflict while rebasing, running rebase --continue didn't remember the message and always opened editor to fill commit message. This patch adds saving collapse message in .hg/last-message.txt and restoring it later when needed.

File last commit:

r28028:ac49ecb2 default
r28185:c7e89486 default
Show More
mockblackbox.py
14 lines | 284 B | text/x-python | PythonLexer
Gregory Szorc
tests: move mock blackbox extension into own file...
r24705 from mercurial import util
def makedate():
return 0, 0
def getuser():
return 'bob'
timeless
tests: mock getpid to reduce glob usage...
r28028 def getpid():
return 5000
Gregory Szorc
tests: move mock blackbox extension into own file...
r24705
# mock the date and user apis so the output is always the same
def uisetup(ui):
util.makedate = makedate
util.getuser = getuser
timeless
tests: mock getpid to reduce glob usage...
r28028 util.getpid = getpid