##// END OF EJS Templates
tests: port fakemergerecord to python3...
Augie Fackler -
r36191:8173eeb6 default
parent child Browse files
Show More
@@ -12,15 +12,15 b' from mercurial import ('
12 cmdtable = {}
12 cmdtable = {}
13 command = registrar.command(cmdtable)
13 command = registrar.command(cmdtable)
14
14
15 @command('fakemergerecord',
15 @command(b'fakemergerecord',
16 [('X', 'mandatory', None, 'add a fake mandatory record'),
16 [(b'X', b'mandatory', None, b'add a fake mandatory record'),
17 ('x', 'advisory', None, 'add a fake advisory record')], '')
17 (b'x', b'advisory', None, b'add a fake advisory record')], '')
18 def fakemergerecord(ui, repo, *pats, **opts):
18 def fakemergerecord(ui, repo, *pats, **opts):
19 with repo.wlock():
19 with repo.wlock():
20 ms = merge.mergestate.read(repo)
20 ms = merge.mergestate.read(repo)
21 records = ms._makerecords()
21 records = ms._makerecords()
22 if opts.get('mandatory'):
22 if opts.get('mandatory'):
23 records.append(('X', 'mandatory record'))
23 records.append((b'X', b'mandatory record'))
24 if opts.get('advisory'):
24 if opts.get('advisory'):
25 records.append(('x', 'advisory record'))
25 records.append((b'x', b'advisory record'))
26 ms._writerecords(records)
26 ms._writerecords(records)
General Comments 0
You need to be logged in to leave comments. Login now