/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
121
121
        t.ensure_base()
122
122
        branch = controldir.ControlDir.create_branch_convenience(
123
123
            t.base,
124
 
            format=controldir.format_registry.make_bzrdir('default'),
 
124
            format=controldir.format_registry.make_controldir('default'),
125
125
            force_new_tree=False)
126
 
        self.tree = branch.bzrdir.create_workingtree()
 
126
        self.tree = branch.controldir.create_workingtree()
127
127
        self.tree.commit('initial empty tree')
128
128
 
129
129
    def assertUpFileEqual(self, content, path, base=upload_dir):
820
820
        tree_a = self.make_branch_and_tree('tree_a')
821
821
        tree_a.commit('message 1', rev_id='rev1')
822
822
        tree_a.commit('message 2', rev_id='rev2a')
823
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
823
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
824
824
        uncommit.uncommit(tree_b.branch, tree=tree_b)
825
825
        tree_b.commit('message 2', rev_id='rev2b')
826
826
        # upload tree a