Rev 3529: Enable collapsing linear regions. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/weave_merge

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3529
revision-id: john at arbash-meinel.com-20080713043610-od4tckswbijsvakv
parent: john at arbash-meinel.com-20080713040616-fl43f8inkw19qj2l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: weave_merge
timestamp: Sat 2008-07-12 23:36:10 -0500
message:
  Enable collapsing linear regions.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-07-13 04:06:16 +0000
+++ b/bzrlib/merge.py	2008-07-13 04:36:10 +0000
@@ -1484,8 +1484,6 @@
             base_key. base_key will be included. References to nodes outside of
             the ancestor set will also be removed.
         """
-        # TODO: (performance) We could also "collapse" the graph at this point,
-        #       to remove uninteresting linear chains of revisions.
         # TODO: this would be simpler if find_unique_ancestors took a list
         #       instead of a single tip, internally it supports it, but it
         #       isn't a "backwards compatible" api change.
@@ -1510,8 +1508,8 @@
             tails.remove(base_key)
             self._prune_tails(culled_parent_map, child_map, tails)
         # Now remove all the uninteresting 'linear' regions
-        # simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
-        return culled_parent_map
+        simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
+        return simple_map
 
     @staticmethod
     def _remove_external_references(parent_map):