Merge lp:~amanica/bzr-notification/with_commit_hook into lp:bzr-notification

[Marius Kruger]

[Marius Kruger (amanica)]

This adds a commit hook which shows a notification after a commit to a checkout succeeds (which can also take a while).
Other minor changes:
* I factored out a notify send method
* I changed the timeout to 9000 (we should probably make that configurable)

You are welcome to merge this as is or copy&paste any parts of it you like.

[Robert Collins (lifeless)]

This looks ok to me, though I'm not a committer on bzr-notification. It does seem strictly redundant on the bzr-dbus+bzr-gtk notifications though.

review: Approve

Unmerged revisions

14. By Marius Kruger on 2009-07-03

* add post_commit_hook which shows a notification after a commit to a checkout succeeds.
* rather pass the branch base to notify_send so we can factor out more formatting.

13. By Marius Kruger on 2009-07-02

factor out notify_send function

=== modified file '__init__.py'
--- __init__.py	2008-05-14 06:15:18 +0000
+++ __init__.py	2009-07-03 00:11:04 +0000
@@ -5,7 +5,16 @@
 """GUI Notification plugin for bzr"""
 
 import os
-from bzrlib import branch
+from bzrlib import branch, errors
+
+
+cmd = 'notify-send --expire-time=9000 --icon=gtk-network --category=transfer'
+
+
+def notify_send(summary, base, message):
+    body = '%s (%s)' % (base, message)
+    os.system('%s "%s" "%s"' % (cmd, summary, body))
+
 
 def post_push_hook(push_result):
     old = push_result.old_revno
@@ -16,11 +25,9 @@
     else:
         message = '%d to %d' % (old, new)
 
-    cmd = 'notify-send --expire-time=3000 --icon=gtk-network'
     summary = 'Bzr Push'
-    body = '%s (%s)' % (push_result.target_branch.base, message)
+    notify_send(summary, push_result.target_branch.base, message)
 
-    os.system('%s "%s" "%s"' % (cmd, summary, body))
 
 def post_pull_hook(pull_result):
     old = pull_result.old_revno
@@ -31,22 +38,34 @@
     else:
         message = '%d to %d' % (old, new)
 
-    cmd = 'notify-send --expire-time=3000 --icon=gtk-network'
     summary = 'Bzr Pull'
-    body = '%s (%s)' % (pull_result.source_branch.base, message)
-
-    os.system('%s "%s" "%s"' % (cmd, summary, body))
+    notify_send(summary, pull_result.source_branch.base, message)
+
+
+def post_commit_hook(local, master, old_revno, old_revid, new_revno,
+        new_revid):
+    #only notify when we have a local branch
+    if local:
+        summary = 'Bzr Commit'
+        message = 'New revno %d' % new_revno
+        notify_send(summary, local.base, message)
+
 
 def install_named_hook_compat(hook_symbol, hook_callback, hook_name):
     """Implements the bzr 1.5 interface for compatibility with lesser versions."""
     branch.Branch.hooks.install_hook(hook_symbol, hook_callback)
     branch.Branch.hooks.name_hook(hook_callback, hook_name)
 
+
 install_named_hook = getattr(branch.Branch.hooks, 'install_named_hook', install_named_hook_compat)
 
+
 try:
     install_named_hook('post_push', post_push_hook, 'Notification post push hook')
     install_named_hook('post_pull', post_pull_hook, 'Notification post pull hook')
+    install_named_hook('post_commit', post_commit_hook,
+        'Notification post commit hook')
 except errors.UnknownHook:
     # Doesn't work with this old version of bzr
     pass
+