/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.12.59 by Aaron Bentley
Added command-quieting test
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.12.59 by Aaron Bentley
Added command-quieting test
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.12.59 by Aaron Bentley
Added command-quieting test
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.12.59 by Aaron Bentley
Added command-quieting test
16
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
17
import errno
5264.1.2 by Robert Collins
Final fix for 'no help for command' issue. We now show a clean message
18
import inspect
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
19
import sys
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
20
21
from bzrlib import (
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
22
    builtins,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
23
    commands,
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
24
    config,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
25
    errors,
4251.1.1 by Aaron Bentley
Support hidden options.
26
    option,
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
27
    symbol_versioning,
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
28
    tests,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
29
    )
30
from bzrlib.commands import display_command
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
31
from bzrlib.tests import TestSkipped
32
33
34
class TestCommands(tests.TestCase):
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
35
5264.1.2 by Robert Collins
Final fix for 'no help for command' issue. We now show a clean message
36
    def test_all_commands_have_help(self):
37
        commands._register_builtin_commands()
38
        commands_without_help = set()
39
        base_doc = inspect.getdoc(commands.Command)
40
        for cmd_name in commands.all_command_names():
41
            cmd = commands.get_cmd_object(cmd_name)
42
            cmd_help = cmd.help()
43
            if not cmd_help or cmd_help == base_doc:
44
                commands_without_help.append(cmd_name)
45
        self.assertLength(0, commands_without_help)
46
1185.12.59 by Aaron Bentley
Added command-quieting test
47
    def test_display_command(self):
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
48
        """EPIPE message is selectively suppressed"""
1185.12.59 by Aaron Bentley
Added command-quieting test
49
        def pipe_thrower():
50
            raise IOError(errno.EPIPE, "Bogus pipe error")
51
        self.assertRaises(IOError, pipe_thrower)
52
        @display_command
53
        def non_thrower():
54
            pipe_thrower()
55
        non_thrower()
56
        @display_command
57
        def other_thrower():
58
            raise IOError(errno.ESPIPE, "Bogus pipe error")
59
        self.assertRaises(IOError, other_thrower)
60
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
61
    def test_unicode_command(self):
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
62
        # This error is thrown when we can't find the command in the
63
        # list of available commands
64
        self.assertRaises(errors.BzrCommandError,
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
65
                          commands.run_bzr, [u'cmd\xb5'])
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
66
67
    def test_unicode_option(self):
68
        # This error is actually thrown by optparse, when it
69
        # can't find the given option
1913.2.4 by Martin Pool
python2.5 apparently has trouble with unicode options
70
        import optparse
71
        if optparse.__version__ == "1.5.3":
72
            raise TestSkipped("optparse 1.5.3 can't handle unicode options")
1948.1.8 by John Arbash Meinel
Don't raise UnicodeCommand on request, instead just let it fall out when we get to NoSuchCommand
73
        self.assertRaises(errors.BzrCommandError,
74
                          commands.run_bzr, ['log', u'--option\xb5'])
75
4251.1.1 by Aaron Bentley
Support hidden options.
76
    @staticmethod
77
    def get_command(options):
4251.1.7 by Aaron Bentley
Use generated subclass instead of patching Command instance
78
        class cmd_foo(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
79
            __doc__ = 'Bar'
4251.1.7 by Aaron Bentley
Use generated subclass instead of patching Command instance
80
81
            takes_options = options
82
83
        return cmd_foo()
4251.1.1 by Aaron Bentley
Support hidden options.
84
85
    def test_help_hidden(self):
86
        c = self.get_command([option.Option('foo', hidden=True)])
87
        self.assertNotContainsRe(c.get_help_text(), '--foo')
88
89
    def test_help_not_hidden(self):
90
        c = self.get_command([option.Option('foo', hidden=False)])
91
        self.assertContainsRe(c.get_help_text(), '--foo')
92
5255.5.1 by Ian Clatworthy
Ensure builtin_command_names() is initialized correctly
93
5741.3.1 by Martin Pool
Add Command.invoked_as
94
class TestInvokedAs(tests.TestCase):
95
96
    def setUp(self):
97
        super(TestCommandDeprecation, self).setUp()
98
        commands.install_bzr_command_hooks()
99
        commands._register_builtin_commands()
100
101
    def test_invoked_as(self):
102
        """The command object knows the actual name used to invoke it."""
103
        # get one from the real get_cmd_object.
104
        c = commands.get_cmd_object('ci')
105
        self.assertIsInstance(c, builtins.cmd_commit)
106
        self.assertEquals(c.invoked_as, 'ci')
107
108
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
109
class TestGetAlias(tests.TestCase):
2155.2.3 by Marius Kruger
* commands.py
110
111
    def _get_config(self, config_text):
5345.2.9 by Vincent Ladeuil
Rename IniBaseConfig.from_bytes to from_string.
112
        my_config = config.GlobalConfig.from_string(config_text)
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
113
        return my_config
114
115
    def test_simple(self):
2155.2.3 by Marius Kruger
* commands.py
116
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
117
            "diff=diff -r -2..-1\n")
