Rev 2610: Fix up --kind options in http://sourcefrog.net/bzr/check-options

[Martin Pool]

At http://sourcefrog.net/bzr/check-options

------------------------------------------------------------
revno: 2610
revision-id: mbp at sourcefrog.net-20070711063329-3q9rz8bljj2iisi1
parent: mbp at sourcefrog.net-20070711051842-rt9uj743zir4ixhn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 16:33:29 +1000
message:
  Fix up --kind options
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-07-11 05:18:42 +0000
+++ b/bzrlib/builtins.py	2007-07-11 06:33:29 +0000
@@ -447,14 +447,15 @@
         'revision',
         'show-ids',
         Option('kind',
-               help='List entries of a particular kind: file, directory, symlink.'),
+               help='List entries of a particular kind: file, directory, symlink.',
+               type=unicode),
         ]
     takes_args = ['file*']
 
     @display_command
     def run(self, revision=None, show_ids=False, kind=None, file_list=None):
         if kind and kind not in ['file', 'directory', 'symlink']:
-            raise errors.BzrCommandError('invalid kind specified')
+            raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
 
         work_tree, file_list = tree_files(file_list)
         work_tree.lock_read()
@@ -1750,11 +1751,12 @@
                    help='Write an ascii NUL (\\0) separator '
                    'between files rather than a newline.'),
             Option('kind',
-                   help='List entries of a particular kind: file, directory, symlink.'),
+                   help='List entries of a particular kind: file, directory, symlink.',
+                   type=unicode),
             'show-ids',
             ]
     @display_command
-    def run(self, revision=None, verbose=False, 
+    def run(self, revision=None, verbose=False,
             non_recursive=False, from_root=False,
             unknown=False, versioned=False, ignored=False,
             null=False, kind=None, show_ids=False, path=None):