/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_branch/test_push.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:37 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005237-59jdqykbfjo1p37t
Rename make_bzrdir to make_controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_push.py
158
158
            return
159
159
        # This is a little bit trickier because make_branch_and_tree will not
160
160
        # re-use a shared repository.
161
 
        a_controldir = self.make_bzrdir('repo/tree')
 
161
        a_controldir = self.make_controldir('repo/tree')
162
162
        try:
163
163
            a_branch = self.branch_format.initialize(a_controldir)
164
164
        except (errors.UninitializableFormat):
179
179
        tree.add(['a'])
180
180
        tree.commit('a')
181
181
 
182
 
        to_bzrdir = self.make_bzrdir('repo/branch')
 
182
        to_bzrdir = self.make_controldir('repo/branch')
183
183
        to_branch = self.branch_format.initialize(to_bzrdir)
184
184
        tree.branch.push(to_branch)
185
185
 
287
287
        trunk.controldir.sprout(self.get_url('trunk'), revision_id='rev-1')
288
288
        # Set a default stacking policy so that new branches will automatically
289
289
        # stack on trunk.
290
 
        self.make_bzrdir('.').get_config().set_default_stack_on('trunk')
 
290
        self.make_controldir('.').get_config().set_default_stack_on('trunk')
291
291
        # Push rev-2 to a new branch "remote".  It will be stacked on "trunk".
292
292
        output = BytesIO()
293
293
        push._show_push_branch(trunk, 'rev-2', self.get_url('remote'), output)