Rev 214: Moved all merge validation from Command.do_merge to MergeCommand.check_is_valid. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

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

------------------------------------------------------------
revno: 214
revision-id: daniel at daniel-watkins.co.uk-20080801024344-cr82rlcgrsb6ohnb
parent: daniel at daniel-watkins.co.uk-20080801021025-70b2g6y5e83nfrn8
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc-validation
timestamp: Fri 2008-08-01 03:43:44 +0100
message:
  Moved all merge validation from Command.do_merge to MergeCommand.check_is_valid.
-------------- next part --------------
=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-08-01 02:09:49 +0000
+++ b/pqm/script.py	2008-08-01 02:43:44 +0000
@@ -402,12 +402,7 @@
         start_time = datetime.now()
         sender = self.script.getSender()
         # Star-merge
-        self.check_target(to_repo_revision, line)
-        to_repo_revision, config = self.getBranchConfig(to_repo_revision)
-        self.set_current_vcs(from_repo_revision, to_repo_revision)
-        self.validate_revision(from_repo_revision)
-        self.validate_revision(to_repo_revision)
-        self.check_commit_regex(to_repo_revision, config)
+        self.check_is_valid()
         logger = self.script.logger
         logger.info("current cwd is %s", os.getcwd())
         logger.info("getting working dir for %s", to_repo_revision)
@@ -689,7 +684,10 @@
     def check_is_valid(self):
         self.check_target(self.to_branch, self.line)
         b, config = self.getBranchConfig(self.to_branch)
-        self.check_commit_regex(self.to_branch, config)
+        self.set_current_vcs(self.from_branch, b)
+        self.validate_revision(self.from_branch)
+        self.validate_revision(b)
+        self.check_commit_regex(b, config)
 
 
 class PrecommitCommand(Command):