Work-around double commit message

[bzrirker.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index ca1768e45974a038c8c4f297352aa85c4df057a4..9bb0c566c210744c298182b57166bea3719a4324 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -17,25 +17,25 @@ from bzrlib.plugins.bzrirker import irkerhook as _irkerhook
 """)
 
 
-def post_commit(branch, revision_id):
-    """This is the post_commit hook that should get run after commit."""
-    _irkerhook.IrkerSender(branch, revision_id,
-            branch.get_config_stack()).send_maybe()
-
 
 def branch_commit_hook(local, master, old_revno, old_revid,
         new_revno, new_revid):
     """This is the post_commit hook that runs after commit."""
-    _irkerhook.IrkerSender(master, new_revid, master.get_config_stack(),
-                         local_branch=local).send_maybe()
+    if local is None:
+        _irkerhook.IrkerSender(master, new_revid,
+                master.get_config_stack()).send()
+    else:
+        _irkerhook.IrkerSender(local, new_revid,
+                master.get_config_stack()).send()
 
 
 def branch_post_change_hook(params):
     """This is the post_change_branch_tip hook."""
     # (branch, old_revno, new_revno, old_revid, new_revid)
-    _irker.IrkerSender(params.branch, params.new_revid,
-        params.branch.get_config_stack(), local_branch=None,
-        op='change').send_maybe()
+    br = params.branch
+    revs = br._revision_history()[params.old_revno:params.new_revno]
+    for rev_id in revs:
+        _irkerhook.IrkerSender(br, rev_id, br.get_config_stack()).send()
 
 
 def test_suite():
@@ -56,7 +56,8 @@ option_registry.register_lazy("irker_project",
     "bzrlib.plugins.bzrirker.irkerhook", "opt_irker_project")
 
 from bzrlib.hooks import install_lazy_named_hook
-install_lazy_named_hook("bzrlib.branch", "Branch.hooks", 'post_commit',
-        branch_commit_hook, 'bzr-irker')
+# This causes double commit messages - investigate what we need further
+#install_lazy_named_hook("bzrlib.branch", "Branch.hooks", 'post_commit',
+#        branch_commit_hook, 'bzr-irker')
 install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
         'post_change_branch_tip', branch_post_change_hook, 'bzr-irker')