Rev 3493: Remove the step to fill in descended_from during _find_mainline_ancestor in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno

------------------------------------------------------------
revno: 3493
revision-id: john at arbash-meinel.com-20080804162448-wq0g9e04eu63qdrp
parent: john at arbash-meinel.com-20080802152547-g1wkw760939vkuem
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_revno
timestamp: Mon 2008-08-04 11:24:48 -0500
message:
  Remove the step to fill in descended_from during _find_mainline_ancestor
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2008-08-02 15:14:05 +0000
+++ b/bzrlib/graph.py	2008-08-04 16:24:48 +0000
@@ -1633,17 +1633,18 @@
         #       branch (mainline_node is None)
         # Now that we have searched the ancestry of cur_node, we can give
         # direct information about the nodes
-        mainline_revision_id = mainline_node.revision_id
-        mainline_revno = mainline_node.revno
-        next_node = node
-        while next_node is not None:
-            if next_node.descended_from is not None:
-                break
-            next_node.descended_from = mainline_revno
-            if not next_node.parent_ids:
-                next_node = None
-            else:
-                next_node = self._get_node(next_node.parent_ids[0])
+        # TODO: I probably don't want to do this here, but instead wait until
+        #       later.
+        # mainline_revno = mainline_node.revno
+        # next_node = node
+        # while next_node is not None:
+        #     if next_node.descended_from is not None:
+        #         break
+        #     next_node.descended_from = mainline_revno
+        #     if not next_node.parent_ids:
+        #         next_node = None
+        #     else:
+        #         next_node = self._get_node(next_node.parent_ids[0])
 
         return mainline_node
 

=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py	2008-08-02 15:25:47 +0000
+++ b/bzrlib/tests/test_graph.py	2008-08-04 16:24:48 +0000
@@ -1441,10 +1441,6 @@
         self.assertEqual('e', node.revision_id)
         self.assertEqual(5, node.revno)
         self.assertEqual(5, node.descended_from)
-        self.assertEqual(5, mapper._get_node('g').descended_from)
-        # Nodes that other walked should have their revno set
-        self.assertEqual(4, mapper._get_node('d').revno)
-        self.assertEqual(3, mapper._get_node('c').revno)
 
     def test__find_mainline_ancestor_same_time(self):
         # They should arrive at the same time
@@ -1454,9 +1450,6 @@
         self.assertEqual('e', node.revision_id)
         self.assertEqual(5, node.revno)
         self.assertEqual(5, node.descended_from)
-        self.assertEqual(5, mapper._get_node('k').descended_from)
-        # Nodes we had to walk should have their descended_from set
-        self.assertEqual(5, mapper._get_node('j').descended_from)
 
     def test__find_mainline_ancestor_mainline_first(self):
         # The mainline arrives first
@@ -1466,9 +1459,6 @@
         self.assertEqual('e', node.revision_id)
         self.assertEqual(5, node.revno)
         self.assertEqual(5, node.descended_from)
-        self.assertEqual(5, mapper._get_node('k').descended_from)
-        # Nodes we had to walk should have their descended_from set
-        self.assertEqual(5, mapper._get_node('j').descended_from)
 
     def test__find_mainline_ancestor_on_mainline(self):
         # This node is *on* the mainline
@@ -1477,10 +1467,6 @@
         self.assertEqual('h', node.revision_id)
         self.assertEqual(7, node.revno)
         self.assertEqual(7, node.descended_from)
-        self.assertEqual(7, mapper._get_node('h').descended_from)
-        # Mainline nodes we walked should have their revno set
-        self.assertEqual(6, mapper._get_node('f').revno)
-        self.assertEqual(5, mapper._get_node('e').revno)
 
     def test__get_interesting_mainline_parent_ids_trivial(self):
         mapper = self.make_mapper(with_tail, 'l', break_on=['a', 'b', 'c', 'd'])