118
        self.assertEqual([u'diff', u'-r', u'-2..-1'],
119
            commands.get_alias("diff", config=my_config))
120
121
    def test_single_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
122
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
123
            "diff=diff -r -2..-1 --diff-options "
124
            "'--strip-trailing-cr -wp'\n")
125
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
126
                          u'--strip-trailing-cr -wp'],
127
                          commands.get_alias("diff", config=my_config))
128
129
    def test_double_quotes(self):
2155.2.3 by Marius Kruger
* commands.py
130
        my_config = self._get_config("[ALIASES]\n"
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
131
            "diff=diff -r -2..-1 --diff-options "
132
            "\"--strip-trailing-cr -wp\"\n")
133
        self.assertEqual([u'diff', u'-r', u'-2..-1', u'--diff-options',
134
                          u'--strip-trailing-cr -wp'],
135
                          commands.get_alias("diff", config=my_config))
136
137
    def test_unicode(self):
2155.2.3 by Marius Kruger
* commands.py
138
        my_config = self._get_config("[ALIASES]\n"
4913.5.4 by Gordon Tyler
Changed test_single_quotes to skip on win32 and fixed test_unicode to not fail on win32.
139
            u'iam=whoami "Erik B\u00e5gfors <erik@bagfors.nu>"\n')
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
140
        self.assertEqual([u'whoami', u'Erik B\u00e5gfors <erik@bagfors.nu>'],
141
                          commands.get_alias("iam", config=my_config))
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
142
143
144
class TestSeeAlso(tests.TestCase):
145
    """Tests for the see also functional of Command."""
146
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
147
    @staticmethod
148
    def _get_command_with_see_also(see_also):
149
        class ACommand(commands.Command):
150
            __doc__ = """A sample command."""
151
            _see_also = see_also
152
        return ACommand()
153
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
154
    def test_default_subclass_no_see_also(self):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
155
        command = self._get_command_with_see_also([])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
156
        self.assertEqual([], command.get_see_also())
157
158
    def test__see_also(self):
159
        """When _see_also is defined, it sets the result of get_see_also()."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
160
        command = self._get_command_with_see_also(['bar', 'foo'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
161
        self.assertEqual(['bar', 'foo'], command.get_see_also())
162
163
    def test_deduplication(self):
164
        """Duplicates in _see_also are stripped out."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
