/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_fetch.py

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from bzrlib import (
18
 
    bzrdir,
 
17
from .. import (
19
18
    errors,
20
19
    osutils,
21
20
    revision as _mod_revision,
 
21
    )
 
22
from ..bzr import (
 
23
    bzrdir,
22
24
    versionedfile,
23
25
    )
24
 
from bzrlib.branch import Branch
25
 
from bzrlib.repofmt import knitrepo
26
 
from bzrlib.tests import TestCaseWithTransport
27
 
from bzrlib.tests.test_revision import make_branches
28
 
from bzrlib.upgrade import Convert
29
 
from bzrlib.workingtree import WorkingTree
 
26
from ..branch import Branch
 
27
from ..bzr import knitrepo
 
28
from . import TestCaseWithTransport
 
29
from .test_revision import make_branches
 
30
from ..upgrade import Convert
 
31
from ..workingtree import WorkingTree
30
32
 
31
33
# These tests are a bit old; please instead add new tests into
32
34
# per_interrepository/ so they'll run on all relevant
42
44
    try:
43
45
        graph = branch.repository.get_graph()
44
46
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
45
 
            [_mod_revision.NULL_REVISION]))
 
47
                                                    [_mod_revision.NULL_REVISION]))
46
48
    finally:
47
49
        branch.unlock()
48
50
    history.reverse()
56
58
    repo_b = br_b.repository
57
59
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
58
60
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
59
 
    self.assertEquals(len(revision_history(br_b)), 7)
 
61
    self.assertEqual(len(revision_history(br_b)), 7)
60
62
    br_b.fetch(br_a, revision_history(br_a)[2])
61
63
    # branch.fetch is not supposed to alter the revision history
62
 
    self.assertEquals(len(revision_history(br_b)), 7)
 
64
    self.assertEqual(len(revision_history(br_b)), 7)
63
65
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
64
66
 
65
67
    # fetching the next revision up in sample data copies one revision
109
111
    # construct.  One way would be to uncommit and gc the revision, but not
110
112
    # every branch supports that.  -- mbp 20070814
111
113
 
112
 
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
 
114
    # TODO: test that fetch correctly does reweaving when needed. RBC 20051008
113
115
    # Note that this means - updating the weave when ghosts are filled in to
114
116
    # add the right parents.
115
117
 
117
119
class TestFetch(TestCaseWithTransport):
118
120
 
119
121
    def test_fetch(self):
120
 
        #highest indices a: 5, b: 7
 
122
        # highest indices a: 5, b: 7
121
123
        br_a, br_b = make_branches(self, format='dirstate-tags')
122
124
        fetch_steps(self, br_a, br_b, br_a)
123
125
 
139
141
        # root revision to change for each commit, even though the content,
140
142
        # parent, name, and other attributes are unchanged.
141
143
        tree = self.make_branch_and_tree('tree', knit1_format)
142
 
        tree.set_root_id('tree-root')
143
 
        tree.commit('rev1', rev_id='rev1')
144
 
        tree.commit('rev2', rev_id='rev2')
 
144
        tree.set_root_id(b'tree-root')
 
145
        tree.commit('rev1', rev_id=b'rev1')
 
146
        tree.commit('rev2', rev_id=b'rev2')
145
147
 
146
148
        # Now we convert it to a knit2 repository so that it has a root knit
147
149
        Convert(tree.basedir, knit2_format)
148
150
        tree = WorkingTree.open(tree.basedir)
149
151
        branch = self.make_branch('branch', format=knit2_format)
150
 
        branch.pull(tree.branch, stop_revision='rev1')
 
152
        branch.pull(tree.branch, stop_revision=b'rev1')
151
153
        repo = branch.repository
152
154
        repo.lock_read()
153
155
        try:
154
156
            # Make sure fetch retrieved only what we requested
155
 
            self.assertEqual({('tree-root', 'rev1'):()},
156
 
                repo.texts.get_parent_map(
157
 
                    [('tree-root', 'rev1'), ('tree-root', 'rev2')]))
 
