← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2005-09-22 12:01:39 UTC
  • Revision ID: mbp@sourcefrog.net-20050922120139-4e4bb17a5e19360b
- in upgrade, avoiding loading file texts unless necessary

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
336
336
        if w is None:
337
337
            w = Weave(file_id)
338
338
            self.text_weaves[file_id] = w
339
 
        file_lines = self.branch.text_store[ie.text_id].readlines()
340
 
        assert sha_strings(file_lines) == ie.text_sha1
341
 
        assert sum(map(len, file_lines)) == ie.text_size
342
339
        file_parents = []
343
340
        text_changed = False
344
341
        for parent_id in rev.parent_ids:
356
353
                if parent_ie.text_sha1 != ie.text_sha1:
357
354
                    text_changed = True
358
355
        if len(file_parents) != 1 or text_changed:
 
356
            file_lines = self.branch.text_store[ie.text_id].readlines()
 
357
            assert sha_strings(file_lines) == ie.text_sha1
 
358
            assert sum(map(len, file_lines)) == ie.text_size
359
359
            w.add(rev_id, file_parents, file_lines, ie.text_sha1)
360
360
            ie.text_version = rev_id
361
361
            self.text_count += 1