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

  • Committer: John Arbash Meinel
  • Date: 2010-04-14 05:05:59 UTC
  • mto: (5050.3.2 2.2)
  • mto: This revision was merged to the branch mainline in revision 5157.
  • Revision ID: john@arbash-meinel.com-20100414050559-r2y3qtq8hli1tkp3
Restore the indices_info variable.

Code is clearer, and isn't broken under -Dindex. :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1431
1431
        
1432
1432
        Returns a list of names corresponding to the hit_indices param.
1433
1433
        """
 
1434
        indices_info = zip(self._index_names, self._indices)
1434
1435
        if 'index' in debug.debug_flags:
1435
1436
            mutter('CombinedGraphIndex reordering: currently %r, promoting %r',
1436
1437
                   indices_info, hit_indices)
1439
1440
        new_hit_indices = []
1440
1441
        unhit_indices = []
1441
1442
 
1442
 
        for offset, (name, idx) in enumerate(zip(self._index_names,
1443
 
                                                 self._indices)):
 
1443
        for offset, (name, idx) in enumerate(indices_info):
1444
1444
            if idx in hit_indices:
1445
1445
                new_hit_indices.append(idx)
1446
1446
                hit_names.append(name)