Rev 2641: Review feedback. in http://people.ubuntu.com/~robertc/baz2.0/index

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/index

------------------------------------------------------------
revno: 2641
revision-id: robertc at robertcollins.net-20070808044555-10k443n441f093dx
parent: robertc at robertcollins.net-20070807054430-65ige2n2869mp7t4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: index
timestamp: Wed 2007-08-08 14:45:55 +1000
message:
  Review feedback.
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2007-08-07 05:44:30 +0000
+++ b/bzrlib/index.py	2007-08-08 04:45:55 +0000
@@ -674,7 +674,7 @@
                 if self.reference_lists:
                     yield self, key, node[2], node[1]
                 else:
-                    yield self ,key, node[2]
+                    yield self, key, node[2]
             return
         for key in keys:
             # sanity check
@@ -730,11 +730,12 @@
     nodes and references being added will have prefix prepended.
     """
 
-    def __init__(self, adapted, prefix, missing_key_length, add_nodes_callback=None):
+    def __init__(self, adapted, prefix, missing_key_length,
+        add_nodes_callback=None):
         """Construct an adapter against adapted with prefix."""
         self.adapted = adapted
         self.prefix = prefix + (None,)*missing_key_length
-        self.prefix_key = prefix
+        self.prefix = prefix
         self.prefix_len = len(prefix)
         self.add_nodes_callback = add_nodes_callback
 
@@ -747,18 +748,20 @@
         nodes = tuple(nodes)
         translated_nodes = []
         try:
+            # Add prefix_key to each reference node_refs is a tuple of tuples,
+            # so split it apart, and add prefix_key to the internal reference
             for (key, value, node_refs) in nodes:
                 adjusted_references = (
-                    tuple(tuple(self.prefix_key + ref_node for ref_node in ref_list)
+                    tuple(tuple(self.prefix + ref_node for ref_node in ref_list)
                         for ref_list in node_refs))
-                translated_nodes.append((self.prefix_key + key, value,
+                translated_nodes.append((self.prefix + key, value,
                     adjusted_references))
         except ValueError:
             # XXX: TODO add an explicit interface for getting the reference list
             # status, to handle this bit of user-friendliness in the API more 
             # explicitly.
             for (key, value) in nodes:
-                translated_nodes.append((self.prefix_key + key, value))
+                translated_nodes.append((self.prefix + key, value))
         self.add_nodes_callback(translated_nodes)
 
     def add_node(self, key, value, references=()):
@@ -778,11 +781,11 @@
         """Strip prefix data from nodes and return it."""
         for node in an_iter:
             # cross checks
-            if node[1][:self.prefix_len] != self.prefix_key:
+            if node[1][:self.prefix_len] != self.prefix:
                 raise errors.BadIndexData(self)
             for ref_list in node[3]:
                 for ref_node in ref_list:
-                    if ref_node[:self.prefix_len] != self.prefix_key:
+                    if ref_node[:self.prefix_len] != self.prefix:
                         raise errors.BadIndexData(self)
             yield node[0], node[1][self.prefix_len:], node[2], (
                 tuple(tuple(ref_node[self.prefix_len:] for ref_node in ref_list)
@@ -809,7 +812,7 @@
             efficient order for the index (keys iteration order in this case).
         """
         return self._strip_prefix(self.adapted.iter_entries(
-            self.prefix_key + key for key in keys))
+            self.prefix + key for key in keys))
 
     def iter_entries_prefix(self, keys):
         """Iterate over keys within the index using prefix matching.
@@ -829,7 +832,7 @@
             returned.
         """
         return self._strip_prefix(self.adapted.iter_entries_prefix(
-            self.prefix_key + key for key in keys))
+            self.prefix + key for key in keys))
 
     def key_count(self):
         """Return an estimate of the number of keys in this index.

=== modified file 'bzrlib/tests/test_index.py'
--- a/bzrlib/tests/test_index.py	2007-08-07 05:44:30 +0000
+++ b/bzrlib/tests/test_index.py	2007-08-08 04:45:55 +0000
@@ -354,8 +354,8 @@
 
     def make_index(self, ref_lists=0, key_elements=1, nodes=[]):
         builder = GraphIndexBuilder(ref_lists, key_elements=key_elements)
-        for node, value, references in nodes:
-            builder.add_node(node, value, references)
+        for key, value, references in nodes:
+            builder.add_node(key, value, references)
         stream = builder.finish()
         trans = self.get_transport()
         trans.put_file('index', stream)
@@ -535,8 +535,8 @@
 
     def make_index(self, name, ref_lists=0, key_elements=1, nodes=[]):
         builder = GraphIndexBuilder(ref_lists, key_elements=key_elements)
-        for node, value, references in nodes:
-            builder.add_node(node, value, references)
+        for key, value, references in nodes:
+            builder.add_node(key, value, references)
         stream = builder.finish()
         trans = self.get_transport()
         trans.put_file(name, stream)
@@ -822,9 +822,9 @@
         result = InMemoryGraphIndex(ref_lists, key_elements=key_elements)
         result.add_nodes(nodes)
         if add_callback:
-            add_nodes_callback=result.add_nodes
+            add_nodes_callback = result.add_nodes
         else:
-            add_nodes_callback=None
+            add_nodes_callback = None
         adapter = GraphIndexPrefixAdapter(result, ('prefix', ), key_elements - 1,
             add_nodes_callback=add_nodes_callback)
         return result, adapter