20 error, |
20 error, |
21 simplemerge, |
21 simplemerge, |
22 util, |
22 util, |
23 ) |
23 ) |
24 |
24 |
|
25 from mercurial.utils import ( |
|
26 stringutil, |
|
27 ) |
|
28 |
25 TestCase = unittest.TestCase |
29 TestCase = unittest.TestCase |
26 # bzr compatible interface, for the tests |
30 # bzr compatible interface, for the tests |
27 class Merge3(simplemerge.Merge3Text): |
31 class Merge3(simplemerge.Merge3Text): |
28 """3-way merge of texts. |
32 """3-way merge of texts. |
29 |
33 |
32 All three will typically be sequences of lines.""" |
36 All three will typically be sequences of lines.""" |
33 def __init__(self, base, a, b): |
37 def __init__(self, base, a, b): |
34 basetext = '\n'.join([i.strip('\n') for i in base] + ['']) |
38 basetext = '\n'.join([i.strip('\n') for i in base] + ['']) |
35 atext = '\n'.join([i.strip('\n') for i in a] + ['']) |
39 atext = '\n'.join([i.strip('\n') for i in a] + ['']) |
36 btext = '\n'.join([i.strip('\n') for i in b] + ['']) |
40 btext = '\n'.join([i.strip('\n') for i in b] + ['']) |
37 if util.binary(basetext) or util.binary(atext) or util.binary(btext): |
41 if (stringutil.binary(basetext) or stringutil.binary(atext) |
|
42 or stringutil.binary(btext)): |
38 raise error.Abort("don't know how to merge binary files") |
43 raise error.Abort("don't know how to merge binary files") |
39 simplemerge.Merge3Text.__init__(self, basetext, atext, btext, |
44 simplemerge.Merge3Text.__init__(self, basetext, atext, btext, |
40 base, a, b) |
45 base, a, b) |
41 |
46 |
42 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase |
47 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase |