/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/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/controldir.py
669
669
            raise errors.NotLocalUrl(base)
670
670
        controldir = klass.create_branch_and_repo(base,
671
671
                                               force_new_repo=True,
672
 
                                               format=format).bzrdir
 
672
                                               format=format).controldir
673
673
        return controldir.create_workingtree()
674
674
 
675
675
    @classmethod
1344
1344
        self.set_default(key)
1345
1345
        format = self.get('default')()
1346
1346
 
1347
 
    def make_bzrdir(self, key):
 
1347
    def make_controldir(self, key):
1348
1348
        return self.get(key)()
1349
1349
 
1350
1350
    def help_topic(self, topic):
1431
1431
        """
1432
1432
        self.repository = repository
1433
1433
        self.format = format
1434
 
        self.bzrdir = controldir
 
1434
        self.controldir = controldir
1435
1435
        self.shared = shared
1436
1436
 
1437
1437
    def __eq__(self, other):
1443
1443
                self.repository)
1444
1444
        else:
1445
1445
            return "<%s for %s>" % (self.__class__.__name__,
1446
 
                self.bzrdir)
 
1446
                self.controldir)
1447
1447
 
1448
1448
 
1449
1449
# Please register new formats after old formats so that formats