← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-29 21:03:18 UTC
  • mto: (1393.1.12)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050929210318-2c2f76c0331aa888
Fixing typos, updating stores, getting tests to pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
36
36
from bzrlib.delta import compare_trees
37
37
from bzrlib.tree import EmptyTree, RevisionTree
38
38
from bzrlib.inventory import Inventory
39
 
from bzrlib.weavestore import WeaveStore
40
39
from bzrlib.store import copy_all
41
40
from bzrlib.store.compressed_text import CompressedTextStore
42
41
from bzrlib.store.text import TextStore
 
42
from bzrlib.store.weave import WeaveStore
43
43
from bzrlib.transport import Transport
44
44
import bzrlib.xml5
45
45
import bzrlib.ui
257
257
            self.text_store = get_store('text-store')
258
258
            self.revision_store = get_store('revision-store')
259
259
        elif self._branch_format == 5:
260
 
            self.control_weaves = get_weave([]))
261
 
            self.weave_store = get_weave('weaves'))
 
260
            self.control_weaves = get_weave([])
 
261
            self.weave_store = get_weave('weaves')
262
262
            self.revision_store = get_store('revision-store', compressed=False)
263
263
 
264
264
    def __str__(self):