/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/workingtree_4.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/workingtree_4.py
1594
1594
    def _get_matchingbzrdir(self):
1595
1595
        """Overrideable method to get a bzrdir for testing."""
1596
1596
        # please test against something that will let us do tree references
1597
 
        return controldir.format_registry.make_bzrdir(
 
1597
        return controldir.format_registry.make_controldir(
1598
1598
            'development-subtree')
1599
1599
 
1600
1600
    _matchingbzrdir = property(__get_matchingbzrdir)
1678
1678
        """Overrideable method to get a bzrdir for testing."""
1679
1679
        # We use 'development-subtree' instead of '2a', because we have a
1680
1680
        # few tests that want to test tree references
1681
 
        return controldir.format_registry.make_bzrdir('development-subtree')
 
1681
        return controldir.format_registry.make_controldir('development-subtree')
1682
1682
 
1683
1683
 
1684
1684
class DirStateRevisionTree(InventoryTree):