/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: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
141
141
        # root revision to change for each commit, even though the content,
142
142
        # parent, name, and other attributes are unchanged.
143
143
        tree = self.make_branch_and_tree('tree', knit1_format)
144
 
        tree.set_root_id(b'tree-root')
145
 
        tree.commit('rev1', rev_id=b'rev1')
146
 
        tree.commit('rev2', rev_id=b'rev2')
 
144
        tree.set_root_id('tree-root')
 
145
        tree.commit('rev1', rev_id='rev1')
 
146
        tree.commit('rev2', rev_id='rev2')
147
147
 
148
148
        # Now we convert it to a knit2 repository so that it has a root knit
149
149
        Convert(tree.basedir, knit2_format)
188
188
        """Merge brings across history from unrelated source"""
189
189
        wt1 = self.make_branch_and_tree('br1')
190
190
        br1 = wt1.branch
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
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
192
        wt1.commit(message='rev 1-2', rev_id='1-2')
193
193
        wt2 = self.make_branch_and_tree('br2')
194
194
        br2 = wt2.branch
195
 
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
195
        wt2.commit(message='rev 2-1', rev_id='2-1')
196
196
        wt2.merge_from_branch(br1, from_revision='null:')
197
197
        self._check_revs_present(br2)
198
198
 
200
200
        """Merge brings across history from source"""
201
201
        wt1 = self.make_branch_and_tree('br1')
202
202
        br1 = wt1.branch
203
 
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
203
        wt1.commit(message='rev 1-1', rev_id='1-1')
204
204
        dir_2 = br1.controldir.sprout('br2')
205
205
        br2 = dir_2.open_branch()
206
 
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
206
        wt1.commit(message='rev 1-2', rev_id='1-2')
207
207
        wt2 = dir_2.open_workingtree()
208
 
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
208
        wt2.commit(message='rev 2-1', rev_id='2-1')
209
209
        wt2.merge_from_branch(br1)
210
210
        self._check_revs_present(br2)
211
211
 
223
223
        super(TestMergeFileHistory, self).setUp()
224
224
        wt1 = self.make_branch_and_tree('br1')
225
225
        br1 = wt1.branch
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')
 
226
        self.build_tree_contents([('br1/file', 'original contents\n')])
 
227
        wt1.add('file', 'this-file-id')
 
228
        wt1.commit(message='rev 1-1', rev_id='1-1')
229
229
        dir_2 = br1.controldir.sprout('br2')
230
230
        br2 = dir_2.open_branch()
231
231
        wt2 = dir_2.open_workingtree()
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')
 
232
        self.build_tree_contents([('br1/file', 'original from 1\n')])
 
233
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
234
        self.build_tree_contents([('br1/file', 'agreement\n')])
 
235
        wt1.commit(message='rev 1-3', rev_id='1-3')
 
236
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
 
237
        wt2.commit(message='rev 2-1', rev_id='2-1')
 
238
        self.build_tree_contents([('br2/file', 'agreement\n')])
 
239
        wt2.commit(message='rev 2-2', rev_id='2-2')
240
240
 
241
241
    def test_merge_fetches_file_history(self):
242
242
        """Merge brings across file histories"""
275
275
        tree = self.make_branch_and_tree('source', format='dirstate')
276
276
        target = self.make_repository('target', format='pack-0.92')
277
277
        self.build_tree(['source/file'])
278
 
        tree.set_root_id(b'root-id')
279
 
        tree.add('file', b'file-id')
280
 
        tree.commit('one', rev_id=b'rev-one')
 
278
        tree.set_root_id('root-id')
 
279
        tree.add('file', 'file-id')
 
280
        tree.commit('one', rev_id='rev-one')
281
281
        source = tree.branch.repository
282
282
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
283
283
                        source.texts)
315
315
        tree = self.make_branch_and_tree('source', format='dirstate')
316
316
        target = self.make_repository('target', format='pack-0.92')
317
317
        self.build_tree(['source/file'])
318
 
        tree.set_root_id(b'root-id')
319
 
        tree.add('file', b'file-id')
320
 
        tree.commit('one', rev_id=b'rev-one')
 
318
        tree.set_root_id('root-id')
 
319
        tree.add('file', 'file-id')
 
320
        tree.commit('one', rev_id='rev-one')
321
321
        source = tree.branch.repository
322
322
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
323
323
                        source.texts)
360
360
        tree = self.make_branch_and_tree('source', format='dirstate')
361
361
        target = self.make_repository('target', format='pack-0.92')
362
362
        self.build_tree(['source/file'])
363
 
        tree.set_root_id(b'root-id')
364
 
        tree.add('file', b'file-id')
365
 
        tree.commit('one', rev_id=b'rev-one')
 
363
        tree.set_root_id('root-id')
 
364
        tree.add('file', 'file-id')
 
365
        tree.commit('one', rev_id='rev-one')
366
366
        # Hack the KVF for revisions so that it "accidentally" allows a delta
367
367
        tree.branch.repository.revisions._max_delta_chain = 200
368
 
        tree.commit('two', rev_id=b'rev-two')
 
368
        tree.commit('two', rev_id='rev-two')
369
369
        source = tree.branch.repository
370
370
        # Ensure that we stored a delta
371
371
        source.lock_read()
487
487
 
488
488
    def test_fetch_ghosts(self):
489
489
        self.make_tree_and_repo()
490
 
        self.tree.commit('first commit', rev_id=b'left-parent')
 
490
        self.tree.commit('first commit', rev_id='left-parent')
491
491
        self.tree.add_parent_tree_id('ghost-parent')
492
492
        fork = self.tree.controldir.sprout('fork', 'null:').open_workingtree()
493
 
        fork.commit('not a ghost', rev_id=b'not-ghost-parent')
 
493
        fork.commit('not a ghost', rev_id='not-ghost-parent')
494
494
        self.tree.branch.repository.fetch(fork.branch.repository,
495
495
                                     'not-ghost-parent')
496
496
        self.tree.add_parent_tree_id('not-ghost-parent')
497
 
        self.tree.commit('second commit', rev_id=b'second-id')
 
497
        self.tree.commit('second commit', rev_id='second-id')
498
498
        self.repo.fetch(self.tree.branch.repository, 'second-id')
499
499
        root_id = self.tree.get_root_id()
500
500
        self.assertEqual(
503
503
 
504
504
    def make_two_commits(self, change_root, fetch_twice):
505
505
        self.make_tree_and_repo()
506
 
        self.tree.commit('first commit', rev_id=b'first-id')
 
506
        self.tree.commit('first commit', rev_id='first-id')
507
507
        if change_root:
508
 
            self.tree.set_root_id(b'unique-id')
509
 
        self.tree.commit('second commit', rev_id=b'second-id')
 
508
            self.tree.set_root_id('unique-id')
 
509
        self.tree.commit('second commit', rev_id='second-id')
510
510
        if fetch_twice:
511
511
            self.repo.fetch(self.tree.branch.repository, 'first-id')
512
512
        self.repo.fetch(self.tree.branch.repository, 'second-id')