/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_transform.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/test_transform.py
3144
3144
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3145
3145
        work_a.add('file', 'file-id')
3146
3146
        base_id = work_a.commit('base version')
3147
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3147
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
3148
3148
        preview = TransformPreview(work_a)
3149
3149
        self.addCleanup(preview.finalize)
3150
3150
        trans_id = preview.trans_id_file_id('file-id')
3167
3167
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
3168
3168
        work_a.add('file', 'file-id')
3169
3169
        base_id = work_a.commit('base version')
3170
 
        tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
 
3170
        tree_b = work_a.controldir.sprout('wtb').open_workingtree()
3171
3171
        preview = TransformPreview(work_a.basis_tree())
3172
3172
        self.addCleanup(preview.finalize)
3173
3173
        trans_id = preview.trans_id_file_id('file-id')
3217
3217
        self.build_tree_contents([('tree/file','b\n')])
3218
3218
        work_tree.add('file', 'file-id')
3219
3219
        work_tree.commit('first commit')
3220
 
        child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
 
3220
        child_tree = work_tree.controldir.sprout('child').open_workingtree()
3221
3221
        self.build_tree_contents([('child/file','b\nc\n')])
3222
3222
        child_tree.commit('child commit')
3223
3223
        child_tree.lock_write()
3263
3263
        trans_id = tt.trans_id_file_id('foo-id')
3264
3264
        tt.delete_contents(trans_id)
3265
3265
        tt.create_file('baz', trans_id)
3266
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
3266
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
3267
3267
        self.build_tree_contents([('tree2/foo', 'qux')])
3268
3268
        pb = None
3269
3269
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),