Merge lp:~james-w/tarmac/lock-contention into lp:tarmac

[James Westby]

Ignore LockContention errors when trying to merge a branch.

(from the u1 fork)

Unmerged revisions

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2013-02-01 17:15:24 +0000
+++ tarmac/bin/commands.py	2013-02-01 17:15:24 +0000
@@ -5,7 +5,7 @@
 import re
 
 from bzrlib.commands import Command
-from bzrlib.errors import PointlessMerge
+from bzrlib.errors import PointlessMerge, LockContention
 from bzrlib.help import help_commands
 from launchpadlib.launchpad import Launchpad
 from launchpadlib.uris import (LPNET_SERVICE_ROOT,
@@ -163,12 +163,8 @@
         target = Branch.create(lp_branch, self.config, create_tree=True)
 
         self.logger.debug('Firing tarmac_pre_merge hook')
-<<<<<<< TREE
         tarmac_hooks.fire('tarmac_pre_merge',
                           self, target)
-=======
-        tarmac_hooks['tarmac_pre_merge'].fire(self, target)
->>>>>>> MERGE-SOURCE
 
         success_count = 0
         try:
@@ -286,19 +282,12 @@
                              reviews=self._get_reviews(proposal))
 
                 self.logger.debug('Firing tarmac_post_commit hook')
-<<<<<<< TREE
                 tarmac_hooks.fire('tarmac_post_commit',
                                   self, target, source, proposal)
                 success_count += 1
                 target.cleanup()
-=======
-                tarmac_hooks['tarmac_post_commit'].fire(
-                    self, target, source, proposal)
-
-                # If we've been asked to only merge one branch, then exit.
                 if self.config.one:
                     return True
->>>>>>> MERGE-SOURCE
 
         # This except is here because we need the else and can't have it
         # without an except as well.
@@ -306,12 +295,8 @@
             raise
         else:
             self.logger.debug('Firing tarmac_post_merge hook')
-<<<<<<< TREE
             tarmac_hooks.fire('tarmac_post_merge',
                               self, target, success_count=success_count)
-=======
-            tarmac_hooks['tarmac_post_merge'].fire(self, target)
->>>>>>> MERGE-SOURCE
         finally:
             target.cleanup()
 
@@ -389,6 +374,8 @@
                     # If we've been asked to only merge one branch, then exit.
                     if merged and self.config.one:
                         break
+                except LockContention:
+                    continue
                 except Exception, error:
                     self.logger.error(
                         'An error occurred trying to merge %s: %s',