Rev 3564: Make 'resolver' a required parameter. 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: 3564
revision-id: john at arbash-meinel.com-20080905015625-lgq0wbqxt9ov3l6v
parent: john at arbash-meinel.com-20080905015446-8dp5zn229wqv0zs1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Thu 2008-09-04 20:56:25 -0500
message:
  Make 'resolver' a required parameter.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-09-05 01:54:46 +0000
+++ b/bzrlib/merge.py	2008-09-05 01:56:25 +0000
@@ -1031,12 +1031,11 @@
             else:
                 names.append(entry.name)
                 parents.append(entry.parent_id)
-        return self._merge_names(file_id, parents, names)
+        return self._merge_names(file_id, parents, names,
+                                 resolver=self._three_way)
 
-    def _merge_names(self, file_id, parents, names, resolver=None):
+    def _merge_names(self, file_id, parents, names, resolver):
         """Perform a merge on file_id names and parents"""
-        if resolver is None:
-            resolver = self._three_way
         base_name, other_name, this_name = names
         base_parent, other_parent, this_parent = parents
 
@@ -1236,13 +1235,12 @@
         """Perform a merge on the execute bit."""
         executable = [self.executable(t, file_id) for t in (self.base_tree,
                       self.other_tree, self.this_tree)]
-        self._merge_executable(file_id, executable, file_status)
+        self._merge_executable(file_id, executable, file_status,
+                               resolver=self._three_way)
 
     def _merge_executable(self, file_id, executable, file_status,
-                          resolver=None):
+                          resolver):
         """Perform a merge on the execute bit."""
-        if resolver is None:
-            resolver = self._three_way
         base_executable, other_executable, this_executable = executable
         if file_status == "deleted":
             return