← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/interversionedfile_implementations/test_join.py

Merge bzr.dev and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/interversionedfile_implementations/test_join.py
18
18
 
19
19
 
20
20
import bzrlib.errors as errors
 
21
from bzrlib.symbol_versioning import one_five
21
22
from bzrlib.tests import TestCaseWithTransport
22
23
from bzrlib.transport import get_transport
23
24
import bzrlib.versionedfile as versionedfile
44
45
        f1.add_lines('r0', [], ['a\n', 'b\n'])
45
46
        f1.add_lines('r1', ['r0'], ['c\n', 'b\n'])
46
47
        f2 = self.get_target()
47
 
        f2.join(f1, None)
 
48
        self.applyDeprecated(one_five, f2.join, f1, None)
48
49
        def verify_file(f):
49
50
            self.assertTrue(f.has_version('r0'))
50
51
            self.assertTrue(f.has_version('r1'))
52
53
        verify_file(self.get_target())
53
54
 
54
55
        self.assertRaises(errors.RevisionNotPresent,
55
 
            f2.join, f1, version_ids=['r3'])
 
56
            self.applyDeprecated, one_five, f2.join, f1, version_ids=['r3'])
56
57
 
57
58
    def test_gets_expected_inter_worker(self):
58
59
        source = self.get_source()
72
73
        source.add_lines('ancestorright', ['base'], [])
73
74
        source.add_lines('namedleft', ['ancestorleft'], [])
74
75
        source.add_lines('namedright', ['ancestorright'], [])
75
 
        target.join(source, version_ids=['namedleft', 'namedright'])
 
76
        self.applyDeprecated(one_five, target.join, source,
 
77
            version_ids=['namedleft', 'namedright'])
76
78
        self.assertFalse(target.has_version('sibling'))
77
79
        self.assertTrue(target.has_version('ancestorleft'))
78
80
        self.assertTrue(target.has_version('ancestorright'))
88
90
        w1.add_lines('v-3', ['v-1'], ['line 1\n'])
89
91
        w2.add_lines('v-3', ['v-2'], ['line 1\n'])
90
92
        try:
91
 
            w1.join(w2)
 
93
            self.applyDeprecated(one_five, w1.join, w2)
92
94
        except errors.WeaveParentMismatch:
93
95
            # Acceptable behaviour:
94
96
            return
115
117
        """Reweave adding empty weave"""
116
118
        wb = self.get_target()
117
119
        w1 = self.build_weave1()
118
 
        w1.join(wb)
 
120
        self.applyDeprecated(one_five, w1.join, wb)
119
121
        self.verify_weave1(w1)
120
122
 
121
123
    def verify_weave1(self, w1):
136
138
        t = self.get_target()
137
139
        t.add_lines('base', [], [])
138
140
        t.add_lines('text', ['base'], [])
139
 
        t.join(s)
 
141
        self.applyDeprecated(one_five, t.join, s)
140
142
        self.assertEqual({'text':('base',)}, t.get_parent_map(['text']))
141
143
 
142
144
    def test_join_with_ghosts(self):
159
161
        wb.add_lines('v1', [], ['hello\n'])
160
162
        wb.add_lines('v2', ['v1', 'x1'], ['hello\n', 'world\n'])
161
163
        try:
162
 
            w1.join(wb)
 
164
            self.applyDeprecated(one_five, w1.join, wb)
163
165
        except errors.WeaveParentMismatch:
164
166
            # Acceptable behaviour:
165
167
            return
176
178
        wb.add_lines('x1', [], ['line from x1\n'])
177
179
        wb.add_lines('v1', [], ['hello\n'])
178
180
        wb.add_lines('v2', ['v1', 'x1'], ['hello\n', 'world\n'])
179
 
        w1.join(wb, version_ids=['x1', 'z1'], ignore_missing=True)
 
181
        self.applyDeprecated(one_five, w1.join, wb, version_ids=['x1', 'z1'],
 
182
            ignore_missing=True)
180
183
        eq = self.assertEquals
181
184
        eq(sorted(w1.versions()), ['v1', 'v2', 'v3', 'x1'])
182
185
        eq(w1.get_text('x1'), 'line from x1\n')
213
216
            # The target does not support ghosts; the test is irrelevant.
214
217
            return
215
218
        try:
216
 
            source.join(target)
 
219
            self.applyDeprecated(one_five, source.join, target)
217
220
        except errors.RevisionNotPresent:
218
221
            return
219
222
        # legacy apis should behave
228
231
        # if we add something that is fills out what is a ghost, then 
229
232
        # when joining into a ghost aware join it should flesh out the ghosts.
230
233
        source.add_lines('base', [], [])
231
 
        target.join(source, version_ids=['base'])
 
234
        self.applyDeprecated(one_five, target.join, source, version_ids=['base'])
232
235
        self.assertEqual(['base', 'notbase'], target.get_ancestry(['notbase']))
233
236
        self.assertEqual({'base':(),
234
237
                          'notbase':('base', ),
251
254
        source.add_lines('inherit_me', [], ['b\n'])
252
255
        source.add_lines('select_me', ['inherit_me'], ['b\n'])
253
256
        target = self.get_target()
254
 
        target.join(source, version_ids=['select_me'])
 
257
        self.applyDeprecated(one_five, target.join, source, version_ids=['select_me'])
255
258
        self.assertEqual(['inherit_me', 'select_me'], target.versions())
256
259
 
257
260
    def test_join_odd_records(self):
267
270
        source.add_lines('4', ['2'], ['1st\n'])
268
271
        source.add_lines('5', ['3'], ['1st\n', '2nd\n', '3rd\n'])
269
272
        target = self.get_target()
270
 
        target.join(source, version_ids=['1', '3', '5'])
 
273
        self.applyDeprecated(one_five, target.join, source, version_ids=['1', '3', '5'])
271
274
        target = self.get_target(create=False)
272
275
        self.assertEqual(set(['1', '3', '5']), set(target.versions()))
273
276
        self.assertEqual(3, len(target.versions()))