157
            self.assertEqual({(b'tree-root', b'rev1'): ()},
 
158
                             repo.texts.get_parent_map(
 
159
                [(b'tree-root', b'rev1'), (b'tree-root', b'rev2')]))
158
160
        finally:
159
161
            repo.unlock()
160
162
        branch.pull(tree.branch)
163
165
        repo.lock_read()
164
166
        try:
165
167
            # Make sure fetch retrieved only what we requested
166
 
            self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
167
 
                repo.texts.get_parent_map([('tree-root', 'rev2')]))
 
168
            self.assertEqual({(b'tree-root', b'rev2'): ((b'tree-root', b'rev1'),)},
 
169
                             repo.texts.get_parent_map([(b'tree-root', b'rev2')]))
168
170
        finally:
169
171
            repo.unlock()
170
172
 
171
173
    def test_fetch_incompatible(self):
172
174
        knit_tree = self.make_branch_and_tree('knit', format='knit')
173
175
        knit3_tree = self.make_branch_and_tree('knit3',
174
 
            format='dirstate-with-subtree')
 
176
                                               format='dirstate-with-subtree')
175
177
        knit3_tree.commit('blah')
176
178
        e = self.assertRaises(errors.IncompatibleRepositories,
177
179
                              knit_tree.branch.fetch, knit3_tree.branch)
178
180
        self.assertContainsRe(str(e),
179
 
            r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
180
 
            r"different rich-root support")
 
181
                              r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
 
182
                              r"different rich-root support")
181
183
 
182
184
 
183
185
class TestMergeFetch(TestCaseWithTransport):
186
188
        """Merge brings across history from unrelated source"""
187
189
        wt1 = self.make_branch_and_tree('br1')
188
190
        br1 = wt1.branch
189
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
190
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
191
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
192
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
191
193
        wt2 = self.make_branch_and_tree('br2')
192
194
        br2 = wt2.branch
193
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
194
 
        wt2.merge_from_branch(br1, from_revision='null:')
 
195
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
196
        wt2.merge_from_branch(br1, from_revision=b'null:')
195
197
        self._check_revs_present(br2)
196
198
 
197
199
    def test_merge_fetches(self):
198
200
        """Merge brings across history from source"""
199
201
        wt1 = self.make_branch_and_tree('br1')
200
202
        br1 = wt1.branch
201
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
202
 
        dir_2 = br1.bzrdir.sprout('br2')
 
203
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
204
        dir_2 = br1.controldir.sprout('br2')
203
205
        br2 = dir_2.open_branch()
204
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
206
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
205
207
        wt2 = dir_2.open_workingtree()
206
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
 
208
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
207
209
        wt2.merge_from_branch(br1)
208
210
        self._check_revs_present(br2)
209
211
 
210
212
    def _check_revs_present(self, br2):
211
 
        for rev_id in '1-1', '1-2', '2-1':
 
213
        for rev_id in [b'1-1', b'1-2', b'2-1']:
212
214
            self.assertTrue(br2.repository.has_revision(rev_id))
213
215
            rev = br2.repository.get_revision(rev_id)
214
216
            self.assertEqual(rev.revision_id, rev_id)
221
223
        super(TestMergeFileHistory, self).setUp()
222
224
        wt1 = self.make_branch_and_tree('br1')
223
225
        br1 = wt1.branch
224
 
        self.build_tree_contents([('br1/file', 'original contents\n')])
225
 
        wt1.add('file', 'this-file-id')
226
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
227
 
        dir_2 = br1.bzrdir.sprout('br2')
 
226
        self.build_tree_contents([('br1/file', b'original contents\n')])
 
227
        wt1.add('file', b'this-file-id')
 
228
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
229
        dir_2 = br1.controldir.sprout('br2')
228
230
        br2 = dir_2.open_branch()
229
231
        wt2 = dir_2.open_workingtree()
230
 
        self.build_tree_contents([('br1/file', 'original from 1\n')])
231
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
232
 
        self.build_tree_contents([('br1/file', 'agreement\n')])
