← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-09-22 05:18:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050922051824-263a54b20d3c54a4
- store control weaves in .bzr/, not mixed in with file weaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
75
75
                            kind_marker, is_inside_any, quotefn,
76
76
                            sha_string, sha_strings, sha_file, isdir, isfile,
77
77
                            split_lines)
78
 
from bzrlib.branch import gen_file_id, INVENTORY_FILEID, ANCESTRY_FILEID
 
78
from bzrlib.branch import gen_file_id
79
79
from bzrlib.errors import (BzrError, PointlessCommit,
80
80
                           HistoryMissing,
81
81
                           )
238
238
        """Store the inventory for the new revision."""
239
239
        inv_text = serializer_v5.write_inventory_to_string(self.new_inv)
240
240
        self.inv_sha1 = sha_string(inv_text)
241
 
        self.weave_store.add_text(INVENTORY_FILEID, self.rev_id,
242
 
                                         split_lines(inv_text), self.parents)
 
241
        s = self.branch.control_weaves
 
242
        s.add_text('inventory', self.rev_id,
 
243
                   split_lines(inv_text), self.parents)
243
244
 
244
245
 
245
246
    def _record_ancestry(self):
247
248
 
248
249
        This should be the merged ancestry of all parents, plus the
249
250
        new revision id."""
250
 
        w = self.weave_store.get_weave_or_empty(ANCESTRY_FILEID)
 
251
        s = self.branch.control_weaves
 
252
        w = s.get_weave_or_empty('ancestry')
251
253
        lines = self._make_ancestry(w)
252
254
        w.add(self.rev_id, self.parents, lines)
253
 
        self.weave_store.put_weave(ANCESTRY_FILEID, w)
 
255
        s.put_weave('ancestry', w)
254
256
 
255
257
 
256
258
    def _make_ancestry(self, ancestry_weave):