/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_repository_reference/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_repository_reference/test_fetch.py
83
83
        transport = self.make_smart_server('server')
84
84
        transport.ensure_base()
85
85
        url = transport.abspath('')
86
 
        stack_b = source_b.bzrdir.sprout(url + '/stack-on', revision_id='B-id')
 
86
        stack_b = source_b.controldir.sprout(url + '/stack-on', revision_id='B-id')
87
87
        # self.make_branch only takes relative paths, so we do it the 'hard'
88
88
        # way
89
89
        target_transport = transport.clone('target')
96
96
        target_b.pull(source_b, stop_revision='C-id')
97
97
        # Now we should be able to branch from the remote location to a local
98
98
        # location
99
 
        final_b = target_b.bzrdir.sprout('final').open_branch()
 
99
        final_b = target_b.controldir.sprout('final').open_branch()
100
100
        self.assertEqual('C-id', final_b.last_revision())
101
101
 
102
102
        # bzrdir.sprout() has slightly different code paths if you supply a
103
103
        # revision_id versus not. If you supply revision_id, then you get a
104
104
        # PendingAncestryResult for the search, versus a SearchResult...
105
 
        final2_b = target_b.bzrdir.sprout('final2',
 
105
        final2_b = target_b.controldir.sprout('final2',
106
106
                                          revision_id='C-id').open_branch()
107
107
        self.assertEqual('C-id', final_b.last_revision())
108
108
 
166
166
 
167
167
    def test_fetch_everything_includes_parent_invs(self):
168
168
        stacked = self.make_stacked_source_repo()
169
 
        repo_missing_fallbacks = stacked.bzrdir.open_repository()
 
169
        repo_missing_fallbacks = stacked.controldir.open_repository()
170
170
        self.addCleanup(repo_missing_fallbacks.lock_read().unlock)
171
171
        target = self.make_repository('target')
172
172
        self.addCleanup(target.lock_write().unlock)