~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2006-03-02 10:51:24 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302105124-675e0bed0d749b43
get knit repositories really using knits for text storage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1473
1473
            if ie._unchanged(previous_ie):
1474
1474
                ie.revision = previous_ie.revision
1475
1475
                return
1476
 
        parent_indexes = map(w.lookup, previous_revisions)
1477
1476
        if ie.has_text():
1478
1477
            text = self.branch.repository.text_store.get(ie.text_id)
1479
1478
            file_lines = text.readlines()
1480
1479
            assert sha_strings(file_lines) == ie.text_sha1
1481
1480
            assert sum(map(len, file_lines)) == ie.text_size
1482
 
            w.add(rev_id, parent_indexes, file_lines, ie.text_sha1)
 
1481
            w.add_lines(rev_id, previous_revisions, file_lines)
1483
1482
            self.text_count += 1
1484
1483
        else:
1485
 
            w.add(rev_id, parent_indexes, [], None)
 
1484
            w.add_lines(rev_id, previous_revisions, [])
1486
1485
        ie.revision = rev_id
1487
1486
 
1488
1487
    def _make_order(self):