← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-05 13:47:21 UTC
  • mto: This revision was merged to the branch mainline in revision 6191.
  • Revision ID: jelmer@samba.org-20111005134721-4lzcl6id1l5o6c9h
Fix metadircolo initialization.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1323
1323
class BzrDirMeta1Colo(BzrDirMeta1):
1324
1324
    """BzrDirMeta1 with support for colocated branches.
1325
1325
 
1326
 
    This format is experimental, and will eventually be merged back into BzrDirMeta1.
 
1326
    This format is experimental, and will eventually be merged back into
 
1327
    BzrDirMeta1.
1327
1328
    """
1328
1329
 
 
1330
    def __init__(self, _transport, _format):
 
1331
        super(BzrDirMeta1Colo, self).__init__(_transport, _format)
 
1332
        self.control_files = lockable_files.LockableFiles(_transport,
 
1333
            self._format._lock_file_name, self._format._lock_class)
 
1334
 
1329
1335
    def _get_branch_path(self, name):
1330
1336
        """Obtain the branch path to use.
1331
1337