233
 
        wt1.commit(message='rev 1-3', rev_id='1-3')
234
 
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
235
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
236
 
        self.build_tree_contents([('br2/file', 'agreement\n')])
237
 
        wt2.commit(message='rev 2-2', rev_id='2-2')
 
232
        self.build_tree_contents([('br1/file', b'original from 1\n')])
 
233
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
234
        self.build_tree_contents([('br1/file', b'agreement\n')])
 
235
        wt1.commit(message='rev 1-3', rev_id=b'1-3')
 
236
        self.build_tree_contents([('br2/file', b'contents in 2\n')])
 
237
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
238
        self.build_tree_contents([('br2/file', b'agreement\n')])
 
239
        wt2.commit(message='rev 2-2', rev_id=b'2-2')
238
240
 
239
241
    def test_merge_fetches_file_history(self):
240
242
        """Merge brings across file histories"""
243
245
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
244
246
        br2.lock_read()
245
247
        self.addCleanup(br2.unlock)
246
 
        for rev_id, text in [('1-2', 'original from 1\n'),
247
 
                             ('1-3', 'agreement\n'),
248
 
                             ('2-1', 'contents in 2\n'),
249
 
                             ('2-2', 'agreement\n')]:
 
248
        for rev_id, text in [(b'1-2', b'original from 1\n'),
 
249
                             (b'1-3', b'agreement\n'),
 
250
                             (b'2-1', b'contents in 2\n'),
 
251
                             (b'2-2', b'agreement\n')]:
250
252
            self.assertEqualDiff(
251
253
                br2.repository.revision_tree(
252
 
                    rev_id).get_file_text('this-file-id'), text)
 
254
                    rev_id).get_file_text('file'), text)
253
255
 
254
256
 
255
257
class TestKnitToPackFetch(TestCaseWithTransport):
273
275
        tree = self.make_branch_and_tree('source', format='dirstate')
274
276
        target = self.make_repository('target', format='pack-0.92')
275
277
        self.build_tree(['source/file'])
276
 
        tree.set_root_id('root-id')
277
 
        tree.add('file', 'file-id')
278
 
        tree.commit('one', rev_id='rev-one')
 
278
        tree.set_root_id(b'root-id')
 
279
        tree.add('file', b'file-id')
 
280
        tree.commit('one', rev_id=b'rev-one')
279
281
        source = tree.branch.repository
280
282
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
281
 
                        source.texts)
 
283
            source.texts)
282
284
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
283
 
                        source.signatures)
 
285
            source.signatures)
284
286
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
285
 
                        source.revisions)
 
287
            source.revisions)
286
288
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
287
 
                        source.inventories)
 
289
            source.inventories)
288
290
        # precondition
289
291
        self.assertTrue(target._format._fetch_uses_deltas)
290
 
        target.fetch(source, revision_id='rev-one')
291
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
292
        target.fetch(source, revision_id=b'rev-one')
 
293
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
292
294
                          target._format._fetch_order, False),
293
295
                         self.find_get_record_stream(source.texts.calls))
294
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
295
 
          target._format._fetch_order, False),
296
 
          self.find_get_record_stream(source.inventories.calls, 2))
297
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
296
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
297
                          target._format._fetch_order, False),
 
298
                         self.find_get_record_stream(source.inventories.calls, 2))
 
299
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
298
300
                          target._format._fetch_order, False),
299
301
                         self.find_get_record_stream(source.revisions.calls))
300
302
        # XXX: Signatures is special, and slightly broken. The
305
307
        # So we know there will be extra calls, but the *last* one is the one
306
308
        # we care about.
307
309
        signature_calls = source.signatures.calls[-1:]
308
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
310
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
309
311
                          target._format._fetch_order, False),
310
312
                         self.find_get_record_stream(signature_calls))
311
313
 
313
315
        tree = self.make_branch_and_tree('source', format='dirstate')
314
316
        target = self.make_repository('target', format='pack-0.92')
315
317
        self.build_tree(['source/file'])
316
 
        tree.set_root_id('root-id')
