14 import changelog |
14 import changelog |
15 import bookmarks |
15 import bookmarks |
16 import encoding |
16 import encoding |
17 import crecord as crecordmod |
17 import crecord as crecordmod |
18 import lock as lockmod |
18 import lock as lockmod |
|
19 import crecord as crecordmod |
19 |
20 |
20 def parsealiases(cmd): |
21 def parsealiases(cmd): |
21 return cmd.lstrip("^").split("|") |
22 return cmd.lstrip("^").split("|") |
22 |
23 |
23 def recordfilter(ui, originalhunks): |
24 def recordfilter(ui, originalhunks): |
24 return patch.filterpatch(ui, originalhunks) |
25 usecurses = ui.configbool('experimental', 'crecord', False) |
|
26 if usecurses: |
|
27 testfile = ui.config('experimental', 'crecordtest', None) |
|
28 if testfile: |
|
29 recordfn = crecordmod.testdecorator(testfile, |
|
30 crecordmod.testchunkselector) |
|
31 else: |
|
32 recordfn = crecordmod.chunkselector |
|
33 |
|
34 return crecordmod.filterpatch(ui, originalhunks, recordfn) |
|
35 |
|
36 else: |
|
37 return patch.filterpatch(ui, originalhunks) |
25 |
38 |
26 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, |
39 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, |
27 filterfn, *pats, **opts): |
40 filterfn, *pats, **opts): |
28 import merge as mergemod |
41 import merge as mergemod |
29 if not ui.interactive(): |
42 if not ui.interactive(): |