165
        command = self._get_command_with_see_also(['foo', 'foo'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
166
        self.assertEqual(['foo'], command.get_see_also())
167
168
    def test_sorted(self):
169
        """_see_also is sorted by get_see_also."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
170
        command = self._get_command_with_see_also(['foo', 'bar'])
2425.2.1 by Robert Collins
Command objects can now declare related help topics by having _see_also
171
        self.assertEqual(['bar', 'foo'], command.get_see_also())
2432.1.21 by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied.
172
173
    def test_additional_terms(self):
174
        """Additional terms can be supplied and are deduped and sorted."""
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
175
        command = self._get_command_with_see_also(['foo', 'bar'])
2432.1.21 by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied.
176
        self.assertEqual(['bar', 'foo', 'gam'],
177
            command.get_see_also(['gam', 'bar', 'gam']))
178
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
179
180
class TestRegisterLazy(tests.TestCase):
181
182
    def setUp(self):
4153.1.2 by Andrew Bennetts
Add missing TestCase.setUp upcalls.
183
        tests.TestCase.setUp(self)
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
184
        import bzrlib.tests.fake_command
185
        del sys.modules['bzrlib.tests.fake_command']
186
        global lazy_command_imported
187
        lazy_command_imported = False
4119.3.8 by Robert Collins
Get missing command support sorted out.
188
        commands.install_bzr_command_hooks()
3785.1.4 by Aaron Bentley
Enable lazy-loading of commands
189
190
    @staticmethod
191
    def remove_fake():
192
        commands.plugin_cmds.remove('fake')
193
194
    def assertIsFakeCommand(self, cmd_obj):
195
        from bzrlib.tests.fake_command import cmd_fake
196
        self.assertIsInstance(cmd_obj, cmd_fake)
197
198
    def test_register_lazy(self):
199
        """Ensure lazy registration works"""
200
        commands.plugin_cmds.register_lazy('cmd_fake', [],
201
                                           'bzrlib.tests.fake_command')
202
        self.addCleanup(self.remove_fake)
203
        self.assertFalse(lazy_command_imported)
204
        fake_instance = commands.get_cmd_object('fake')
205
        self.assertTrue(lazy_command_imported)
206
        self.assertIsFakeCommand(fake_instance)
207
208
    def test_get_unrelated_does_not_import(self):
209
        commands.plugin_cmds.register_lazy('cmd_fake', [],
210
                                           'bzrlib.tests.fake_command')
211
        self.addCleanup(self.remove_fake)
212
        commands.get_cmd_object('status')
213
        self.assertFalse(lazy_command_imported)
214
215
    def test_aliases(self):
216
        commands.plugin_cmds.register_lazy('cmd_fake', ['fake_alias'],
217
                                           'bzrlib.tests.fake_command')
218
        self.addCleanup(self.remove_fake)
219
        fake_instance = commands.get_cmd_object('fake_alias')
220
        self.assertIsFakeCommand(fake_instance)
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
221
222
223
class TestExtendCommandHook(tests.TestCase):
224
225
    def test_fires_on_get_cmd_object(self):
226
        # The extend_command(cmd) hook fires when commands are delivered to the
227
        # ui, not simply at registration (because lazy registered plugin
228
        # commands are registered).
229
        # when they are simply created.
230
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
231
        commands.install_bzr_command_hooks()
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
232
        commands.Command.hooks.install_named_hook(
233
            "extend_command", hook_calls.append, None)
234
        # create a command, should not fire
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
235
        class cmd_test_extend_command_hook(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
236
            __doc__ = """A sample command."""
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
237
        self.assertEqual([], hook_calls)
238
        # -- as a builtin
239
        # register the command class, should not fire
240
        try:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
241
            commands.builtin_command_registry.register(cmd_test_extend_command_hook)
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
242
            self.assertEqual([], hook_calls)
243
            # and ask for the object, should fire
244
            cmd = commands.get_cmd_object('test-extend-command-hook')
245
            # For resilience - to ensure all code paths hit it - we
246
            # fire on everything returned in the 'cmd_dict', which is currently
247
            # all known commands, so assert that cmd is in hook_calls
248
            self.assertSubset([cmd], hook_calls)
249
            del hook_calls[:]
250
        finally:
5018.1.12 by Martin Pool
Tests for commands must now properly register them, not just poke them into bzrlib.builtins
251
            commands.builtin_command_registry.remove('test-extend-command-hook')
4000.1.1 by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
252
        # -- as a plugin lazy registration
253
        try:
254
            # register the command class, should not fire
255
            commands.plugin_cmds.register_lazy('cmd_fake', [],
256
                                               'bzrlib.tests.fake_command')
257
            self.assertEqual([], hook_calls)
258
            # and ask for the object, should fire
259
            cmd = commands.get_cmd_object('fake')
260
            self.assertEqual([cmd], hook_calls)
261
        finally:
262
            commands.plugin_cmds.remove('fake')
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
263
264
265
class TestGetCommandHook(tests.TestCase):
266
267
    def test_fires_on_get_cmd_object(self):
268
        # The get_command(cmd) hook fires when commands are delivered to the
269
        # ui.
4119.3.8 by Robert Collins
Get missing command support sorted out.
270
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
271
        hook_calls = []
272
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
273
            __doc__ = """A sample command."""
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
274
        def get_cmd(cmd_or_None, cmd_name):
275
            hook_calls.append(('called', cmd_or_None, cmd_name))
276
            if cmd_name in ('foo', 'info'):
277
                return ACommand()
278
        commands.Command.hooks.install_named_hook(
279
            "get_command", get_cmd, None)
280
        # create a command directly, should not fire
281
        cmd = ACommand()
282
        self.assertEqual([], hook_calls)
283
        # ask by name, should fire and give us our command
284
        cmd = commands.get_cmd_object('foo')
285
        self.assertEqual([('called', None, 'foo')], hook_calls)
286
        self.assertIsInstance(cmd, ACommand)
287
        del hook_calls[:]
288
        # ask by a name that is supplied by a builtin - the hook should still
289
        # fire and we still get our object, but we should see the builtin
290
        # passed to the hook.
291
        cmd = commands.get_cmd_object('info')
292
        self.assertIsInstance(cmd, ACommand)
293
        self.assertEqual(1, len(hook_calls))
294
        self.assertEqual('info', hook_calls[0][2])
295
        self.assertIsInstance(hook_calls[0][1], builtins.cmd_info)
296
297
4119.3.8 by Robert Collins
Get missing command support sorted out.
298
class TestGetMissingCommandHook(tests.TestCase):
299
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
300
    def hook_missing(self):
301
        """Hook get_missing_command for testing."""
302
        self.hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
303
        class ACommand(commands.Command):
5131.2.6 by Martin
Fix more tests which were failing under -OO that had been missed earlier
304
            __doc__ = """A sample command."""
4119.3.8 by Robert Collins
Get missing command support sorted out.
305
        def get_missing_cmd(cmd_name):
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
306
            self.hook_calls.append(('called', cmd_name))
4119.3.8 by Robert Collins
Get missing command support sorted out.
307
            if cmd_name in ('foo', 'info'):
308
                return ACommand()
309
        commands.Command.hooks.install_named_hook(
310
            "get_missing_command", get_missing_cmd, None)
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
311
        self.ACommand = ACommand
312
313
    def test_fires_on_get_cmd_object(self):
314
        # The get_missing_command(cmd) hook fires when commands are delivered to the
315
        # ui.
316
        self.hook_missing()
4119.3.8 by Robert Collins
Get missing command support sorted out.
317
        # create a command directly, should not fire
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
318
        self.cmd = self.ACommand()
319
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
320
        # ask by name, should fire and give us our command
321
        cmd = commands.get_cmd_object('foo')
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
322
        self.assertEqual([('called', 'foo')], self.hook_calls)
323
        self.assertIsInstance(cmd, self.ACommand)
324
        del self.hook_calls[:]
4119.3.8 by Robert Collins
Get missing command support sorted out.
325
        # ask by a name that is supplied by a builtin - the hook should not
326
        # fire and we still get our object.
327
        commands.install_bzr_command_hooks()
328
        cmd = commands.get_cmd_object('info')
329
        self.assertNotEqual(None, cmd)
5058.2.1 by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when
330
        self.assertEqual(0, len(self.hook_calls))
331
332
    def test_skipped_on_HelpCommandIndex_get_topics(self):
333
        # The get_missing_command(cmd_name) hook is not fired when
334
        # looking up help topics.
335
        self.hook_missing()
336
        topic = commands.HelpCommandIndex()
337
        topics = topic.get_topics('foo')
338
        self.assertEqual([], self.hook_calls)
4119.3.8 by Robert Collins
Get missing command support sorted out.
339
340
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
341
class TestListCommandHook(tests.TestCase):
342
343
    def test_fires_on_all_command_names(self):
344
        # The list_commands() hook fires when all_command_names() is invoked.
345
        hook_calls = []
4119.3.8 by Robert Collins
Get missing command support sorted out.
346
        commands.install_bzr_command_hooks()
4119.3.4 by Robert Collins
Add Command lookup hooks: list_commands and get_command.
347
        def list_my_commands(cmd_names):
348
            hook_calls.append('called')
349
            cmd_names.update(['foo', 'bar'])
350
            return cmd_names
351
        commands.Command.hooks.install_named_hook(
352
            "list_commands", list_my_commands, None)
353
        # Get a command, which should not trigger the hook.
354
        cmd = commands.get_cmd_object('info')
355
        self.assertEqual([], hook_calls)
356
        # Get all command classes (for docs and shell completion).
357
        cmds = list(commands.all_command_names())
358
        self.assertEqual(['called'], hook_calls)
359
        self.assertSubset(['foo', 'bar'], cmds)
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
360
5255.5.1 by Ian Clatworthy
Ensure builtin_command_names() is initialized correctly
361
5050.1.4 by Vincent Ladeuil
Really deprecate commands.shlex_split_unicode.
362
class TestDeprecations(tests.TestCase):
363
364
    def test_shlex_split_unicode_deprecation(self):
365
        res = self.applyDeprecated(
366
                symbol_versioning.deprecated_in((2, 2, 0)),
367
                commands.shlex_split_unicode, 'whatever')