317
 
        tree.add('file', 'file-id')
318
 
        tree.commit('one', rev_id='rev-one')
 
318
        tree.set_root_id(b'root-id')
 
319
        tree.add('file', b'file-id')
 
320
        tree.commit('one', rev_id=b'rev-one')
319
321
        source = tree.branch.repository
320
322
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
321
 
                        source.texts)
 
323
            source.texts)
322
324
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
323
 
                        source.signatures)
 
325
            source.signatures)
324
326
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
325
 
                        source.revisions)
 
327
            source.revisions)
326
328
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
327
 
                        source.inventories)
 
329
            source.inventories)
328
330
        # XXX: This won't work in general, but for the dirstate format it does.
329
331
        self.overrideAttr(target._format, '_fetch_uses_deltas', False)
330
 
        target.fetch(source, revision_id='rev-one')
331
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
332
        target.fetch(source, revision_id=b'rev-one')
 
333
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
332
334
                          target._format._fetch_order, True),
333
335
                         self.find_get_record_stream(source.texts.calls))
334
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
335
 
            target._format._fetch_order, True),
336
 
            self.find_get_record_stream(source.inventories.calls, 2))
337
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
336
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
337
                          target._format._fetch_order, True),
 
338
                         self.find_get_record_stream(source.inventories.calls, 2))
 
339
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
338
340
                          target._format._fetch_order, True),
339
341
                         self.find_get_record_stream(source.revisions.calls))
340
342
        # XXX: Signatures is special, and slightly broken. The
345
347
        # So we know there will be extra calls, but the *last* one is the one
346
348
        # we care about.
347
349
        signature_calls = source.signatures.calls[-1:]
348
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
350
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
349
351
                          target._format._fetch_order, True),
350
352
                         self.find_get_record_stream(signature_calls))
351
353
 
358
360
        tree = self.make_branch_and_tree('source', format='dirstate')
359
361
        target = self.make_repository('target', format='pack-0.92')
360
362
        self.build_tree(['source/file'])
361
 
        tree.set_root_id('root-id')
362
 
        tree.add('file', 'file-id')
363
 
        tree.commit('one', rev_id='rev-one')
 
363
        tree.set_root_id(b'root-id')
 
364
        tree.add('file', b'file-id')
 
365
        tree.commit('one', rev_id=b'rev-one')
364
366
        # Hack the KVF for revisions so that it "accidentally" allows a delta
365
367
        tree.branch.repository.revisions._max_delta_chain = 200
366
 
        tree.commit('two', rev_id='rev-two')
 
368
        tree.commit('two', rev_id=b'rev-two')
367
369
        source = tree.branch.repository
368
370
        # Ensure that we stored a delta
369
371
        source.lock_read()
370
372
        self.addCleanup(source.unlock)
371
 
        record = source.revisions.get_record_stream([('rev-two',)],
372
 
            'unordered', False).next()
 
373
        record = next(source.revisions.get_record_stream([(b'rev-two',)],
 
374
                                                         'unordered', False))
373
375
        self.assertEqual('knit-delta-gz', record.storage_kind)
374
 
        target.fetch(tree.branch.repository, revision_id='rev-two')
 
376
        target.fetch(tree.branch.repository, revision_id=b'rev-two')
375
377
        # The record should get expanded back to a fulltext
376
378
        target.lock_read()
377
379
        self.addCleanup(target.unlock)
378
 
        record = target.revisions.get_record_stream([('rev-two',)],
379
 
            'unordered', False).next()
 
380
        record = next(target.revisions.get_record_stream([(b'rev-two',)],
 
381
                                                         'unordered', False))
380
382
        self.assertEqual('knit-ft-gz', record.storage_kind)
381
383
 
382
384
    def test_fetch_with_fallback_and_merge(self):
400
402
        # random ids because otherwise the inventory fulltext compresses too
401
403
        # well and the deltas get bigger.
402
404
        to_add = [
403
 
            ('add', ('', 'TREE_ROOT', 'directory', None))]
404
 
        for i in xrange(10):
 
