← 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: Canonical.com Patch Queue Manager
  • Date: 2009-06-18 19:13:45 UTC
  • mfrom: (4360.4.17 1.15-pack-source)
  • Revision ID: pqm@pqm.ubuntu.com-20090618191345-vgsr5zv78uesqsdg
(jam) Get rid of InterPackRepository in favor of PackStreamSource.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/pack_repo.py
1307
1307
        # space (we only topo sort the revisions, which is smaller).
1308
1308
        topo_order = tsort.topo_sort(ancestors)
1309
1309
        rev_order = dict(zip(topo_order, range(len(topo_order))))
1310
 
        bad_texts.sort(key=lambda key:rev_order[key[0][1]])
 
1310
        bad_texts.sort(key=lambda key:rev_order.get(key[0][1], 0))
1311
1311
        transaction = repo.get_transaction()
1312
1312
        file_id_index = GraphIndexPrefixAdapter(
1313
1313
            self.new_pack.text_index,
2295
2295
 
2296
2296
    def _resume_write_group(self, tokens):
2297
2297
        self._start_write_group()
2298
 
        self._pack_collection._resume_write_group(tokens)
 
2298
        try:
 
2299
            self._pack_collection._resume_write_group(tokens)
 
2300
        except errors.UnresumableWriteGroup:
 
2301
            self._abort_write_group()
 
2302
            raise
2299
2303
        for pack in self._pack_collection._resumed_packs:
2300
2304
            self.revisions._index.scan_unvalidated_index(pack.revision_index)
2301
2305