← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: Robert Collins
  • Date: 2007-12-03 19:26:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3070.
  • Revision ID: robertc@robertcollins.net-20071203192640-4sv1t0zsup9p8x8t
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
926
926
        # 1) generate the ideal index
927
927
        repo = self._pack_collection.repo
928
928
        ancestors = dict([(key[0], tuple(ref[0] for ref in refs[0])) for
929
 
            _, key, _2, refs in 
 
929
            _1, key, _2, refs in 
930
930
            self.new_pack.revision_index.iter_all_entries()])
931
931
        ideal_index = repo._generate_text_key_index(self._text_refs, ancestors)
932
932
        # 2) generate a text_nodes list that contains all the deltas that can
967
967
        # we're finished with some data.
968
968
        del ideal_index
969
969
        del text_nodes
970
 
        # 4) bulk copy the ok data
 
970
        # 3) bulk copy the ok data
971
971
        list(self._copy_nodes_graph(ok_nodes, text_index_map,
972
972
            self.new_pack._writer, self.new_pack.text_index))
973
973
        # 4) adhoc copy all the other texts.
1023
1023
            knit_index._add_callback = file_id_index.add_nodes
1024
1024
            output_knit.add_lines_with_ghosts(
1025
1025
                key[1], parents, text_lines, random_id=True, check_content=False)
1026
 
        # 4) check that nothing inserted has a reference outside the keyspace.
 
1026
        # 5) check that nothing inserted has a reference outside the keyspace.
1027
1027
        missing_text_keys = self.new_pack._external_compression_parents_of_texts()
1028
1028
        if missing_text_keys:
1029
1029
            raise errors.BzrError('Reference to missing compression parents %r'