/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: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interrepository/test_fetch.py
161
161
        builder.finish_series()
162
162
        branch = builder.get_branch()
163
163
        repo = self.make_repository('stacking-base')
164
 
        trunk = repo.bzrdir.create_branch()
 
164
        trunk = repo.controldir.create_branch()
165
165
        trunk.repository.fetch(branch.repository, 'second')
166
166
        repo = self.make_repository('stacked')
167
 
        stacked_branch = repo.bzrdir.create_branch()
 
167
        stacked_branch = repo.controldir.create_branch()
168
168
        stacked_branch.set_stacked_on_url(trunk.base)
169
169
        stacked_branch.repository.fetch(branch.repository, 'third')
170
170
        target = self.make_to_repository('target')
214
214
        builder.finish_series()
215
215
        branch = builder.get_branch()
216
216
        repo = self.make_to_repository('trunk')
217
 
        trunk = repo.bzrdir.create_branch()
 
217
        trunk = repo.controldir.create_branch()
218
218
        trunk.repository.fetch(branch.repository, 'left')
219
219
        trunk.repository.fetch(branch.repository, 'right')
220
220
        repo = self.make_to_repository('stacked')
221
 
        stacked_branch = repo.bzrdir.create_branch()
 
221
        stacked_branch = repo.controldir.create_branch()
222
222
        stacked_branch.set_stacked_on_url(trunk.base)
223
223
        stacked_branch.repository.fetch(branch.repository, 'merge')
224
 
        unstacked_repo = stacked_branch.bzrdir.open_repository()
 
224
        unstacked_repo = stacked_branch.controldir.open_repository()
225
225
        unstacked_repo.lock_read()
226
226
        self.addCleanup(unstacked_repo.unlock)
227
227
        self.assertFalse(unstacked_repo.has_revision('left'))
282
282
        builder.finish_series()
283
283
        branch = builder.get_branch()
284
284
        repo = self.make_to_repository('trunk')
285
 
        trunk = repo.bzrdir.create_branch()
 
285
        trunk = repo.controldir.create_branch()
286
286
        trunk.repository.fetch(branch.repository, 'second')
287
287
        repo = self.make_to_repository('stacked')
288
 
        stacked_branch = repo.bzrdir.create_branch()
 
288
        stacked_branch = repo.controldir.create_branch()
289
289
        stacked_branch.set_stacked_on_url(trunk.base)
290
290
        stacked_branch.repository.fetch(branch.repository, 'third')
291
 
        unstacked_repo = stacked_branch.bzrdir.open_repository()
 
291
        unstacked_repo = stacked_branch.controldir.open_repository()
292
292
        unstacked_repo.lock_read()
293
293
        self.addCleanup(unstacked_repo.unlock)
294
294
        self.assertFalse(unstacked_repo.has_revision('second'))
346
346
        branch = builder.get_branch()
347
347
        repo = self.make_repository('old-trunk')
348
348
        # Make a pair of equivalent trunk repos in the from and to formats.
349
 
        old_trunk = repo.bzrdir.create_branch()
 
349
        old_trunk = repo.controldir.create_branch()
350
350
        old_trunk.repository.fetch(branch.repository, 'left')
351
351
        old_trunk.repository.fetch(branch.repository, 'right')
352
352
        repo = self.make_to_repository('new-trunk')
353
 
        new_trunk = repo.bzrdir.create_branch()
 
353
        new_trunk = repo.controldir.create_branch()
354
354
        new_trunk.repository.fetch(branch.repository, 'left')
355
355
        new_trunk.repository.fetch(branch.repository, 'right')
356
356
        # Make the source; a repo stacked on old_trunk contained just the data
357
357
        # for 'merge'.
358
358
        repo = self.make_repository('old-stacked')
359
 
        old_stacked_branch = repo.bzrdir.create_branch()
 
359
        old_stacked_branch = repo.controldir.create_branch()
360
360
        old_stacked_branch.set_stacked_on_url(old_trunk.base)
361
361
        old_stacked_branch.repository.fetch(branch.repository, 'merge')
362
362
        # Make the target, a repo stacked on new_trunk.
363
363
        repo = self.make_to_repository('new-stacked')
364
 
        new_stacked_branch = repo.bzrdir.create_branch()
 
364
        new_stacked_branch = repo.controldir.create_branch()
365
365
        new_stacked_branch.set_stacked_on_url(new_trunk.base)
366
 
        old_unstacked_repo = old_stacked_branch.bzrdir.open_repository()
367
 
        new_unstacked_repo = new_stacked_branch.bzrdir.open_repository()
 
366
        old_unstacked_repo = old_stacked_branch.controldir.open_repository()
 
367
        new_unstacked_repo = new_stacked_branch.controldir.open_repository()
368
368
        # Reopen the source and target repos without any fallbacks, and fetch
369
369
        # 'merge'.
370
370
        new_unstacked_repo.fetch(old_unstacked_repo, 'merge')