/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/repository.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-30 22:13:29 UTC
  • mto: This revision was merged to the branch mainline in revision 3063.
  • Revision ID: john@arbash-meinel.com-20071130221329-thu3lcbolzqliilw
Suggested by Robert: Move the missing externals check into part of Packer.pack()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2558
2558
        pack = Packer(self.target._pack_collection, packs, '.fetch',
2559
2559
            revision_ids).pack()
2560
2560
        if pack is not None:
2561
 
            external_refs = pack._external_compression_parents_of_texts()
2562
 
            if external_refs:
2563
 
                index = self.target._pack_collection.text_index.combined_index
2564
 
                found_items = list(index.iter_entries(external_refs))
2565
 
                if len(found_items) != len(external_refs):
2566
 
                    found_keys = set(k for idx, k, refs, value in found_items)
2567
 
                    missing_items = external_refs - found_keys
2568
 
                    missing_file_id, missing_revision_id = missing_items.pop()
2569
 
                    raise errors.MissingText(self.target, missing_revision_id,
2570
 
                                             missing_file_id)
2571
2561
            self.target._pack_collection._save_pack_names()
2572
2562
            # Trigger an autopack. This may duplicate effort as we've just done
2573
2563
            # a pack creation, but for now it is simpler to think about as