Show More
@@ -1,26 +1,26 b'' | |||
|
1 | 1 | # Extension to write out fake unsupported records into the merge state |
|
2 | 2 | # |
|
3 | 3 | # |
|
4 | 4 | |
|
5 | 5 | from __future__ import absolute_import |
|
6 | 6 | |
|
7 | 7 | from mercurial import ( |
|
8 | 8 | merge, |
|
9 | 9 | registrar, |
|
10 | 10 | ) |
|
11 | 11 | |
|
12 | 12 | cmdtable = {} |
|
13 | 13 | command = registrar.command(cmdtable) |
|
14 | 14 | |
|
15 | @command('fakemergerecord', | |
|
16 | [('X', 'mandatory', None, 'add a fake mandatory record'), | |
|
17 | ('x', 'advisory', None, 'add a fake advisory record')], '') | |
|
15 | @command(b'fakemergerecord', | |
|
16 | [(b'X', b'mandatory', None, b'add a fake mandatory record'), | |
|
17 | (b'x', b'advisory', None, b'add a fake advisory record')], '') | |
|
18 | 18 | def fakemergerecord(ui, repo, *pats, **opts): |
|
19 | 19 | with repo.wlock(): |
|
20 | 20 | ms = merge.mergestate.read(repo) |
|
21 | 21 | records = ms._makerecords() |
|
22 | 22 | if opts.get('mandatory'): |
|
23 | records.append(('X', 'mandatory record')) | |
|
23 | records.append((b'X', b'mandatory record')) | |
|
24 | 24 | if opts.get('advisory'): |
|
25 | records.append(('x', 'advisory record')) | |
|
25 | records.append((b'x', b'advisory record')) | |
|
26 | 26 | ms._writerecords(records) |
General Comments 0
You need to be logged in to leave comments.
Login now