/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/per_interrepository/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interrepository/test_fetch.py
61
61
        tree_a = self.make_branch_and_tree('a')
62
62
        self.build_tree(['a/foo'])
63
63
        tree_a.add('foo', 'file1')
64
 
        tree_a.commit('rev1', rev_id='rev1')
 
64
        tree_a.commit('rev1', rev_id=b'rev1')
65
65
        def check_push_rev1(repo):
66
66
            # ensure the revision is missing.
67
67
            self.assertRaises(NoSuchRevision, repo.get_revision, 'rev1')
121
121
                           committer="Foo Bar <foo@example.com>",
122
122
                           message="Message",
123
123
                           inventory_sha1=inv_sha1,
124
 
                           revision_id='new',
 
124
                           revision_id=b'new',
125
125
                           parent_ids=[revid])
126
126
            source.add_revision(rev.revision_id, rev)
127
127
        except:
154
154
        builder.build_snapshot(None, [
155
155
            ('add', ('', 'root-id', 'directory', '')),
156
156
            ('add', ('file', 'file-id', 'file', 'content\n'))],
157
 
            revision_id='first')
 
157
            revision_id=b'first')
158
158
        builder.build_snapshot(['first'], [
159
159
            ('modify', ('file-id', 'second content\n'))],
160
 
            revision_id='second')
 
160
            revision_id=b'second')
161
161
        builder.build_snapshot(['second'], [
162
162
            ('modify', ('file-id', 'third content\n'))],
163
 
            revision_id='third')
 
163
            revision_id=b'third')
164
164
        builder.finish_series()
165
165
        branch = builder.get_branch()
166
166
        repo = self.make_repository('stacking-base')
206
206
        builder = self.make_branch_builder('branch')
207
207
        builder.start_series()
208
208
        builder.build_snapshot(None, [
209
 
            ('add', ('', 'root-id', 'directory', '')),
210
 
            ('add', ('file', 'file-id', 'file', 'content\n'))],
211
 
            revision_id='base')
212
 
        builder.build_snapshot(['base'], [
213
 
            ('modify', ('file-id', 'left content\n'))],
214
 
            revision_id='left')
215
 
        builder.build_snapshot(['base'], [
216
 
            ('modify', ('file-id', 'right content\n'))],
217
 
            revision_id='right')
218
 
        builder.build_snapshot(['left', 'right'], [
219
 
            ('modify', ('file-id', 'left and right content\n'))],
220
 
            revision_id='merge')
 
209
            ('add', ('', b'root-id', 'directory', '')),
 
210
            ('add', ('file', b'file-id', 'file', b'content\n'))],
 
211
            revision_id=b'base')
 
212
        builder.build_snapshot([b'base'], [
 
213
            ('modify', (b'file-id', b'left content\n'))],
 
214
            revision_id=b'left')
 
215
        builder.build_snapshot([b'base'], [
 
216
            ('modify', (b'file-id', b'right content\n'))],
 
217
            revision_id=b'right')
 
218
        builder.build_snapshot([b'left', b'right'], [
 
219
            ('modify', (b'file-id', b'left and right content\n'))],
 
220
            revision_id=b'merge')
221
221
        builder.finish_series()
222
222
        branch = builder.get_branch()
223
223
        repo = self.make_to_repository('trunk')
280
280
        builder = self.make_branch_builder('branch')
281
281
        builder.start_series()
282
282
        builder.build_snapshot(None, [
283
 
            ('add', ('', 'root-id', 'directory', '')),
284
 
            ('add', ('file', 'file-id', 'file', 'content\n'))],
285
 
            revision_id='base')
286
 
        builder.build_snapshot(['base'], [
287
 
            ('modify', ('file-id', 'second content\n'))],
288
 
            revision_id='second')
289
 
        builder.build_snapshot(['second', 'ghost'], [
290
 
            ('modify', ('file-id', 'third content\n'))],
291
 
            revision_id='third')
 
283
            ('add', ('', b'root-id', 'directory', '')),
 
284
            ('add', ('file', b'file-id', 'file', b'content\n'))],
 
