/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/plugins/upload/tests/test_upload.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/plugins/upload/tests/test_upload.py
122
122
            t.base,
123
123
            format=bzrdir.format_registry.make_bzrdir('default'),
124
124
            force_new_tree=False)
125
 
        self.tree = branch.bzrdir.create_workingtree()
 
125
        self.tree = branch.controldir.create_workingtree()
126
126
        self.tree.commit('initial empty tree')
127
127
 
128
128
    def assertUpFileEqual(self, content, path, base=upload_dir):
819
819
        tree_a = self.make_branch_and_tree('tree_a')
820
820
        tree_a.commit('message 1', rev_id='rev1')
821
821
        tree_a.commit('message 2', rev_id='rev2a')
822
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
822
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
823
823
        uncommit.uncommit(tree_b.branch, tree=tree_b)
824
824
        tree_b.commit('message 2', rev_id='rev2b')
825
825
        # upload tree a