##// END OF EJS Templates
tests: stablize test-serve.t on Windows...
tests: stablize test-serve.t on Windows I forget the reason that the subprocess on Windows doesn't print this, but all other instances of this are similarly conditionalized, so I didn't think too hard about it. Also, the server needs to be killed so it doesn't prevent the next run from working, especially since the port isn't randomized. Differential Revision: https://phab.mercurial-scm.org/D8720

File last commit:

r45376:2870f5d5 default
r45613:8c06f479 default
Show More
fakemergerecord.py
32 lines | 802 B | text/x-python | PythonLexer
# Extension to write out fake unsupported records into the merge state
#
#
from __future__ import absolute_import
from mercurial import (
mergestate as mergestatemod,
registrar,
)
cmdtable = {}
command = registrar.command(cmdtable)
@command(
b'fakemergerecord',
[
(b'X', b'mandatory', None, b'add a fake mandatory record'),
(b'x', b'advisory', None, b'add a fake advisory record'),
],
'',
)
def fakemergerecord(ui, repo, *pats, **opts):
with repo.wlock():
ms = mergestatemod.mergestate.read(repo)
records = ms._makerecords()
if opts.get('mandatory'):
records.append((b'X', b'mandatory record'))
if opts.get('advisory'):
records.append((b'x', b'advisory record'))
ms._writerecords(records)