Rev 180: Removed use of merge_callback. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/merge-directives

------------------------------------------------------------
revno: 180
revision-id: daniel at daniel-watkins.co.uk-20080823214227-vsdg7gs5ssy8d7y7
parent: daniel at daniel-watkins.co.uk-20080823212038-tlasw6e7bn2rfjrn
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Sat 2008-08-23 22:42:27 +0100
message:
  Removed use of merge_callback.
-------------- next part --------------
=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-08-23 21:20:38 +0000
+++ b/pqm/script.py	2008-08-23 21:42:27 +0000
@@ -651,20 +651,14 @@
         self.do_merge(from_repo_revision=self.from_branch,
                       to_repo_revision=self.to_branch,
                       merge_name='star-merge',
-                      merge_method="do_star_merge",
                       line='merge %s %s' % (self.from_branch, self.to_branch))
         return self.successful, self.unrecognized, self.output
 
+    def _do_merge(self, sender, dir):
+        return self.get_vcs().do_star_merge(sender, self.from_branch, dir)
+
     def do_merge(self, from_repo_revision, to_repo_revision, merge_name,
-                 merge_method, line):
-        def merge_callback(sender, dir):
-            return getattr(self.get_vcs(), merge_method)(sender,
-                           from_repo_revision, dir)
-        return self._do_merge(from_repo_revision, to_repo_revision, merge_name,
-                              merge_callback, line)
-
-    def _do_merge(self, from_repo_revision, to_repo_revision, merge_name,
-                  merge_callback, line):
+                 line):
         sender = self.script.getSender()
         # Star-merge
         self.check_target(to_repo_revision, line)
@@ -686,7 +680,7 @@
             merge_line,
             '\n',
             ]
-        self.wrap_command(merge_callback, line, sender, dir)
+        self.wrap_command(self._do_merge, line, sender, dir)
         self.run_precommit(to_repo_revision, config, line, dir)
         os.chdir(origdir)
         self.log_with_status(self.script.logger, "success: %s", line)
@@ -722,16 +716,14 @@
         self.cleanup_wd()
         if self.message is not None:
             self.commitmsg = self.message
-        self.do_merge(line='merge %s %s' % (self.from_branch, self.to_branch))
+        line = 'merge %s %s' % (self.from_branch, self.to_branch)
+        self.do_merge(self.from_branch, self.to_branch, 'bzr-merge', line)
         return self.successful, self.unrecognized, self.output
 
-    def do_merge(self, line):
-        def merge_callback(sender, dir):
-            return self.get_vcs().do_bzr_merge(sender, self.revision_id,
-                                               self.testament_sha1, dir,
-                                               self.from_branch, self.bundle)
-        return self._do_merge(self.from_branch, self.to_branch, 'bzr-merge',
-                              merge_callback, line)
+    def _do_merge(self, sender, dir):
+        return self.get_vcs().do_bzr_merge(sender, self.revision_id,
+                                           self.testament_sha1, dir,
+                                           self.from_branch, self.bundle)
 
     def __eq__(self, other):
         return (super(ExtendedMergeCommand, self).__eq__(other) and