Rev 5154: Restore the indices_info variable. in http://bazaar.launchpad.net/~jameinel/bzr/2.2-move-to-front-if-changed-562429

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.2-move-to-front-if-changed-562429

------------------------------------------------------------
revno: 5154
revision-id: john at arbash-meinel.com-20100414050559-r2y3qtq8hli1tkp3
parent: john at arbash-meinel.com-20100414050401-35jjdm3sl27far7t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.2-move-to-front-if-changed-562429
timestamp: Wed 2010-04-14 00:05:59 -0500
message:
  Restore the indices_info variable.
  
  Code is clearer, and isn't broken under -Dindex. :)
-------------- next part --------------
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2010-04-14 05:04:01 +0000
+++ b/bzrlib/index.py	2010-04-14 05:05:59 +0000
@@ -1431,6 +1431,7 @@
         
         Returns a list of names corresponding to the hit_indices param.
         """
+        indices_info = zip(self._index_names, self._indices)
         if 'index' in debug.debug_flags:
             mutter('CombinedGraphIndex reordering: currently %r, promoting %r',
                    indices_info, hit_indices)
@@ -1439,8 +1440,7 @@
         new_hit_indices = []
         unhit_indices = []
 
-        for offset, (name, idx) in enumerate(zip(self._index_names,
-                                                 self._indices)):
+        for offset, (name, idx) in enumerate(indices_info):
             if idx in hit_indices:
                 new_hit_indices.append(idx)
                 hit_names.append(name)