1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
# Copyright (C) 2004, 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from bzrlib.selftest import InTempDir, TestBase
from bzrlib.merge3 import Merge3
class NoChanges(TestBase):
"""No conflicts because nothing changed"""
def runTest(self):
m3 = Merge3(['aaa', 'bbb'],
['aaa', 'bbb'],
['aaa', 'bbb'])
self.assertEquals(m3.find_unconflicted(),
[(0, 2)])
self.assertEquals(list(m3.find_sync_regions()),
[(0, 2,
0, 2,
0, 2),
(2,2, 2,2, 2,2)])
self.assertEquals(list(m3.merge_regions()),
[('unchanged', 0, 2)])
class FrontInsert(TestBase):
def runTest(self):
m3 = Merge3(['zz'],
['aaa', 'bbb', 'zz'],
['zz'])
# todo: should use a sentinal at end as from get_matching_blocks
# to match without zz
self.assertEquals(list(m3.find_sync_regions()),
[(0,1, 2,3, 0,1),
(1,1, 3,3, 1,1),])
self.assertEquals(list(m3.merge_regions()),
[('a', 0, 2),
('unchanged', 0, 1)])
class NullInsert(TestBase):
def runTest(self):
m3 = Merge3([],
['aaa', 'bbb'],
[])
# todo: should use a sentinal at end as from get_matching_blocks
# to match without zz
self.assertEquals(list(m3.find_sync_regions()),
[(0,0, 2,2, 0,0)])
self.assertEquals(list(m3.merge_regions()),
[('a', 0, 2)])
class NoConflicts(TestBase):
"""No conflicts because only one side changed"""
def runTest(self):
m3 = Merge3(['aaa', 'bbb'],
['aaa', '111', 'bbb'],
['aaa', 'bbb'])
self.assertEquals(m3.find_unconflicted(),
[(0, 1), (1, 2)])
self.assertEquals(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(1,2, 2,3, 1,2),
(2,2, 3,3, 2,2),])
class InsertClash(TestBase):
"""Both try to insert lines in the same place."""
def runTest(self):
m3 = Merge3(['aaa', 'bbb'],
['aaa', '111', 'bbb'],
['aaa', '222', 'bbb'])
self.assertEquals(m3.find_unconflicted(),
[(0, 1), (1, 2)])
self.assertEquals(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(1,2, 2,3, 2,3),
(2,2, 3,3, 3,3),])
class ReplaceClash(TestBase):
"""Both try to insert lines in the same place."""
def runTest(self):
m3 = Merge3(['aaa', '000', 'bbb'],
['aaa', '111', 'bbb'],
['aaa', '222', 'bbb'])
self.assertEquals(m3.find_unconflicted(),
[(0, 1), (2, 3)])
self.assertEquals(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(2,3, 2,3, 2,3),
(3,3, 3,3, 3,3),])
class ReplaceMulti(TestBase):
"""Replacement with regions of different size."""
def runTest(self):
m3 = Merge3(['aaa', '000', '000', 'bbb'],
['aaa', '111', '111', '111', 'bbb'],
['aaa', '222', '222', '222', '222', 'bbb'])
self.assertEquals(m3.find_unconflicted(),
[(0, 1), (3, 4)])
self.assertEquals(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(3,4, 4,5, 5,6),
(4,4, 5,5, 6,6),])
|