← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-02 17:07:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5844.
  • Revision ID: jelmer@samba.org-20110502170716-mp5l2k4l4m5b3cw6
split out versionedfile-specific stuff from commitbuilder.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/repository.py
49
49
    )
50
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
51
51
from bzrlib.repository import (
52
 
    CommitBuilder,
53
52
    InterRepository,
54
53
    InterSameDataRepository,
55
54
    MetaDirVersionedFileRepository,
63
62
    FulltextContentFactory,
64
63
    VersionedFiles,
65
64
    )
 
65
from bzrlib.vf_repository import (
 
66
    VersionedFileCommitBuilder,
 
67
    )
66
68
 
67
69
from bzrlib.plugins.weave_fmt import bzrdir as weave_bzrdir
68
70
 
147
149
                           timezone=None, committer=None, revprops=None,
148
150
                           revision_id=None, lossy=False):
149
151
        self._check_ascii_revisionid(revision_id, self.get_commit_builder)
150
 
        result = CommitBuilder(self, parents, config, timestamp, timezone,
151
 
                              committer, revprops, revision_id, lossy=lossy)
 
152
        result = VersionedFileCommitBuilder(self, parents, config, timestamp,
 
153
            timezone, committer, revprops, revision_id, lossy=lossy)
152
154
        self.start_write_group()
153
155
        return result
154
156
 
236
238
                           timezone=None, committer=None, revprops=None,
237
239
                           revision_id=None, lossy=False):
238
240
        self._check_ascii_revisionid(revision_id, self.get_commit_builder)
239
 
        result = CommitBuilder(self, parents, config, timestamp, timezone,
240
 
                              committer, revprops, revision_id, lossy=lossy)
 
241
        result = VersionedFileCommitBuilder(self, parents, config, timestamp,
 
242
            timezone, committer, revprops, revision_id, lossy=lossy)
241
243
        self.start_write_group()
242
244
        return result
243
245