← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-09 15:39:14 UTC
  • mfrom: (5815.4.22 separate-vf)
  • Revision ID: pqm@pqm.ubuntu.com-20110509153914-wbwvbi34ohzwpv9k
(jelmer) Split VersionedFiles-specific bits out of bzrlib.repository into
 bzrlib.vf_repository. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
34
34
""")
35
35
from bzrlib.decorators import needs_read_lock, needs_write_lock
36
36
from bzrlib.repository import (
37
 
    CommitBuilder,
38
37
    InterRepository,
39
 
    InterSameDataRepository,
40
38
    IsInWriteGroupError,
41
 
    MetaDirRepository,
42
 
    MetaDirRepositoryFormat,
43
39
    RepositoryFormat,
44
 
    RootCommitBuilder,
 
40
    )
 
41
from bzrlib.vf_repository import (
 
42
    InterSameDataRepository,
 
43
    MetaDirVersionedFileRepository,
 
44
    MetaDirVersionedFileRepositoryFormat,
 
45
    VersionedFileCommitBuilder,
 
46
    VersionedFileRootCommitBuilder,
45
47
    )
46
48
from bzrlib import symbol_versioning
47
49
 
103
105
        return result
104
106
 
105
107
 
106
 
class KnitRepository(MetaDirRepository):
 
108
class KnitRepository(MetaDirVersionedFileRepository):
107
109
    """Knit format repository."""
108
110
 
109
111
    # These attributes are inherited from the Repository base class. Setting
115
117
 
116
118
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
117
119
        _serializer):
118
 
        MetaDirRepository.__init__(self, _format, a_bzrdir, control_files)
 
120
        super(KnitRepository, self).__init__(_format, a_bzrdir, control_files)
119
121
        self._commit_builder_class = _commit_builder_class
120
122
        self._serializer = _serializer
121
123
        self._reconcile_fixes_text_parents = True
233
235
        return _KnitsParentsProvider(self.revisions)
234
236
 
235
237
 
236
 
class RepositoryFormatKnit(MetaDirRepositoryFormat):
 
238
class RepositoryFormatKnit(MetaDirVersionedFileRepositoryFormat):
237
239
    """Bzr repository knit format (generalized).
238
240
 
239
241
    This repository format has:
269
271
    _fetch_uses_deltas = True
270
272
    fast_deltas = False
271
273
    supports_funky_characters = True
272
 
    supports_full_versioned_files = True
273
274
    # The revision.kndx could potentially claim a revision has a different
274
275
    # parent to the revision text.
275
276
    revision_graph_can_have_wrong_parents = True
381
382
    """
382
383
 
383
384
    repository_class = KnitRepository
384
 
    _commit_builder_class = CommitBuilder
 
385
    _commit_builder_class = VersionedFileCommitBuilder
385
386
    @property
386
387
    def _serializer(self):
387
388
        return xml5.serializer_v5
415
416
    """
416
417
 
417
418
    repository_class = KnitRepository
418
 
    _commit_builder_class = RootCommitBuilder
 
419
    _commit_builder_class = VersionedFileRootCommitBuilder
419
420
    rich_root_data = True
420
421
    experimental = True
421
422
    supports_tree_reference = True
457
458
    """
458
459
 
459
460
    repository_class = KnitRepository
460
 
    _commit_builder_class = RootCommitBuilder
 
461
    _commit_builder_class = VersionedFileRootCommitBuilder
461
462
    rich_root_data = True
462
463
    supports_tree_reference = False
463
464
    @property