/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/repofmt/groupcompress_repo.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/repofmt/groupcompress_repo.py
805
805
class CHKInventoryRepository(PackRepository):
806
806
    """subclass of PackRepository that uses CHK based inventories."""
807
807
 
808
 
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
 
808
    def __init__(self, _format, a_controldir, control_files, _commit_builder_class,
809
809
        _serializer):
810
810
        """Overridden to change pack collection class."""
811
 
        super(CHKInventoryRepository, self).__init__(_format, a_bzrdir,
 
811
        super(CHKInventoryRepository, self).__init__(_format, a_controldir,
812
812
            control_files, _commit_builder_class, _serializer)
813
813
        index_transport = self._transport.clone('indices')
814
814
        self._pack_collection = GCRepositoryPackCollection(self,
1389
1389
    pack_compresses = True
1390
1390
 
1391
1391
    def _get_matching_bzrdir(self):
1392
 
        return controldir.format_registry.make_bzrdir('2a')
 
1392
        return controldir.format_registry.make_controldir('2a')
1393
1393
 
1394
1394
    def _ignore_setting_bzrdir(self, format):
1395
1395
        pass
1412
1412
    """
1413
1413
 
1414
1414
    def _get_matching_bzrdir(self):
1415
 
        return controldir.format_registry.make_bzrdir('development-subtree')
 
1415
        return controldir.format_registry.make_controldir('development-subtree')
1416
1416
 
1417
1417
    def _ignore_setting_bzrdir(self, format):
1418
1418
        pass