Merge lp:~stefanor/ibid/addresponse-371143 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/admin.py'
--- ibid/plugins/admin.py	2009-03-08 13:16:28 +0000
+++ ibid/plugins/admin.py	2009-05-03 18:06:40 +0000
@@ -17,7 +17,7 @@
             if processor.name not in plugins:
                 plugins.append(processor.name)
 
-        event.addresponse(u'Plugins: %s', u', '.join(sorted(plugins)))
+        event.addresponse(u'Plugins: %s', u', '.join(sorted(plugins)) or u'none')
 
 help['core'] = u'Reloads core modules.'
 class ReloadCoreModules(Processor):

=== modified file 'ibid/plugins/auth.py'
--- ibid/plugins/auth.py	2009-05-01 12:22:37 +0000
+++ ibid/plugins/auth.py	2009-05-03 18:06:40 +0000
@@ -133,7 +133,7 @@
                 return
 
         permissions = sorted(u'%s%s' % (permission_values[perm.value], perm.name) for perm in account.permissions)
-        event.addresponse(u'Permissions: %s', u', '.join(permissions))
+        event.addresponse(u'Permissions: %s', u', '.join(permissions) or u'none')
 
     @match(r'^list\s+permissions$')
     def list_permissions(self, event):
@@ -146,7 +146,7 @@
                     if permission not in permissions:
                         permissions.append(permission)
 
-        event.addresponse(u'Permissions: %s', u', '.join(sorted(permissions)))
+        event.addresponse(u'Permissions: %s', u', '.join(sorted(permissions)) or u'none')
 
 class Auth(Processor):
     u"""auth <credential>"""

=== modified file 'ibid/plugins/bzr.py'
--- ibid/plugins/bzr.py	2009-05-01 12:17:57 +0000
+++ ibid/plugins/bzr.py	2009-05-03 18:06:40 +0000
@@ -69,7 +69,10 @@
     @match(r'^(?:repos|repositories)$')
     def handle_repositories(self, event):
         repositories = self.branches.keys()
-        event.addresponse(u'I know about: %s', u', '.join(sorted(repositories)))
+        if repositories:
+            event.addresponse(u'I know about: %s', u', '.join(sorted(repositories)))
+        else:
+            event.addresponse(u"I don't know about any repositories")
 
     def remote_committed(self, repository, start, end=None):
         commits = self.get_commits(repository, start, end)

=== modified file 'ibid/plugins/dict.py'
--- ibid/plugins/dict.py	2009-05-01 12:17:57 +0000
+++ ibid/plugins/dict.py	2009-05-03 18:06:40 +0000
@@ -51,7 +51,7 @@
     def handle_dictionaries(self, event):
         connection = Connection(self.server, self.port)
         dictionaries = connection.getdbdescs()
-        event.addresponse(u'Dictionaries: %s', u', '.join(sorted(dictionaries.keys())))
+        event.addresponse(u'Dictionaries: %s', u', '.join(sorted(dictionaries.keys())) or u'none')
 
     @match(r'^strater?gies$')
     def handle_strategies(self, event):

=== modified file 'ibid/plugins/help.py'
--- ibid/plugins/help.py	2009-03-08 13:16:28 +0000
+++ ibid/plugins/help.py	2009-05-03 18:06:40 +0000
@@ -27,7 +27,7 @@
                     if feature not in features:
                         features.append(feature)
 
-        event.addresponse(u'Features: %s', u' '.join(sorted(features)))
+        event.addresponse(u'Features: %s', u' '.join(sorted(features)) or u'none')
 
     @match(r'^help\s+(.+)$')
     def help(self, event, feature):

=== modified file 'ibid/plugins/sources.py'
--- ibid/plugins/sources.py	2009-03-16 20:55:20 +0000
+++ ibid/plugins/sources.py	2009-05-03 18:06:40 +0000
@@ -48,10 +48,10 @@
         for name, source in ibid.sources.items():
             url = source.url()
             sources.append(url and u'%s (%s)' % (name, url) or name)
-        event.addresponse(u'Sources: %s', u', '.join(sorted(sources)))
+        event.addresponse(u'Sources: %s', u', '.join(sorted(sources)) or u'none')
 
     @match(r'^list\s+configured\s+sources$')
     def listall(self, event):
-        event.addresponse(u'Configured sources: %s', u', '.join(sorted(ibid.config.sources.keys())))
+        event.addresponse(u'Configured sources: %s', u', '.join(sorted(ibid.config.sources.keys())) or u'none')
 
 # vi: set et sta sw=4 ts=4: