← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-13 04:36:10 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080713043610-od4tckswbijsvakv
Enable collapsing linear regions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1484
1484
            base_key. base_key will be included. References to nodes outside of
1485
1485
            the ancestor set will also be removed.
1486
1486
        """
1487
 
        # TODO: (performance) We could also "collapse" the graph at this point,
1488
 
        #       to remove uninteresting linear chains of revisions.
1489
1487
        # TODO: this would be simpler if find_unique_ancestors took a list
1490
1488
        #       instead of a single tip, internally it supports it, but it
1491
1489
        #       isn't a "backwards compatible" api change.
1510
1508
            tails.remove(base_key)
1511
1509
            self._prune_tails(culled_parent_map, child_map, tails)
1512
1510
        # Now remove all the uninteresting 'linear' regions
1513
 
        # simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
1514
 
        return culled_parent_map
 
1511
        simple_map = _mod_graph.collapse_linear_regions(culled_parent_map)
 
1512
        return simple_map
1515
1513
 
1516
1514
    @staticmethod
1517
1515
    def _remove_external_references(parent_map):