← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Aaron Bentley
  • Date: 2007-09-17 12:46:56 UTC
  • mfrom: (2825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: abentley@panoramicfeedback.com-20070917124656-j3hhxhx9igy11mfc
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
75
75
        pass
76
76
 
77
77
    def _inventory_add_lines(self, inv_vf, revid, parents, lines, check_content):
78
 
        inv_vf.add_lines_with_ghosts(revid, parents, lines,
79
 
            check_content=check_content)
 
78
        return inv_vf.add_lines_with_ghosts(revid, parents, lines,
 
79
            check_content=check_content)[0]
80
80
 
81
81
    @needs_read_lock
82
82
    def _all_revision_ids(self):
227
227
 
228
228
class KnitRepository3(KnitRepository):
229
229
 
 
230
    _commit_builder_class = RootCommitBuilder
 
231
 
230
232
    def __init__(self, _format, a_bzrdir, control_files, _revision_store,
231
233
                 control_store, text_store):
232
234
        KnitRepository.__init__(self, _format, a_bzrdir, control_files,
253
255
        assert inv.root.revision is not None
254
256
        return KnitRepository.serialise_inventory(self, inv)
255
257
 
256
 
    def get_commit_builder(self, branch, parents, config, timestamp=None,
257
 
                           timezone=None, committer=None, revprops=None,
258
 
                           revision_id=None):
259
 
        """Obtain a CommitBuilder for this repository.
260
 
        
261
 
        :param branch: Branch to commit to.
262
 
        :param parents: Revision ids of the parents of the new revision.
263
 
        :param config: Configuration to use.
264
 
        :param timestamp: Optional timestamp recorded for commit.
265
 
        :param timezone: Optional timezone for timestamp.
266
 
        :param committer: Optional committer to set for commit.
267
 
        :param revprops: Optional dictionary of revision properties.
268
 
        :param revision_id: Optional revision id.
269
 
        """
270
 
        revision_id = osutils.safe_revision_id(revision_id)
271
 
        result = RootCommitBuilder(self, parents, config, timestamp, timezone,
272
 
                                 committer, revprops, revision_id)
273
 
        self.start_write_group()
274
 
        return result
275
 
 
276
258
 
277
259
class RepositoryFormatKnit(MetaDirRepositoryFormat):
278
260
    """Bzr repository knit format (generalized).