##// END OF EJS Templates
templater: rename variable "i" to "v" in runmap()...
templater: rename variable "i" to "v" in runmap() I want to reuse "i" for index.

File last commit:

r29754:b303b381 default
r31806:8f203b49 default
Show More
fakemergerecord.py
26 lines | 737 B | text/x-python | PythonLexer
# 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)