Merge lp:~james-w/tarmac/verify-command into lp:~ubuntuone-hackers/tarmac/trunk

[James Westby]

Hi,

This allows for the verify-command to be supplied as a command line argument,
allowing for running without a config file in the simplest cases.

Thanks,

James

[Jonathan Lange (jml)]

This looks like a straight-up, obvious improvement. Thanks.

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2012-12-18 21:24:40 +0000
+++ tarmac/bin/commands.py	2012-12-18 21:24:40 +0000
@@ -332,9 +332,10 @@
         options.debug_option,
         options.imply_commit_message_option,
         options.one_option,
+        options.verify_command_option,
         ]
 
-    def _do_merges(self, branch_url):
+    def _do_merges(self, branch_url, verify_command=None):
 
         lp_branch = self.launchpad.branches.getByUrl(url=branch_url)
         if lp_branch is None:
@@ -354,11 +355,13 @@
             proposals = proposals[0]
 
         target = Branch.create(lp_branch, self.config, create_tree=True)
+        if verify_command is not None:
+            setattr(target.config, 'verify_command', verify_command)
         statuses = merge_proposals(target, proposals, self.logger, self.config, self)
         return statuses
 
 
-    def run(self, branch_url=None, launchpad=None, **kwargs):
+    def run(self, branch_url=None, launchpad=None, verify_command=None, **kwargs):
         for key, value in kwargs.iteritems():
             self.config.set('Tarmac', key, value)
 
@@ -378,14 +381,14 @@
                 'branch_url': branch_url})
             if not branch_url.startswith('lp:'):
                 raise TarmacCommandError('Branch urls must start with lp:')
-            statuses.extend(self._do_merges(branch_url))
+            statuses.extend(self._do_merges(branch_url, verify_command=verify_command))
         else:
             for branch in self.config.branches:
                 self.logger.debug(
                     'Merging approved branches against %(branch)s' % {
                         'branch': branch})
                 try:
-                    statuses.extend(self._do_merges(branch))
+                    statuses.extend(self._do_merges(branch, verify_command=verify_command))
 
                     # If we've been asked to only merge one branch, then exit.
                     if statuses and self.config.one:

=== modified file 'tarmac/bin/options.py'
--- tarmac/bin/options.py	2012-05-26 04:14:45 +0000
+++ tarmac/bin/options.py	2012-12-18 21:24:40 +0000
@@ -18,3 +18,6 @@
 one_option = Option(
     'one', short_name='1',
     help='Merge only one branch and exit.')
+verify_command_option = Option(
+    'verify-command', type=str,
+    help='The verify command to run.')