Merge lp:~james-w/tarmac/one-at-a-time into lp:tarmac

[James Westby]

Add the option to only act on a single MP, useful when tarmac is used
with jenkins.

This adds the option to only act on a single MP, useful when tarmac is used
with jenkins.

(from the u1 fork)

[Paul Hummer (rockstar)]

review: Approve

[Paul Hummer (rockstar)]

The prerequisite lp:~james-w/tarmac/use-web-link has not yet been merged into lp:tarmac.

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2013-02-01 17:24:20 +0000
+++ tarmac/bin/commands.py	2013-02-01 17:24:20 +0000
@@ -142,7 +142,8 @@
     takes_options = [
         options.http_debug_option,
         options.debug_option,
-        options.imply_commit_message_option]
+        options.imply_commit_message_option,
+        options.one_option]
 
     def _do_merges(self, branch_url):
 
@@ -168,13 +169,10 @@
         success_count = 0
         try:
             for proposal in proposals:
-
+                target.cleanup()
                 self.logger.debug(
                     u'Preparing to merge %(source_branch)s' % {
                         'source_branch': proposal.source_branch.web_link})
-                source = Branch.create(
-                    proposal.source_branch, self.config, target=target)
-
                 try:
                     prerequisite = proposal.prerequisite_branch
                     if prerequisite:
@@ -208,9 +206,14 @@
                         raise TarmacMergeError(
                             u'No approved revision specified.')
 
+
+                    source = Branch.create(
+                        proposal.source_branch, self.config, target=target)
+
                     approved = source.bzr_branch.revision_id_to_revno(
                         str(proposal.reviewed_revid))
                     tip = source.bzr_branch.revno()
+
                     if tip > approved:
                         message = u'Unapproved changes made after approval'
                         lp_comment = (
@@ -253,7 +256,11 @@
                     except AttributeError:
                         proposal.setStatus(status=u'Needs review')
                     proposal.lp_save()
-                    target.cleanup()
+
+                    # If we've been asked to only merge one branch, then exit.
+                    if self.config.one:
+                        return True
+
                     continue
                 except PointlessMerge:
                     self.logger.warn(
@@ -261,7 +268,6 @@
                         'pointless.' % {
                             'source': proposal.source_branch.web_link,
                             'target': proposal.target_branch.web_link})
-                    target.cleanup()
                     continue
 
                 merge_url = get_review_url(proposal)
@@ -280,6 +286,8 @@
                                   self, target, source, proposal)
                 success_count += 1
                 target.cleanup()
+                if self.config.one:
+                    return True
 
         # This except is here because we need the else and can't have it
         # without an except as well.
@@ -361,7 +369,11 @@
                     'Merging approved branches against %(branch)s' % {
                         'branch': branch})
                 try:
-                    self._do_merges(branch)
+                    merged = self._do_merges(branch)
+
+                    # If we've been asked to only merge one branch, then exit.
+                    if merged and self.config.one:
+                        break
                 except Exception, error:
                     self.logger.error(
                         'An error occurred trying to merge %s: %s',

=== modified file 'tarmac/bin/options.py'
--- tarmac/bin/options.py	2011-01-06 20:20:19 +0000
+++ tarmac/bin/options.py	2013-02-01 17:24:20 +0000
@@ -15,3 +15,6 @@
     'imply-commit-message',
     help=("Use the description as a commit message if the branch "
           "doesn't have a message"))
+one_option = Option(
+    'one', short_name='1',
+    help='Merge only one branch and exit.')