Drop url from message

[bzrirker.git] / irkerhook.py

diff --git a/irkerhook.py b/irkerhook.py
index 7e59a6ebc767d63fe371c169d166982e886e40d9..2d6df23f13e8aa02d127800e718f26d04f794531 100644 (file)
--- a/irkerhook.py
+++ b/irkerhook.py
@@ -3,16 +3,7 @@
 # Copyright 2012 Neil Muller
 # GPL 2+ - see COPYING for details
 
-from bzrlib import (
-    errors,
-    revision as _mod_revision,
-    )
-from bzrlib.config import (
-    ListOption,
-    Option,
-    bool_from_store,
-    int_from_store,
-    )
+from bzrlib.config import Option
 import socket
 import sys
 import json
@@ -48,15 +39,13 @@ class IrkerSender(object):
             'rev': '%d' % self.revno,
             'files': ' '.join(files),
             'logmsg': self.revision.get_summary(),
-            'url': self.url(),
         }
         for name, value in self.colours():
             fields[name] = value
         text = ('%(bold)s%(project)s:%(reset)s '
                 '%(green)s%(committer)s%(reset)s '
                 '%(repo)s * %(bold)s%(rev)s%(reset)s / '
-                ' %(bold)s%(files)s%(reset)s: %(logmsg)s '
-                '%(brown)s%(url)s%(reset)s' % fields)
+                ' %(bold)s%(files)s%(reset)s: %(logmsg)s ' % fields)
         return text
 
     def url(self):
@@ -69,7 +58,7 @@ class IrkerSender(object):
         return url
 
     def colours(self):
-        colour_style = self.config.get('irker_colors')
+        colour_style = self.config.get('irker_colours')
         colours = {
                 'bold': '',
                 'green': '',
@@ -106,7 +95,7 @@ class IrkerSender(object):
                     'cyan': '\x0310',
                     'reset': '\x0F',
                     }
-        return colours
+        return colours.iteritems()
 
     def project(self):
         project = self.config.get('irker_project')
@@ -126,6 +115,8 @@ class IrkerSender(object):
             # Do this after we have locked, to make things faster.
             self._setup_revision_and_revno()
             channels = self.config.get('irker_channels')
+            if channels:
+                channels = channels.split(',')
             msg = unicode(self._format())
             # We rely on the server truncating, rather than trying to be
             # too fancy here