Show More
@@ -34,10 +34,8 b' def setupwrapcolorwrite(ui):' | |||||
34 | setattr(ui, 'write', wrap) |
|
34 | setattr(ui, 'write', wrap) | |
35 | return oldwrite |
|
35 | return oldwrite | |
36 |
|
36 | |||
37 |
def |
|
37 | def filterchunks(ui, originalhunks, usecurses, testfile): | |
38 | usecurses = ui.configbool('experimental', 'crecord', False) |
|
|||
39 | if usecurses: |
|
38 | if usecurses: | |
40 | testfile = ui.config('experimental', 'crecordtest', None) |
|
|||
41 | if testfile: |
|
39 | if testfile: | |
42 | recordfn = crecordmod.testdecorator(testfile, |
|
40 | recordfn = crecordmod.testdecorator(testfile, | |
43 | crecordmod.testchunkselector) |
|
41 | crecordmod.testchunkselector) | |
@@ -49,6 +47,12 b' def recordfilter(ui, originalhunks):' | |||||
49 | else: |
|
47 | else: | |
50 | return patch.filterpatch(ui, originalhunks) |
|
48 | return patch.filterpatch(ui, originalhunks) | |
51 |
|
49 | |||
|
50 | def recordfilter(ui, originalhunks): | |||
|
51 | usecurses = ui.configbool('experimental', 'crecord', False) | |||
|
52 | testfile = ui.config('experimental', 'crecordtest', None) | |||
|
53 | newchunks = filterchunks(ui, originalhunks, usecurses, testfile) | |||
|
54 | return newchunks | |||
|
55 | ||||
52 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, |
|
56 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, | |
53 | filterfn, *pats, **opts): |
|
57 | filterfn, *pats, **opts): | |
54 | import merge as mergemod |
|
58 | import merge as mergemod |
General Comments 0
You need to be logged in to leave comments.
Login now