/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_interbranch/__init__.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/per_interbranch/__init__.py
132
132
        newbranch.repository.fetch(origbranch.repository)
133
133
        origbranch.copy_content_into(newbranch)
134
134
        if format.supports_workingtrees:
135
 
            wt = newbranch.bzrdir.create_workingtree()
 
135
            wt = newbranch.controldir.create_workingtree()
136
136
        else:
137
137
            wt = newbranch.create_checkout(to_url, lightweight=True)
138
138
        return wt
141
141
        """Sprout a bzrdir, using to_format for the new branch."""
142
142
        wt = self._sprout(origdir, to_url, self.branch_format_to._matchingbzrdir)
143
143
        self.assertEqual(wt.branch._format, self.branch_format_to)
144
 
        return wt.bzrdir
 
144
        return wt.controldir
145
145
 
146
146
    def sprout_from(self, origdir, to_url):
147
147
        """Sprout a bzrdir, using from_format for the new bzrdir."""
148
148
        wt = self._sprout(origdir, to_url,
149
149
            self.branch_format_from._matchingbzrdir)
150
150
        self.assertEqual(wt.branch._format, self.branch_format_from)
151
 
        return wt.bzrdir
 
151
        return wt.controldir
152
152
 
153
153
 
154
154
class StubWithFormat(object):