Rev 3529: Revert the is_ghost workaround, because it was incorrect anyway. 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: 3529
revision-id: john at arbash-meinel.com-20090120204747-n99z00a1jpr2k58k
parent: john at arbash-meinel.com-20090120204047-bynqn7ulohbqwacp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_revno
timestamp: Tue 2009-01-20 14:47:47 -0600
message:
  Revert the is_ghost workaround, because it was incorrect anyway.
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2009-01-20 20:40:47 +0000
+++ b/bzrlib/graph.py	2009-01-20 20:47:47 +0000
@@ -1505,7 +1505,6 @@
         self.descended_from = None
         self.mainline_revno = None
         self.merged_into = None
-        self.is_ghost = False
 
     def __repr__(self):
         return ('%s(%s, revno:%s desc:%s merged:%s mainline:%s'
@@ -1708,7 +1707,6 @@
                     # shortcut to NULL_REVISION which unifies the handling of
                     # ghosts and roots, which is how merge_sort behaves.
                     cur_parent_ids = (revision.NULL_REVISION,)
-                    cur_node.is_ghost = True
                     null_node = self._get_node(revision.NULL_REVISION)
                     null_node.known_children.add(cur_node.revision_id)
 
@@ -1877,7 +1875,6 @@
                         # have to do for _find_mainline_ancestor
                         null_node = self._get_node(revision.NULL_REVISION)
                         null_node.known_children.add(node.revision_id)
-                        node.is_ghost = True
                     node.parent_ids = next_parent_ids
 
                 if (not node.parent_ids or node.descended_from is not None
@@ -2035,8 +2032,6 @@
                 if parent_id in searching:
                     continue
                 parent_node = self._get_node(parent_id)
-                if parent_node.is_ghost:
-                    continue
                 searching.add(parent_id)
                 search_stack.append(parent_node)