equal
deleted
inserted
replaced
3 # |
3 # |
4 |
4 |
5 from __future__ import absolute_import |
5 from __future__ import absolute_import |
6 |
6 |
7 from mercurial import ( |
7 from mercurial import ( |
8 merge, |
8 mergestate as mergestatemod, |
9 registrar, |
9 registrar, |
10 ) |
10 ) |
11 |
11 |
12 cmdtable = {} |
12 cmdtable = {} |
13 command = registrar.command(cmdtable) |
13 command = registrar.command(cmdtable) |
21 ], |
21 ], |
22 '', |
22 '', |
23 ) |
23 ) |
24 def fakemergerecord(ui, repo, *pats, **opts): |
24 def fakemergerecord(ui, repo, *pats, **opts): |
25 with repo.wlock(): |
25 with repo.wlock(): |
26 ms = merge.mergestate.read(repo) |
26 ms = mergestatemod.mergestate.read(repo) |
27 records = ms._makerecords() |
27 records = ms._makerecords() |
28 if opts.get('mandatory'): |
28 if opts.get('mandatory'): |
29 records.append((b'X', b'mandatory record')) |
29 records.append((b'X', b'mandatory record')) |
30 if opts.get('advisory'): |
30 if opts.get('advisory'): |
31 records.append((b'x', b'advisory record')) |
31 records.append((b'x', b'advisory record')) |