24
26
# TODO: Specific "examples" property on commands for consistent formatting.
28
# TODO: "--profile=cum", to change sort order. Is there any value in leaving
29
# the profile output behind so it can be interactively examined?
29
34
from bzrlib.lazy_import import lazy_import
30
35
lazy_import(globals(), """
38
from warnings import warn
35
41
from bzrlib import (
49
from bzrlib.hooks import Hooks
50
from bzrlib.i18n import gettext
51
# Compatibility - Option used to be in commands.
52
from bzrlib.symbol_versioning import (
52
57
from bzrlib.option import Option
53
from bzrlib.plugin import disable_plugins, load_plugins
54
from bzrlib import registry
57
class CommandInfo(object):
58
"""Information about a command."""
60
def __init__(self, aliases):
61
"""The list of aliases for the command."""
62
self.aliases = aliases
65
def from_command(klass, command):
66
"""Factory to construct a CommandInfo from a command."""
67
return klass(command.aliases)
70
class CommandRegistry(registry.Registry):
71
"""Special registry mapping command names to command classes.
73
:ivar overridden_registry: Look in this registry for commands being
74
overridden by this registry. This can be used to tell plugin commands
75
about the builtin they're decorating.
79
registry.Registry.__init__(self)
80
self.overridden_registry = None
81
# map from aliases to the real command that implements the name
84
def get(self, command_name):
85
real_name = self._alias_dict.get(command_name, command_name)
86
return registry.Registry.get(self, real_name)
89
def _get_name(command_name):
90
if command_name.startswith("cmd_"):
91
return _unsquish_command_name(command_name)
95
def register(self, cmd, decorate=False):
96
"""Utility function to help register a command
98
:param cmd: Command subclass to register
99
:param decorate: If true, allow overriding an existing command
100
of the same name; the old command is returned by this function.
101
Otherwise it is an error to try to override an existing command.
104
k_unsquished = self._get_name(k)
106
previous = self.get(k_unsquished)
109
if self.overridden_registry:
111
previous = self.overridden_registry.get(k_unsquished)
114
info = CommandInfo.from_command(cmd)
116
registry.Registry.register(self, k_unsquished, cmd,
117
override_existing=decorate, info=info)
119
trace.warning('Two plugins defined the same command: %r' % k)
120
trace.warning('Not loading the one in %r' %
121
sys.modules[cmd.__module__])
122
trace.warning('Previously this command was registered from %r' %
123
sys.modules[previous.__module__])
124
for a in cmd.aliases:
125
self._alias_dict[a] = k_unsquished
128
def register_lazy(self, command_name, aliases, module_name):
129
"""Register a command without loading its module.
131
:param command_name: The primary name of the command.
132
:param aliases: A list of aliases for the command.
133
:module_name: The module that the command lives in.
135
key = self._get_name(command_name)
136
registry.Registry.register_lazy(self, key, module_name, command_name,
137
info=CommandInfo(aliases))
139
self._alias_dict[a] = key
142
plugin_cmds = CommandRegistry()
143
builtin_command_registry = CommandRegistry()
144
plugin_cmds.overridden_registry = builtin_command_registry
147
63
def register_command(cmd, decorate=False):
148
"""Register a plugin command.
64
"""Utility function to help register a command
150
Should generally be avoided in favor of lazy registration.
66
:param cmd: Command subclass to register
67
:param decorate: If true, allow overriding an existing command
68
of the same name; the old command is returned by this function.
69
Otherwise it is an error to try to override an existing command.
152
71
global plugin_cmds
153
return plugin_cmds.register(cmd, decorate)
73
if k.startswith("cmd_"):
74
k_unsquished = _unsquish_command_name(k)
77
if k_unsquished not in plugin_cmds:
78
plugin_cmds[k_unsquished] = cmd
79
## trace.mutter('registered plugin command %s', k_unsquished)
80
if decorate and k_unsquished in builtin_command_names():
81
return _builtin_commands()[k_unsquished]
83
result = plugin_cmds[k_unsquished]
84
plugin_cmds[k_unsquished] = cmd
87
trace.log_error('Two plugins defined the same command: %r' % k)
88
trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
89
trace.log_error('Previously this command was registered from %r' %
90
sys.modules[plugin_cmds[k_unsquished].__module__])
156
93
def _squish_command_name(cmd):
160
97
def _unsquish_command_name(cmd):
98
assert cmd.startswith("cmd_")
161
99
return cmd[4:].replace('_','-')
164
def _register_builtin_commands():
165
if builtin_command_registry.keys():
102
def _builtin_commands():
168
103
import bzrlib.builtins
169
for cmd_class in _scan_module_for_commands(bzrlib.builtins).values():
170
builtin_command_registry.register(cmd_class)
171
bzrlib.builtins._register_lazy_builtins()
174
def _scan_module_for_commands(module):
176
for name, obj in module.__dict__.iteritems():
105
builtins = bzrlib.builtins.__dict__
106
for name in builtins:
177
107
if name.startswith("cmd_"):
178
108
real_name = _unsquish_command_name(name)
109
r[real_name] = builtins[name]
183
def _list_bzr_commands(names):
184
"""Find commands from bzr's core and plugins.
186
This is not the public interface, just the default hook called by all_command_names.
188
# to eliminate duplicates
189
names.update(builtin_command_names())
190
names.update(plugin_command_names())
194
def all_command_names():
195
"""Return a set of all command names."""
197
for hook in Command.hooks['list_commands']:
200
raise AssertionError(
201
'hook %s returned None' % Command.hooks.get_hook_name(hook))
205
113
def builtin_command_names():
206
"""Return list of builtin command names.
114
"""Return list of builtin command names."""
115
return _builtin_commands().keys()
208
Use of all_command_names() is encouraged rather than builtin_command_names
209
and/or plugin_command_names.
211
_register_builtin_commands()
212
return builtin_command_registry.keys()
215
118
def plugin_command_names():
216
"""Returns command names from commands registered by plugins."""
217
119
return plugin_cmds.keys()
122
def _get_cmd_dict(plugins_override=True):
123
"""Return name->class mapping for all commands."""
124
d = _builtin_commands()
126
d.update(plugin_cmds)
130
def get_all_cmds(plugins_override=True):
131
"""Return canonical name and class for all registered commands."""
132
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
220
136
def get_cmd_object(cmd_name, plugins_override=True):
221
"""Return the command object for a command.
137
"""Return the canonical name and command class for a command.
224
140
If true, plugin commands can override builtins.
227
143
return _get_cmd_object(cmd_name, plugins_override)
229
raise errors.BzrCommandError(gettext('unknown command "%s"') % cmd_name)
232
def _get_cmd_object(cmd_name, plugins_override=True, check_missing=True):
233
"""Get a command object.
235
:param cmd_name: The name of the command.
236
:param plugins_override: Allow plugins to override builtins.
237
:param check_missing: Look up commands not found in the regular index via
238
the get_missing_command hook.
239
:return: A Command object instance
240
:raises KeyError: If no command is found.
145
raise errors.BzrCommandError('unknown command "%s"' % cmd_name)
148
def _get_cmd_object(cmd_name, plugins_override=True):
149
"""Worker for get_cmd_object which raises KeyError rather than BzrCommandError."""
150
from bzrlib.externalcommand import ExternalCommand
242
152
# We want only 'ascii' command names, but the user may have typed
243
153
# in a Unicode name. In that case, they should just get a
244
154
# 'command not found' error later.
245
155
# In the future, we may actually support Unicode command names.
248
for hook in Command.hooks['get_command']:
249
cmd = hook(cmd, cmd_name)
250
if cmd is not None and not plugins_override and not cmd.plugin_name():
251
# We've found a non-plugin command, don't permit it to be
254
if cmd is None and check_missing:
255
for hook in Command.hooks['get_missing_command']:
262
# Allow plugins to extend commands
263
for hook in Command.hooks['extend_command']:
265
if getattr(cmd, 'invoked_as', None) is None:
266
cmd.invoked_as = cmd_name
270
def _try_plugin_provider(cmd_name):
271
"""Probe for a plugin provider having cmd_name."""
273
plugin_metadata, provider = probe_for_provider(cmd_name)
274
raise errors.CommandAvailableInPlugin(cmd_name,
275
plugin_metadata, provider)
276
except errors.NoPluginAvailable:
280
def probe_for_provider(cmd_name):
281
"""Look for a provider for cmd_name.
283
:param cmd_name: The command name.
284
:return: plugin_metadata, provider for getting cmd_name.
285
:raises NoPluginAvailable: When no provider can supply the plugin.
287
# look for providers that provide this command but aren't installed
288
for provider in command_providers_registry:
290
return provider.plugin_for_command(cmd_name), provider
291
except errors.NoPluginAvailable:
293
raise errors.NoPluginAvailable(cmd_name)
296
def _get_bzr_command(cmd_or_None, cmd_name):
297
"""Get a command from bzr's core."""
299
cmd_class = builtin_command_registry.get(cmd_name)
157
# first look up this command under the specified name
158
cmds = _get_cmd_dict(plugins_override=plugins_override)
160
return cmds[cmd_name]()
307
def _get_external_command(cmd_or_None, cmd_name):
308
"""Lookup a command that is a shell script."""
309
# Only do external command lookups when no command is found so far.
310
if cmd_or_None is not None:
312
from bzrlib.externalcommand import ExternalCommand
164
# look for any command which claims this as an alias
165
for real_cmd_name, cmd_class in cmds.iteritems():
166
if cmd_name in cmd_class.aliases:
313
169
cmd_obj = ExternalCommand.find_command(cmd_name)
173
# look for plugins that provide this command but aren't installed
174
for provider in command_providers_registry:
176
plugin_metadata = provider.plugin_for_command(cmd_name)
177
except errors.NoPluginAvailable:
180
raise errors.CommandAvailableInPlugin(cmd_name,
181
plugin_metadata, provider)
318
def _get_plugin_command(cmd_or_None, cmd_name):
319
"""Get a command from bzr's plugins."""
321
return plugin_cmds.get(cmd_name)()
324
for key in plugin_cmds.keys():
325
info = plugin_cmds.get_info(key)
326
if cmd_name in info.aliases:
327
return plugin_cmds.get(key)()
331
186
class Command(object):
346
201
summary, then a complete description of the command. A grammar
347
202
description will be inserted.
349
:cvar aliases: Other accepted names for this command.
351
:cvar takes_args: List of argument forms, marked with whether they are
352
optional, repeated, etc. Examples::
354
['to_location', 'from_branch?', 'file*']
356
* 'to_location' is required
357
* 'from_branch' is optional
358
* 'file' can be specified 0 or more times
360
:cvar takes_options: List of options that may be given for this command.
361
These can be either strings, referring to globally-defined options, or
362
option objects. Retrieve through options().
364
:cvar hidden: If true, this command isn't advertised. This is typically
205
Other accepted names for this command.
208
List of argument forms, marked with whether they are optional,
213
['to_location', 'from_branch?', 'file*']
215
'to_location' is required
216
'from_branch' is optional
217
'file' can be specified 0 or more times
220
List of options that may be given for this command. These can
221
be either strings, referring to globally-defined options,
222
or option objects. Retrieve through options().
225
If true, this command isn't advertised. This is typically
365
226
for commands intended for expert users.
367
:cvar encoding_type: Command objects will get a 'outf' attribute, which has
368
been setup to properly handle encoding of unicode strings.
369
encoding_type determines what will happen when characters cannot be
372
* strict - abort if we cannot decode
373
* replace - put in a bogus character (typically '?')
374
* exact - do not encode sys.stdout
376
NOTE: by default on Windows, sys.stdout is opened as a text stream,
377
therefore LF line-endings are converted to CRLF. When a command uses
378
encoding_type = 'exact', then sys.stdout is forced to be a binary
379
stream, and line-endings will not mangled.
382
A string indicating the real name under which this command was
383
invoked, before expansion of aliases.
384
(This may be None if the command was constructed and run in-process.)
386
:cvar hooks: An instance of CommandHooks.
388
:cvar __doc__: The help shown by 'bzr help command' for this command.
389
This is set by assigning explicitly to __doc__ so that -OO can
393
__doc__ = "My help goes here"
229
Command objects will get a 'outf' attribute, which has been
230
setup to properly handle encoding of unicode strings.
231
encoding_type determines what will happen when characters cannot
233
strict - abort if we cannot decode
234
replace - put in a bogus character (typically '?')
235
exact - do not encode sys.stdout
237
NOTE: by default on Windows, sys.stdout is opened as a text
238
stream, therefore LF line-endings are converted to CRLF.
239
When a command uses encoding_type = 'exact', then
240
sys.stdout is forced to be a binary stream, and line-endings
397
246
takes_options = []
398
247
encoding_type = 'strict'
404
251
def __init__(self):
405
252
"""Construct an instance of this command."""
253
if self.__doc__ == Command.__doc__:
254
warn("No help message set for %r" % self)
406
255
# List of standard options directly supported
407
256
self.supported_std_options = []
410
def add_cleanup(self, cleanup_func, *args, **kwargs):
411
"""Register a function to call after self.run returns or raises.
413
Functions will be called in LIFO order.
415
self._operation.add_cleanup(cleanup_func, *args, **kwargs)
417
def cleanup_now(self):
418
"""Execute and empty pending cleanup functions immediately.
420
After cleanup_now all registered cleanups are forgotten. add_cleanup
421
may be called again after cleanup_now; these cleanups will be called
422
after self.run returns or raises (or when cleanup_now is next called).
424
This is useful for releasing expensive or contentious resources (such
425
as write locks) before doing further work that does not require those
426
resources (such as writing results to self.outf). Note though, that
427
as it releases all resources, this may release locks that the command
428
wants to hold, so use should be done with care.
430
self._operation.cleanup_now()
258
def _maybe_expand_globs(self, file_list):
259
"""Glob expand file_list if the platform does not do that itself.
261
:return: A possibly empty list of unicode paths.
263
Introduced in bzrlib 0.18.
267
if sys.platform == 'win32':
268
file_list = win32utils.glob_expand(file_list)
269
return list(file_list)
432
271
def _usage(self):
433
272
"""Return single-line grammar for this command.
444
283
elif aname[-1] == '*':
445
284
aname = '[' + aname[:-1] + '...]'
447
s = s[:-1] # remove last space
450
291
def get_help_text(self, additional_see_also=None, plain=True,
451
see_also_as_links=False, verbose=True):
292
see_also_as_links=False):
452
293
"""Return a text string with help for this command.
454
295
:param additional_see_also: Additional help topics to be
455
296
cross-referenced.
456
297
:param plain: if False, raw help (reStructuredText) is
457
298
returned instead of plain text.
458
299
:param see_also_as_links: if True, convert items in 'See also'
459
300
list to internal links (used by bzr_man rstx generator)
460
:param verbose: if True, display the full help, otherwise
461
leave out the descriptive sections and just display
462
usage help (e.g. Purpose, Usage, Options) with a
463
message explaining how to obtain full help.
466
i18n.install() # Install i18n only for get_help_text for now.
467
302
doc = self.help()
469
# Note: If self.gettext() translates ':Usage:\n', the section will
470
# be shown after "Description" section and we don't want to
471
# translate the usage string.
472
# Though, bzr export-pot don't exports :Usage: section and it must
474
doc = self.gettext(doc)
476
doc = gettext("No help for this command.")
304
raise NotImplementedError("sorry, no detailed help yet for %r" % self.name())
478
306
# Extract the summary (purpose) and sections out from the text
479
purpose,sections,order = self._get_help_parts(doc)
307
purpose,sections = self._get_help_parts(doc)
481
309
# If a custom usage section was provided, use it
482
310
if sections.has_key('Usage'):
487
315
# The header is the purpose and usage
489
result += gettext(':Purpose: %s\n') % (purpose,)
317
result += ':Purpose: %s\n' % purpose
490
318
if usage.find('\n') >= 0:
491
result += gettext(':Usage:\n%s\n') % (usage,)
319
result += ':Usage:\n%s\n' % usage
493
result += gettext(':Usage: %s\n') % (usage,)
321
result += ':Usage: %s\n' % usage
496
324
# Add the options
498
# XXX: optparse implicitly rewraps the help, and not always perfectly,
499
# so we get <https://bugs.launchpad.net/bzr/+bug/249908>. -- mbp
501
parser = option.get_optparser(self.options())
502
options = parser.format_option_help()
503
# FIXME: According to the spec, ReST option lists actually don't
504
# support options like --1.14 so that causes syntax errors (in Sphinx
505
# at least). As that pattern always appears in the commands that
506
# break, we trap on that and then format that block of 'format' options
507
# as a literal block. We use the most recent format still listed so we
508
# don't have to do that too often -- vila 20110514
509
if not plain and options.find(' --1.14 ') != -1:
510
options = options.replace(' format:\n', ' format::\n\n', 1)
325
options = option.get_optparser(self.options()).format_option_help()
511
326
if options.startswith('Options:'):
512
result += gettext(':Options:%s') % (options[len('options:'):],)
327
result += ':' + options
328
elif options.startswith('options:'):
329
# Python 2.4 version of optparse
330
result += ':Options:' + options[len('options:'):]
514
332
result += options
518
# Add the description, indenting it 2 spaces
519
# to match the indentation of the options
520
if sections.has_key(None):
521
text = sections.pop(None)
522
text = '\n '.join(text.splitlines())
523
result += gettext(':Description:\n %s\n\n') % (text,)
335
# Add the description, indenting it 2 spaces
336
# to match the indentation of the options
337
if sections.has_key(None):
338
text = sections.pop(None)
339
text = '\n '.join(text.splitlines())
340
result += ':%s:\n %s\n\n' % ('Description',text)
525
# Add the custom sections (e.g. Examples). Note that there's no need
526
# to indent these as they must be indented already in the source.
529
if label in sections:
530
result += ':%s:\n%s\n' % (label, sections[label])
533
result += (gettext("See bzr help %s for more details and examples.\n\n")
342
# Add the custom sections (e.g. Examples). Note that there's no need
343
# to indent these as they must be indented already in the source.
345
labels = sorted(sections.keys())
347
result += ':%s:\n%s\n\n' % (label,sections[label])
536
349
# Add the aliases, source (plug-in) and see also links, if any
538
result += gettext(':Aliases: ')
351
result += ':Aliases: '
539
352
result += ', '.join(self.aliases) + '\n'
540
353
plugin_name = self.plugin_name()
541
354
if plugin_name is not None:
542
result += gettext(':From: plugin "%s"\n') % plugin_name
355
result += ':From: plugin "%s"\n' % plugin_name
543
356
see_also = self.get_see_also(additional_see_also)
545
358
if not plain and see_also_as_links:
567
379
def _get_help_parts(text):
568
380
"""Split help text into a summary and named sections.
570
:return: (summary,sections,order) where summary is the top line and
382
:return: (summary,sections) where summary is the top line and
571
383
sections is a dictionary of the rest indexed by section name.
572
order is the order the section appear in the text.
573
384
A section starts with a heading line of the form ":xxx:".
574
385
Indented text on following lines is the section value.
575
386
All text found outside a named section is assigned to the
576
387
default section which is given the key of None.
578
def save_section(sections, order, label, section):
389
def save_section(sections, label, section):
579
390
if len(section) > 0:
580
391
if sections.has_key(label):
581
392
sections[label] += '\n' + section
584
394
sections[label] = section
586
396
lines = text.rstrip().splitlines()
587
397
summary = lines.pop(0)
590
399
label,section = None,''
591
400
for line in lines:
592
401
if line.startswith(':') and line.endswith(':') and len(line) > 2:
593
save_section(sections, order, label, section)
402
save_section(sections, label, section)
594
403
label,section = line[1:-1],''
595
elif (label is not None) and len(line) > 1 and not line[0].isspace():
596
save_section(sections, order, label, section)
404
elif label != None and len(line) > 1 and not line[0].isspace():
405
save_section(sections, label, section)
597
406
label,section = None,line
599
408
if len(section) > 0:
600
409
section += '\n' + line
603
save_section(sections, order, label, section)
604
return summary, sections, order
412
save_section(sections, label, section)
413
return summary, sections
606
415
def get_help_topic(self):
607
416
"""Return the commands help topic - its name."""
637
446
def _setup_outf(self):
638
447
"""Return a file linked to stdout, which has proper encoding."""
639
self.outf = ui.ui_factory.make_output_stream(
640
encoding_type=self.encoding_type)
448
assert self.encoding_type in ['strict', 'exact', 'replace']
450
# Originally I was using self.stdout, but that looks
451
# *way* too much like sys.stdout
452
if self.encoding_type == 'exact':
453
# force sys.stdout to be binary stream on win32
454
if sys.platform == 'win32':
455
fileno = getattr(sys.stdout, 'fileno', None)
458
msvcrt.setmode(fileno(), os.O_BINARY)
459
self.outf = sys.stdout
462
output_encoding = osutils.get_terminal_encoding()
464
self.outf = codecs.getwriter(output_encoding)(sys.stdout,
465
errors=self.encoding_type)
466
# For whatever reason codecs.getwriter() does not advertise its encoding
467
# it just returns the encoding of the wrapped file, which is completely
468
# bogus. So set the attribute, so we can find the correct encoding later.
469
self.outf.encoding = output_encoding
642
471
def run_argv_aliases(self, argv, alias_argv=None):
643
472
"""Parse the command line and run with extra aliases in alias_argv."""
474
warn("Passing None for [] is deprecated from bzrlib 0.10",
475
DeprecationWarning, stacklevel=2)
644
477
args, opts = parse_args(self, argv, alias_argv)
647
479
# Process the standard options
648
480
if 'help' in opts: # e.g. bzr add --help
649
self.outf.write(self.get_help_text())
651
if 'usage' in opts: # e.g. bzr add --usage
652
self.outf.write(self.get_help_text(verbose=False))
481
sys.stdout.write(self.get_help_text())
654
483
trace.set_verbosity_level(option._verbosity_level)
655
484
if 'verbose' in self.supported_std_options:
669
499
all_cmd_args = cmdargs.copy()
670
500
all_cmd_args.update(cmdopts)
673
return self.run(**all_cmd_args)
675
# reset it, so that other commands run in the same process won't
676
# inherit state. Before we reset it, log any activity, so that it
677
# gets properly tracked.
678
ui.ui_factory.log_transport_activity(
679
display=('bytes' in debug.debug_flags))
680
trace.set_verbosity_level(0)
682
def _setup_run(self):
683
"""Wrap the defined run method on self with a cleanup.
685
This is called by __init__ to make the Command be able to be run
686
by just calling run(), as it could be before cleanups were added.
688
If a different form of cleanups are in use by your Command subclass,
689
you can override this method.
692
def run(*args, **kwargs):
693
for hook in Command.hooks['pre_command']:
695
self._operation = cleanup.OperationWithCleanups(class_run)
697
return self._operation.run_simple(*args, **kwargs)
700
for hook in Command.hooks['post_command']:
504
return self.run(**all_cmd_args)
705
507
"""Actually run the command.
762
class CommandHooks(Hooks):
763
"""Hooks related to Command object creation/enumeration."""
766
"""Create the default hooks.
768
These are all empty initially, because by default nothing should get
771
Hooks.__init__(self, "bzrlib.commands", "Command.hooks")
772
self.add_hook('extend_command',
773
"Called after creating a command object to allow modifications "
774
"such as adding or removing options, docs etc. Called with the "
775
"new bzrlib.commands.Command object.", (1, 13))
776
self.add_hook('get_command',
777
"Called when creating a single command. Called with "
778
"(cmd_or_None, command_name). get_command should either return "
779
"the cmd_or_None parameter, or a replacement Command object that "
780
"should be used for the command. Note that the Command.hooks "
781
"hooks are core infrastructure. Many users will prefer to use "
782
"bzrlib.commands.register_command or plugin_cmds.register_lazy.",
784
self.add_hook('get_missing_command',
785
"Called when creating a single command if no command could be "
786
"found. Called with (command_name). get_missing_command should "
787
"either return None, or a Command object to be used for the "
789
self.add_hook('list_commands',
790
"Called when enumerating commands. Called with a set of "
791
"cmd_name strings for all the commands found so far. This set "
792
" is safe to mutate - e.g. to remove a command. "
793
"list_commands should return the updated set of command names.",
795
self.add_hook('pre_command',
796
"Called prior to executing a command. Called with the command "
798
self.add_hook('post_command',
799
"Called after executing a command. Called with the command "
802
Command.hooks = CommandHooks()
805
541
def parse_args(command, argv, alias_argv=None):
806
542
"""Parse command line.
808
544
Arguments and options are parsed at this level before being passed
809
545
down to specific command handlers. This routine knows, from a
810
546
lookup table, something about the available options, what optargs
847
576
argdict[argname + '_list'] = None
848
577
elif ap[-1] == '+':
850
raise errors.BzrCommandError(gettext(
851
"command {0!r} needs one or more {1}").format(
852
cmd, argname.upper()))
579
raise errors.BzrCommandError("command %r needs one or more %s"
580
% (cmd, argname.upper()))
854
582
argdict[argname + '_list'] = args[:]
856
584
elif ap[-1] == '$': # all but one
857
585
if len(args) < 2:
858
raise errors.BzrCommandError(
859
gettext("command {0!r} needs one or more {1}").format(
860
cmd, argname.upper()))
586
raise errors.BzrCommandError("command %r needs one or more %s"
587
% (cmd, argname.upper()))
861
588
argdict[argname + '_list'] = args[:-1]
864
591
# just a plain arg
867
raise errors.BzrCommandError(
868
gettext("command {0!r} requires argument {1}").format(
869
cmd, argname.upper()))
594
raise errors.BzrCommandError("command %r requires argument %s"
595
% (cmd, argname.upper()))
871
597
argdict[argname] = args.pop(0)
874
raise errors.BzrCommandError( gettext(
875
"extra argument to command {0}: {1}").format(
600
raise errors.BzrCommandError("extra argument to command %s: %s"
919
641
os.remove(pfname)
922
def exception_to_return_code(the_callable, *args, **kwargs):
923
"""UI level helper for profiling and coverage.
925
This transforms exceptions into a return value of 3. As such its only
926
relevant to the UI layer, and should never be called where catching
927
exceptions may be desirable.
930
return the_callable(*args, **kwargs)
931
except (KeyboardInterrupt, Exception), e:
932
# used to handle AssertionError and KeyboardInterrupt
933
# specially here, but hopefully they're handled ok by the logger now
934
exc_info = sys.exc_info()
935
exitcode = trace.report_exception(exc_info, sys.stderr)
936
if os.environ.get('BZR_PDB'):
937
print '**** entering debugger'
939
pdb.post_mortem(exc_info[2])
943
644
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
944
645
from bzrlib.lsprof import profile
945
ret, stats = profile(exception_to_return_code, the_callable,
646
ret, stats = profile(the_callable, *args, **kwargs)
948
648
if filename is None:
951
651
stats.save(filename)
952
trace.note(gettext('Profile data written to "%s".'), filename)
652
trace.note('Profile data written to "%s".', filename)
656
def shlex_split_unicode(unsplit):
658
return [u.decode('utf-8') for u in shlex.split(unsplit.encode('utf-8'))]
956
661
def get_alias(cmd, config=None):
957
662
"""Return an expanded alias, or None if no alias exists.
968
673
config = bzrlib.config.GlobalConfig()
969
674
alias = config.get_alias(cmd)
971
return cmdline.split(alias)
676
return shlex_split_unicode(alias)
975
def run_bzr(argv, load_plugins=load_plugins, disable_plugins=disable_plugins):
976
681
"""Execute a command.
978
:param argv: The command-line arguments, without the program name from
979
argv[0] These should already be decoded. All library/test code calling
980
run_bzr should be passing valid strings (don't need decoding).
981
:param load_plugins: What function to call when triggering plugin loading.
982
This function should take no arguments and cause all plugins to be
984
:param disable_plugins: What function to call when disabling plugin
985
loading. This function should take no arguments and cause all plugin
986
loading to be prohibited (so that code paths in your application that
987
know about some plugins possibly being present will fail to import
988
those plugins even if they are installed.)
989
:return: Returns a command exit code or raises an exception.
683
This is similar to main(), but without all the trappings for
684
logging and error handling.
687
The command-line arguments, without the program name from argv[0]
688
These should already be decoded. All library/test code calling
689
run_bzr should be passing valid strings (don't need decoding).
691
Returns a command status or raises an exception.
991
693
Special master options: these must come before the command because
992
694
they control how the command is interpreted.
1042
739
opt_no_plugins = True
1043
740
elif a == '--no-aliases':
1044
741
opt_no_aliases = True
1045
elif a == '--no-l10n':
1047
742
elif a == '--builtin':
1048
743
opt_builtin = True
1049
elif a == '--concurrency':
1050
os.environ['BZR_CONCURRENCY'] = argv[i + 1]
1052
744
elif a == '--coverage':
1053
745
opt_coverage_dir = argv[i + 1]
1055
elif a == '--profile-imports':
1056
pass # already handled in startup script Bug #588277
1057
747
elif a.startswith('-D'):
1058
748
debug.debug_flags.add(a[2:])
1059
elif a.startswith('-O'):
1060
override_config.append(a[2:])
1062
750
argv_copy.append(a)
1065
if bzrlib.global_state is None:
1066
# FIXME: Workaround for users that imported bzrlib but didn't call
1067
# bzrlib.initialize -- vila 2012-01-19
1068
cmdline_overrides = config.CommandLineStore()
1070
cmdline_overrides = bzrlib.global_state.cmdline_overrides
1071
cmdline_overrides._from_cmdline(override_config)
1073
debug.set_debug_flags_from_config()
755
from bzrlib.builtins import cmd_help
756
cmd_help().run_argv_aliases([])
759
if argv[0] == '--version':
760
from bzrlib.builtins import cmd_version
761
cmd_version().run_argv_aliases([])
1075
764
if not opt_no_plugins:
765
from bzrlib.plugin import load_plugins
768
from bzrlib.plugin import disable_plugins
1078
769
disable_plugins()
1082
get_cmd_object('help').run_argv_aliases([])
1085
if argv[0] == '--version':
1086
get_cmd_object('version').run_argv_aliases([])
1089
771
alias_argv = None
1091
773
if not opt_no_aliases:
1092
774
alias_argv = get_alias(argv[0])
776
alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv]
1094
777
argv[0] = alias_argv.pop(0)
1096
779
cmd = argv.pop(0)
780
# We want only 'ascii' command names, but the user may have typed
781
# in a Unicode name. In that case, they should just get a
782
# 'command not found' error later.
1097
784
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
1100
785
run = cmd_obj.run_argv_aliases
1101
786
run_argv = [argv, alias_argv]
1104
# We can be called recursively (tests for example), but we don't want
1105
# the verbosity level to propagate.
1106
saved_verbosity_level = option._verbosity_level
1107
option._verbosity_level = 0
1109
790
if opt_coverage_dir:
1151
825
return ignore_pipe
1154
def install_bzr_command_hooks():
1155
"""Install the hooks to supply bzr's own commands."""
1156
if _list_bzr_commands in Command.hooks["list_commands"]:
1158
Command.hooks.install_named_hook("list_commands", _list_bzr_commands,
1160
Command.hooks.install_named_hook("get_command", _get_bzr_command,
1162
Command.hooks.install_named_hook("get_command", _get_plugin_command,
1163
"bzr plugin commands")
1164
Command.hooks.install_named_hook("get_command", _get_external_command,
1165
"bzr external command lookup")
1166
Command.hooks.install_named_hook("get_missing_command",
1167
_try_plugin_provider,
1168
"bzr plugin-provider-db check")
1172
def _specified_or_unicode_argv(argv):
1173
# For internal or testing use, argv can be passed. Otherwise, get it from
1174
# the process arguments in a unicode-safe way.
1176
return osutils.get_unicode_argv()
1180
# ensure all arguments are unicode strings
1182
if isinstance(a, unicode):
1185
new_argv.append(a.decode('ascii'))
1186
except UnicodeDecodeError:
1187
raise errors.BzrError("argv should be list of unicode strings.")
1191
def main(argv=None):
1192
"""Main entry point of command-line interface.
1194
Typically `bzrlib.initialize` should be called first.
1196
:param argv: list of unicode command-line arguments similar to sys.argv.
1197
argv[0] is script name usually, it will be ignored.
1198
Don't pass here sys.argv because this list contains plain strings
1199
and not unicode; pass None instead.
1201
:return: exit code of bzr command.
1203
if argv is not None:
1205
_register_builtin_commands()
830
from bzrlib.ui.text import TextUIFactory
831
bzrlib.ui.ui_factory = TextUIFactory()
833
argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
834
except UnicodeDecodeError:
835
raise errors.BzrError(("Parameter '%r' is unsupported by the current "
1206
837
ret = run_bzr_catch_errors(argv)
1207
838
trace.mutter("return code %d", ret)
1211
842
def run_bzr_catch_errors(argv):
1212
"""Run a bzr command with parameters as described by argv.
1214
This function assumed that that UI layer is setup, that symbol deprecations
1215
are already applied, and that unicode decoding has already been performed on argv.
1217
# done here so that they're covered for every test run
1218
install_bzr_command_hooks()
1219
return exception_to_return_code(run_bzr, argv)
843
# Note: The except clause logic below should be kept in sync with the
844
# profile() routine in lsprof.py.
847
except (KeyboardInterrupt, Exception), e:
848
# used to handle AssertionError and KeyboardInterrupt
849
# specially here, but hopefully they're handled ok by the logger now
850
exitcode = trace.report_exception(sys.exc_info(), sys.stderr)
851
if os.environ.get('BZR_PDB'):
852
print '**** entering debugger'
854
pdb.post_mortem(sys.exc_traceback)
1222
858
def run_bzr_catch_user_errors(argv):
added
removed
bzrlib/commands.py