285
            revision_id=b'base')
 
286
        builder.build_snapshot([b'base'], [
 
287
            ('modify', (b'file-id', b'second content\n'))],
 
288
            revision_id=b'second')
 
289
        builder.build_snapshot([b'second', b'ghost'], [
 
290
            ('modify', (b'file-id', 'third content\n'))],
 
291
            revision_id=b'third')
292
292
        builder.finish_series()
293
293
        branch = builder.get_branch()
294
294
        repo = self.make_to_repository('trunk')
346
346
        builder.build_snapshot(None, [
347
347
            ('add', ('', 'root-id', 'directory', '')),
348
348
            ('add', ('file', 'file-id', 'file', 'content\n'))],
349
 
            revision_id='base')
 
349
            revision_id=b'base')
350
350
        builder.build_snapshot(['base'], [
351
351
            ('modify', ('file-id', 'left content\n'))],
352
 
            revision_id='left')
 
352
            revision_id=b'left')
353
353
        builder.build_snapshot(['base'], [
354
354
            ('modify', ('file-id', 'right content\n'))],
355
 
            revision_id='right')
 
355
            revision_id=b'right')
356
356
        builder.build_snapshot(['left', 'right'], [
357
357
            ('modify', ('file-id', 'left and right content\n'))],
358
 
            revision_id='merge')
 
358
            revision_id=b'merge')
359
359
        builder.finish_series()
360
360
        branch = builder.get_branch()
361
361
        repo = self.make_repository('old-trunk')
422
422
        tree = self.make_branch_and_tree('tree')
423
423
        self.build_tree(['tree/a'])
424
424
        tree.add(['a'])
425
 
        tree.commit('one', rev_id='rev-one')
426
 
        self.build_tree_contents([('tree/a', 'new contents\n')])
427
 
        tree.commit('two', rev_id='rev-two')
 
425
        tree.commit('one', rev_id=b'rev-one')
 
426
        self.build_tree_contents([('tree/a', b'new contents\n')])
 
427
        tree.commit('two', rev_id=b'rev-two')
428
428
 
429
429
        to_repo = self.make_to_repository('to_repo')
430
430
        # We build a broken revision so that we can test the fetch code dies
473
473
        repo_a = self.make_repository('.')
474
474
        repo_b = repository.Repository.open('.')
475
475
        self.assertRaises(errors.NoSuchRevision,
476
 
            repo_b.fetch, repo_a, revision_id='XXX')
 
476
            repo_b.fetch, repo_a, revision_id=b'XXX')
477
477
 
478
478
    def test_fetch_same_location_trivial_works(self):
479
479
        repo_a = self.make_repository('.')
489
489
        # repositories that have specific files for each fileid.
490
490
        self.build_tree(['source/id'])
491
491
        source_tree.add(['id'], ['id'])
492
 
        source_tree.commit('a', rev_id='a')
 
492
        source_tree.commit('a', rev_id=b'a')
493
493
        # now we manually insert a revision with an inventory referencing
494
494
        # file 'id' at revision 'b', but we do not insert revision b.
495
495
        # this should ensure that the new versions of files are being checked
506
506
                       committer="Foo Bar <foo@example.com>",
507
507
                       message="Message",
508
508
                       inventory_sha1=sha1,
509
 
                       revision_id='b')
 
509
                       revision_id=b'b')
510
510
        rev.parent_ids = ['a']
511
511
        source.add_revision('b', rev)
512
512
        self.disable_commit_write_group_paranoia(source)
528
528
    def test_fetch_revision_hash(self):
529
529
        """Ensure that inventory hashes are updated by fetch"""
530
530
        from_tree = self.make_branch_and_tree('tree')
531
 
        from_tree.commit('foo', rev_id='foo-id')
 
531
        from_tree.commit('foo', rev_id=b'foo-id')
532
532
        to_repo = self.make_to_repository('to')
533
533
        to_repo.fetch(from_tree.branch.repository)
534
534
        recorded_inv_sha1 = to_repo.get_revision('foo-id').inventory_sha1