Merge lp:~dobey/tarmac/merge-hooks into lp:tarmac

[dobey]

Add hooks for before and after all the merges for a branch are done
Fix the introduced values in the pre/post-commit hooks to match Tarmac versioning

[lp:~dobey/tarmac/merge-hooks]

307. By dobey on 2010-07-20

Need to pass target instead of branch_url to the hook, so we can get config

[Paul Hummer (rockstar)]

Maybe for these hooks, you could also pass it a list of proposals that were landed. What do you think?

review: Needs Information

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2010-07-18 18:22:22 +0000
+++ tarmac/bin/commands.py	2010-07-20 18:22:42 +0000
@@ -128,6 +128,11 @@
             return
 
         target = Branch.create(lp_branch, self.config, create_tree=True)
+
+        self.logger.debug('Firing tarmac_pre_merge hook')
+        tarmac_hooks['tarmac_pre_merge'].fire(
+            self, target)
+
         try:
             for proposal in proposals:
 
@@ -208,6 +213,10 @@
                     self, target, source, proposal)
 
                 target.cleanup()
+        else:
+            self.logger.debug('Firing tarmac_post_merge hook')
+            tarmac_hooks['tarmac_post_merge'].fire(
+                self, target)
         finally:
             target.cleanup()
 

=== modified file 'tarmac/hooks.py'
--- tarmac/hooks.py	2010-04-24 01:38:43 +0000
+++ tarmac/hooks.py	2010-07-20 18:22:42 +0000
@@ -42,11 +42,22 @@
         self.create_hook(TarmacHookPoint('tarmac_pre_commit',
             'Called right after Tarmac checks out and merges in a new '
             'branch, but before committing.',
-            (1, 14, 0), False))
+            (0, 2), False))
 
         self.create_hook(TarmacHookPoint('tarmac_post_commit',
             'Called right after Tarmac commits the merged revision',
-            (1, 14, 0), False))
+            (0, 2), False))
+
+        self.create_hook(TarmacHookPoint('tarmac_pre_merge',
+            'Called right before tarmac begins attempting to merge '
+            'approved branches into the target branch.',
+            (0, 3, 3), False))
+
+        self.create_hook(TarmacHookPoint('tarmac_post_merge',
+            'Called right after Tarmac finishes merging approved '
+            'branches into the target branch.',
+            (0, 3, 3), False))
+
 
 
 tarmac_hooks = TarmacHookRegistry()