[Pkg-bazaar-commits] ./bzr-gtk/unstable r186: Merge trunk

[Jelmer Vernooij]

------------------------------------------------------------
revno: 186
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-03-28 01:45:49 +0200
message:
  Merge trunk
modified:
  __init__.py
    ------------------------------------------------------------
    revno: 182.1.1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Mon 2007-03-26 16:18:45 +1000
    message:
      Update commit-notify to use new dbus api, and show remote URL's.
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-03-27 23:33:12 +0000
+++ b/__init__.py	2007-03-27 23:45:49 +0000
@@ -462,17 +462,13 @@
         broadcast_service = bus.get_object(
             activity.Broadcast.DBUS_NAME,
             activity.Broadcast.DBUS_PATH)
-        def catch_branch(revision_id, url):
+        def catch_branch(revision_id, urls):
+            # TODO: show all the urls, or perhaps choose the 'best'.
+            url = urls[0]
             try:
                 if isinstance(revision_id, unicode):
                     revision_id = revision_id.encode('utf8')
                 transport = get_transport(url)
-                try:
-                    transport.local_abspath('.')
-                except errors.TransportNotPossible:
-                    # dont show remote urls for now.
-                    return
-                # here we should:
                 a_dir = BzrDir.open_from_transport(transport)
                 branch = a_dir.open_branch()
                 revno = branch.revision_id_to_revno(revision_id)
@@ -484,7 +480,6 @@
                 body += '\n'
                 body += revision.message
                 body = cgi.escape(body)
-                #print repr(body)
                 nw = pynotify.Notification(summary, body)
                 nw.set_timeout(5000)
                 nw.show()