/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_tree/__init__.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_tree/__init__.py
101
101
 
102
102
    def make_branch_and_tree(self, relpath):
103
103
        bzrdir_format = self.workingtree_format.get_controldir_for_branch()
104
 
        made_control = self.make_bzrdir(relpath, format=bzrdir_format)
 
104
        made_control = self.make_controldir(relpath, format=bzrdir_format)
105
105
        made_control.create_repository()
106
106
        b = made_control.create_branch()
107
107
        if getattr(self, 'repo_is_remote', False):
142
142
        """setup an abc content tree."""
143
143
        files = ['a', 'b/', 'b/c']
144
144
        self.build_tree(files, line_endings='binary',
145
 
                        transport=tree.bzrdir.root_transport)
 
145
                        transport=tree.controldir.root_transport)
146
146
        tree.set_root_id('root-id')
147
147
        tree.add(files, ['a-id', 'b-id', 'c-id'])
148
148
 
219
219
        This variation adds a dir 'd' ('d-id'), renames b to d/e.
220
220
        """
221
221
        self._make_abc_tree(tree)
222
 
        self.build_tree(['d/'], transport=tree.bzrdir.root_transport)
 
222
        self.build_tree(['d/'], transport=tree.controldir.root_transport)
223
223
        tree.add(['d'], ['d-id'])
224
224
        tt = transform.TreeTransform(tree)
225
225
        trans_id = tt.trans_id_tree_path('b')
324
324
    def get_tree_with_merged_utf8(self, tree):
325
325
        """Generate a tree with utf8 ancestors."""
326
326
        self._create_tree_with_utf8(tree)
327
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
327
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
328
328
        self.build_tree([u'tree2/ba\N{Euro Sign}r/qu\N{Euro Sign}x'])
329
329
        tree2.add([u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'],
330
330
                  [u'qu\N{Euro Sign}x-id'.encode('utf-8')])