← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
207
207
        self.branch = branch
208
208
        self.basedir = realpath(basedir)
209
209
        # if branch is at our basedir and is a format 6 or less
210
 
        if (isinstance(self.branch._branch_format,
 
210
        if (isinstance(self.branch._format,
211
211
                       (BzrBranchFormat4))
212
212
            # might be able to share control object
213
213
            and self.branch.base.split('/')[-2] == self.basedir.split('/')[-1]):
216
216
            assert False, "not done yet"
217
217
#            self._control_files = _control_files
218
218
        else:
 
219
            # FIXME old format use the bzrdir control files.
219
220
            self._control_files = LockableFiles(
220
221
                get_transport(self.basedir).clone(bzrlib.BZRDIR), 'branch-lock')
221
222