mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
28aeffe8d0
The merge state is supposed to be covered by the wlock. We fix the test extensions to comply to that.
27 lines
737 B
Python
27 lines
737 B
Python
# Extension to write out fake unsupported records into the merge state
|
|
#
|
|
#
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from mercurial import (
|
|
cmdutil,
|
|
merge,
|
|
)
|
|
|
|
cmdtable = {}
|
|
command = cmdutil.command(cmdtable)
|
|
|
|
@command('fakemergerecord',
|
|
[('X', 'mandatory', None, 'add a fake mandatory record'),
|
|
('x', 'advisory', None, 'add a fake advisory record')], '')
|
|
def fakemergerecord(ui, repo, *pats, **opts):
|
|
with repo.wlock():
|
|
ms = merge.mergestate.read(repo)
|
|
records = ms._makerecords()
|
|
if opts.get('mandatory'):
|
|
records.append(('X', 'mandatory record'))
|
|
if opts.get('advisory'):
|
|
records.append(('x', 'advisory record'))
|
|
ms._writerecords(records)
|