/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 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

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