~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Aaron Bentley
  • Date: 2006-08-15 03:09:14 UTC
  • mto: (1910.2.43 format-bumps)
  • mto: This revision was merged to the branch mainline in revision 1922.
  • Revision ID: aaron.bentley@utoronto.ca-20060815030914-dfff3234aefe3819
Update for merge review, handle deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
        assert inv.revision_id is None or inv.revision_id == revid, \
71
71
            "Mismatch between inventory revision" \
72
72
            " id and insertion revid (%r, %r)" % (inv.revision_id, revid)
 
73
        assert inv.root is not None
73
74
        inv_text = xml5.serializer_v5.write_inventory_to_string(inv)
74
75
        inv_sha1 = osutils.sha_string(inv_text)
75
76
        inv_vf = self.control_weaves.get_weave('inventory',
256
257
        :param revprops: Optional dictionary of revision properties.
257
258
        :param revision_id: Optional revision id.
258
259
        """
259
 
        return NewCommitBuilder(self, parents, config, timestamp, timezone,
260
 
                                committer, revprops, revision_id)
 
260
        return _CommitBuilder(self, parents, config, timestamp, timezone,
 
261
                              committer, revprops, revision_id)
261
262
 
262
263
    def unlock(self):
263
264
        self.control_files.unlock()
2140
2141
        versionedfile.clear_cache()
2141
2142
 
2142
2143
 
2143
 
class NewCommitBuilder(CommitBuilder):
 
2144
class _CommitBuilder(CommitBuilder):
2144
2145
    """Temporary class so old CommitBuilders are detected properly
2145
2146
    
2146
2147
    Note: CommitBuilder works whether or not root entry is recorded.