Rev 3389: Remove the helpful but ugly thunk in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/find_differences

------------------------------------------------------------
revno: 3389
revision-id: john at arbash-meinel.com-20080423022725-rtmlxj6nt36xn79q
parent: john at arbash-meinel.com-20080423022026-mpxr9mafum9rcocz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: find_differences
timestamp: Tue 2008-04-22 21:27:25 -0500
message:
  Remove the helpful but ugly thunk
modified:
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
-------------- next part --------------
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py	2008-04-23 02:20:26 +0000
+++ b/bzrlib/graph.py	2008-04-23 02:27:25 +0000
@@ -870,28 +870,18 @@
         else:
             not_searched_yet = ()
         pending.difference_update(not_searched_yet)
-        #import pdb; pdb.set_trace()
         get_parent_map = self._parents_provider.get_parent_map
-        orig_gpm = self._parents_provider._parents_provider._real_provider.get_parent_map
-        def get_parent_map_debug_thunk(*args, **kwargs):
-            import pdb; pdb.set_trace()
-            return orig_gpm(*args, **kwargs)
-        # break self._parents_provider._parents_provider._real_provider.get_parent_map
-        try:
-            self._parents_provider._parents_provider._real_provider.get_parent_map = get_parent_map_debug_thunk
-            while pending:
-                parent_map = get_parent_map(pending)
-                all_parents = []
-                # We don't care if it is a ghost, since it can't be seen if it is
-                # a ghost
-                for parent_ids in parent_map.itervalues():
-                    all_parents.extend(parent_ids)
-                next_pending = all_seen.intersection(all_parents).difference(seen_ancestors)
-                seen_ancestors.update(next_pending)
-                next_pending.difference_update(not_searched_yet)
-                pending = next_pending
-        finally:
-            self._parents_provider._parents_provider._real_provider.get_parent_map = orig_gpm
+        while pending:
+            parent_map = get_parent_map(pending)
+            all_parents = []
+            # We don't care if it is a ghost, since it can't be seen if it is
+            # a ghost
+            for parent_ids in parent_map.itervalues():
+                all_parents.extend(parent_ids)
+            next_pending = all_seen.intersection(all_parents).difference(seen_ancestors)
+            seen_ancestors.update(next_pending)
+            next_pending.difference_update(not_searched_yet)
+            pending = next_pending
 
         return seen_ancestors