← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/weaverepo.py

Remove indirection through control_files to get transports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/weaverepo.py
63
63
            # some existing branches where there's a mixture; we probably 
64
64
            # still want the option to look for both.
65
65
            relpath = a_bzrdir._control_files._escape(name)
66
 
            store = TextStore(a_bzrdir._control_files._transport.clone(relpath),
 
66
            store = TextStore(a_bzrdir.transport.clone(relpath),
67
67
                              prefixed=prefixed, compressed=compressed,
68
68
                              dir_mode=dir_mode,
69
69
                              file_mode=file_mode)
76
76
            # which allows access to this old info.
77
77
            self.inventory_store = get_store('inventory-store')
78
78
            text_store = get_store('text-store')
79
 
        super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
 
79
        super(AllInOneRepository, self).__init__(_format,
 
80
            a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
80
81
        if control_store is not None:
81
82
            control_store.get_scope = self.get_transaction
82
83
        text_store.get_scope = self.get_transaction
368
369
            'branch-lock', lockable_files.TransportLock)
369
370
        control_files.create_lock()
370
371
        control_files.lock_write()
371
 
        transport = control_files._transport
 
372
        transport = a_bzrdir.transport
372
373
        try:
373
374
            transport.mkdir_multi(['revision-store', 'weaves'],
374
375
                mode=control_files._dir_mode)