405
            ('add', ('', b'TREE_ROOT', 'directory', None))]
 
406
        for i in range(10):
405
407
            fname = 'file%03d' % (i,)
406
 
            fileid = '%s-%s' % (fname, osutils.rand_chars(64))
407
 
            to_add.append(('add', (fname, fileid, 'file', 'content\n')))
408
 
        builder.build_snapshot('A', None, to_add)
409
 
        builder.build_snapshot('B', ['A'], [])
410
 
        builder.build_snapshot('C', ['A'], [])
411
 
        builder.build_snapshot('D', ['C'], [])
412
 
        builder.build_snapshot('E', ['D'], [])
413
 
        builder.build_snapshot('F', ['E', 'B'], [])
 
408
            fileid = ('%s-%s' %
 
409
                      (fname, osutils.rand_chars(64))).encode('ascii')
 
410
            to_add.append(('add', (fname, fileid, 'file', b'content\n')))
 
411
        builder.build_snapshot(None, to_add, revision_id=b'A')
 
412
        builder.build_snapshot([b'A'], [], revision_id=b'B')
 
413
        builder.build_snapshot([b'A'], [], revision_id=b'C')
 
414
        builder.build_snapshot([b'C'], [], revision_id=b'D')
 
415
        builder.build_snapshot([b'D'], [], revision_id=b'E')
 
416
        builder.build_snapshot([b'E', b'B'], [], revision_id=b'F')
414
417
        builder.finish_series()
415
418
        source_branch = builder.get_branch()
416
 
        source_branch.bzrdir.sprout('base', revision_id='B')
 
419
        source_branch.controldir.sprout('base', revision_id=b'B')
417
420
        target_branch = self.make_branch('target', format='1.6')
418
421
        target_branch.set_stacked_on_url('../base')
419
422
        source = source_branch.repository
420
423
        source.lock_read()
421
424
        self.addCleanup(source.unlock)
422
425
        source.inventories = versionedfile.OrderingVersionedFilesDecorator(
423
 
                        source.inventories,
424
 
                        key_priority={('E',): 1, ('D',): 2, ('C',): 4,
425
 
                                      ('F',): 3})
 
426
            source.inventories,
 
427
            key_priority={(b'E',): 1, (b'D',): 2, (b'C',): 4,
 
428
                          (b'F',): 3})
426
429
        # Ensure that the content is yielded in the proper order, and given as
427
430
        # the expected kinds
