← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
568
568
            # or entirely uncompressed is tidy, but breaks upgrade from 
569
569
            # some existing branches where there's a mixture; we probably 
570
570
            # still want the option to look for both.
571
 
            relpath = self._rel_controlfilename(name)
 
571
            relpath = self._rel_controlfilename(unicode(name))
572
572
            store = TextStore(self._transport.clone(relpath),
573
573
                              prefixed=prefixed,
574
574
                              compressed=compressed)
577
577
            #    os.mkdir(cache_path)
578
578
            #    store = bzrlib.store.CachedStore(store, cache_path)
579
579
            return store
 
580
 
580
581
        def get_weave(name, prefixed=False):
581
 
            relpath = self._rel_controlfilename(name)
 
582
            relpath = self._rel_controlfilename(unicode(name))
582
583
            ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
583
584
            if self._transport.should_cache():
584
585
                ws.enable_cache = True
585
586
            return ws
586
587
 
587
588
        if self._branch_format == 4:
588
 
            self.inventory_store = get_store(u'inventory-store')
589
 
            self.text_store = get_store(u'text-store')
590
 
            self.revision_store = get_store(u'revision-store')
 
589
            self.inventory_store = get_store('inventory-store')
 
590
            self.text_store = get_store('text-store')
 
591
            self.revision_store = get_store('revision-store')
591
592
        elif self._branch_format == 5:
592
593
            self.control_weaves = get_weave(u'')
593
594
            self.weave_store = get_weave(u'weaves')