← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/weaverepo.py

Reconcile NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/weaverepo.py
37
37
from bzrlib.decorators import needs_read_lock, needs_write_lock
38
38
from bzrlib.repository import (
39
39
    CommitBuilder,
40
 
    MetaDirRepository,
 
40
    MetaDirVersionedFileRepository,
41
41
    MetaDirRepositoryFormat,
42
42
    Repository,
43
43
    RepositoryFormat,
77
77
            self.inventory_store = get_store('inventory-store')
78
78
            text_store = get_store('text-store')
79
79
        super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
 
80
        if control_store is not None:
 
81
            control_store.get_scope = self.get_transaction
 
82
        text_store.get_scope = self.get_transaction
80
83
 
81
84
    @needs_read_lock
82
85
    def _all_possible_ids(self):
214
217
        return False
215
218
 
216
219
 
217
 
class WeaveMetaDirRepository(MetaDirRepository):
 
220
class WeaveMetaDirRepository(MetaDirVersionedFileRepository):
218
221
    """A subclass of MetaDirRepository to set weave specific policy."""
219
222
 
220
223
    _serializer = xml5.serializer_v5
629
632
        result = versionedfile.add_lines(
630
633
            self._new_revision_id, parents, new_lines,
631
634
            nostore_sha=nostore_sha)[0:2]
632
 
        versionedfile.clear_cache()
633
635
        return result
634
636
 
635
637