428
431
        records = [(record.key, record.storage_kind)
429
432
                   for record in source.inventories.get_record_stream(
430
 
                        [('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
431
 
        self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
432
 
                          (('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
433
 
                          records)
 
433
            [(b'D',), (b'C',), (b'E',), (b'F',)], 'unordered', False)]
 
434
        self.assertEqual([((b'E',), 'knit-delta-gz'), ((b'D',), 'knit-delta-gz'),
 
435
                          ((b'F',), 'knit-delta-gz'), ((b'C',), 'knit-delta-gz')],
 
436
                         records)
434
437
 
435
438
        target_branch.lock_write()
436
439
        self.addCleanup(target_branch.unlock)
437
440
        target = target_branch.repository
438
 
        target.fetch(source, revision_id='F')
 
441
        target.fetch(source, revision_id=b'F')
439
442
        # 'C' should be expanded to a fulltext, but D and E should still be
440
443
        # deltas
441
444
        stream = target.inventories.get_record_stream(
442
 
            [('C',), ('D',), ('E',), ('F',)],
 
445
            [(b'C',), (b'D',), (b'E',), (b'F',)],
443
446
            'unordered', False)
444
447
        kinds = dict((record.key, record.storage_kind) for record in stream)
445
 
        self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
446
 
                          ('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
 
448
        self.assertEqual({(b'C',): 'knit-ft-gz', (b'D',): 'knit-delta-gz',
 
449
                          (b'E',): 'knit-delta-gz', (b'F',): 'knit-delta-gz'},
447
450
                         kinds)
448
451
 
449
452
 
469
472
 
470
473
    def test_fetch_order_AB(self):
471
474
        """See do_fetch_order_test"""
472
 
        self.do_fetch_order_test('A', 'B')
 
475
        self.do_fetch_order_test(b'A', b'B')
473
476
 
474
477
    def test_fetch_order_BA(self):
475
478
        """See do_fetch_order_test"""
476
 
        self.do_fetch_order_test('B', 'A')
 
479
        self.do_fetch_order_test(b'B', b'A')
477
480
 
478
481
    def get_parents(self, file_id, revision_id):
479
482
        self.repo.lock_read()
480
483
        try:
481
 
            parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
 
484
            parent_map = self.repo.texts.get_parent_map(
 
485
                [(file_id, revision_id)])
482
486
            return parent_map[(file_id, revision_id)]
483
487
        finally:
484
488
            self.repo.unlock()
485
489
 
486
490
    def test_fetch_ghosts(self):
487
491
        self.make_tree_and_repo()
488
 
        self.tree.commit('first commit', rev_id='left-parent')
489
 
        self.tree.add_parent_tree_id('ghost-parent')
490
 
        fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
491
 
        fork.commit('not a ghost', rev_id='not-ghost-parent')
 
492
        self.tree.commit('first commit', rev_id=b'left-parent')
 
493
        self.tree.add_parent_tree_id(b'ghost-parent')
 
494
        fork = self.tree.controldir.sprout('fork', b'null:').open_workingtree()
 
495
        fork.commit('not a ghost', rev_id=b'not-ghost-parent')
492
496
        self.tree.branch.repository.fetch(fork.branch.repository,
493
 
                                     'not-ghost-parent')
494
 
        self.tree.add_parent_tree_id('not-ghost-parent')
495
 
        self.tree.commit('second commit', rev_id='second-id')
496
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
497
 
        root_id = self.tree.get_root_id()
 
497
                                          b'not-ghost-parent')
 
498
        self.tree.add_parent_tree_id(b'not-ghost-parent')
 
499
        self.tree.commit('second commit', rev_id=b'second-id')
 
500
        self.repo.fetch(self.tree.branch.repository, b'second-id')
 
501
        root_id = self.tree.path2id('')
498
502
        self.assertEqual(
499
 
            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
500
 
            self.get_parents(root_id, 'second-id'))
 
503
            ((root_id, b'left-parent'), (root_id, b'not-ghost-parent')),
 
504
            self.get_parents(root_id, b'second-id'))
501
505
 
502
506
    def make_two_commits(self, change_root, fetch_twice):
503
507
        self.make_tree_and_repo()
504
 
        self.tree.commit('first commit', rev_id='first-id')
 
508
        self.tree.commit('first commit', rev_id=b'first-id')
505
509
        if change_root:
506
 
            self.tree.set_root_id('unique-id')
507
 
        self.tree.commit('second commit', rev_id='second-id')
 
510
            self.tree.set_root_id(b'unique-id')
 
511
        self.tree.commit('second commit', rev_id=b'second-id')
508
512
        if fetch_twice:
509
 
            self.repo.fetch(self.tree.branch.repository, 'first-id')
510
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
 
513
            self.repo.fetch(self.tree.branch.repository, b'first-id')
 
514
        self.repo.fetch(self.tree.branch.repository, b'second-id')
511
515
 
512
516
    def test_fetch_changed_root(self):
513
517
        self.make_two_commits(change_root=True, fetch_twice=False)
514
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
518
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
515
519
 
516
520
    def test_two_fetch_changed_root(self):
517
521
        self.make_two_commits(change_root=True, fetch_twice=True)
518
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
522
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
519
523
 
520
524
    def test_two_fetches(self):
521
525
        self.make_two_commits(change_root=False, fetch_twice=True)
522
 
        self.assertEqual((('TREE_ROOT', 'first-id'),),
523
 
            self.get_parents('TREE_ROOT', 'second-id'))
 
526
        self.assertEqual(((b'TREE_ROOT', b'first-id'),),
 
527
                         self.get_parents(b'TREE_ROOT', b'second-id'))