/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.py

  • Committer: Robert Collins
  • Date: 2008-06-17 05:02:34 UTC
  • mto: This revision was merged to the branch mainline in revision 3510.
  • Revision ID: robertc@robertcollins.net-20080617050234-knib0hpz6pjx3sl1
Review feedback, making things more clear, adding documentation on what is used where.

Show diffs side-by-side

added added

removed removed

Lines of Context:
305
305
        """Write bundle records for all revisions of all files"""
306
306
        texts = self.repository.texts
307
307
        text_keys = []
308
 
        for file_id, revision_ids in \
309
 
            self.repository.fileids_altered_by_revision_ids(
310
 
                self.revision_ids).iteritems():
311
 
            revision_ids = list(revision_ids)
 
308
        altered_fileids = self.repository.fileids_altered_by_revision_ids(
 
309
                self.revision_ids)
 
310
        for file_id, revision_ids in altered_fileids.iteritems():
312
311
            for revision_id in revision_ids:
313
312
                text_keys.append((file_id, revision_id))
314
313
        self.add_mp_records_keys('file', texts, text_keys)
527
526
        d_func = multiparent.MultiParent.from_patch
528
527
        vf_records = []
529
528
        for key, meta, text in records:
530
 
            # Adapt to tuple interface:
 
529
            # Adapt to tuple interface: A length two key is a file_id,
 
530
            # revision_id pair, a length 1 key is a
 
531
            # revision/signature/inventory. We need to do this because
 
532
            # the metadata extraction from the bundle has not yet been updated
 
533
            # to use the consistent tuple interface itself.
531
534
            if len(key) == 2:
532
535
                prefix = key[:1]
533
536
            else: