Rev 3563: Use self._lca_multi_way rather than Merge3Merger._lca_multi_way by Aaron's request. in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3563
revision-id: john at arbash-meinel.com-20080905015446-8dp5zn229wqv0zs1
parent: john at arbash-meinel.com-20080904232306-x03g8pgnwfiyiu8w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Thu 2008-09-04 20:54:46 -0500
message:
  Use self._lca_multi_way rather than Merge3Merger._lca_multi_way by Aaron's request.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-08-01 18:04:17 +0000
+++ b/bzrlib/merge.py	2008-09-05 01:54:46 +0000
@@ -97,7 +97,7 @@
         self._revision_graph = revision_graph
         self._base_is_ancestor = None
         self._base_is_other_ancestor = None
-        self._is_criss_cross = False
+        self._is_criss_cross = None
         self._lca_trees = None
 
     @property
@@ -357,8 +357,10 @@
         if NULL_REVISION in revisions:
             self.base_rev_id = NULL_REVISION
             self.base_tree = self.revision_tree(self.base_rev_id)
+            self._is_criss_cross = False
         else:
             lcas = self.revision_graph.find_lca(revisions[0], revisions[1])
+            self._is_criss_cross = False
             if len(lcas) == 0:
                 self.base_rev_id = NULL_REVISION
             elif len(lcas) == 1:
@@ -705,7 +707,6 @@
         else:
             interesting_ids = self.interesting_ids
         result = []
-        # XXX: Do we want a better sort order than this?
         walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
 
         base_inventory = self.base_tree.inventory
@@ -763,13 +764,13 @@
                 lca_names.append(lca_ie.name)
                 lca_executable.append(lca_ie.executable)
 
-            kind_winner = Merge3Merger._lca_multi_way(
+            kind_winner = self._lca_multi_way(
                 (base_ie.kind, lca_kinds),
                 other_ie.kind, this_ie.kind)
-            parent_id_winner = Merge3Merger._lca_multi_way(
+            parent_id_winner = self._lca_multi_way(
                 (base_ie.parent_id, lca_parent_ids),
                 other_ie.parent_id, this_ie.parent_id)
-            name_winner = Merge3Merger._lca_multi_way(
+            name_winner = self._lca_multi_way(
                 (base_ie.name, lca_names),
                 other_ie.name, this_ie.name)
 
@@ -795,10 +796,10 @@
                                  in zip(lca_entries, self._lca_trees)]
                     this_sha1 = get_sha1(this_ie, self.this_tree)
                     other_sha1 = get_sha1(other_ie, self.other_tree)
-                    sha1_winner = Merge3Merger._lca_multi_way(
+                    sha1_winner = self._lca_multi_way(
                         (base_sha1, lca_sha1s), other_sha1, this_sha1,
                         allow_overriding_lca=False)
-                    exec_winner = Merge3Merger._lca_multi_way(
+                    exec_winner = self._lca_multi_way(
                         (base_ie.executable, lca_executable),
                         other_ie.executable, this_ie.executable)
                     if (parent_id_winner == 'this' and name_winner == 'this'
@@ -818,7 +819,7 @@
                                    in zip(lca_entries, self._lca_trees)]
                     this_target = get_target(this_ie, self.this_tree)
                     other_target = get_target(other_ie, self.other_tree)
-                    target_winner = Merge3Merger._lca_multi_way(
+                    target_winner = self._lca_multi_way(
                         (base_target, lca_targets),
                         other_target, this_target)
                     if (parent_id_winner == 'this' and name_winner == 'this'