~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-04 21:25:46 UTC
  • mfrom: (4409 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090604212546-dpmrzvg49q40tvnj
Merge bzr.dev 4409, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
1306
1306
        # space (we only topo sort the revisions, which is smaller).
1307
1307
        topo_order = tsort.topo_sort(ancestors)
1308
1308
        rev_order = dict(zip(topo_order, range(len(topo_order))))
1309
 
        bad_texts.sort(key=lambda key:rev_order[key[0][1]])
 
1309
        bad_texts.sort(key=lambda key:rev_order.get(key[0][1], 0))
1310
1310
        transaction = repo.get_transaction()
1311
1311
        file_id_index = GraphIndexPrefixAdapter(
1312
1312
            self.new_pack.text_index,