4792.8.9
by Martin Pool
Send Command.outf through UIFactory |
1 |
# Copyright (C) 2006, 2008, 2009 Canonical Ltd
|
1610.1.4
by Martin Pool
Doc |
2 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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.
|
|
1610.1.4
by Martin Pool
Doc |
7 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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.
|
|
1610.1.4
by Martin Pool
Doc |
12 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
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
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
17 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
18 |
# TODO: probably should say which arguments are candidates for glob
|
19 |
# expansion on windows and do that at the command level.
|
|
20 |
||
1095
by Martin Pool
todo |
21 |
# TODO: Define arguments by objects, rather than just using names.
|
22 |
# Those objects can specify the expected type of the argument, which
|
|
1610.1.4
by Martin Pool
Doc |
23 |
# would help with validation and shell completion. They could also provide
|
24 |
# help/explanation for that argument in a structured way.
|
|
25 |
||
26 |
# TODO: Specific "examples" property on commands for consistent formatting.
|
|
1095
by Martin Pool
todo |
27 |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
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?
|
|
30 |
||
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
31 |
import os |
32 |
import sys |
|
33 |
||
34 |
from bzrlib.lazy_import import lazy_import |
|
35 |
lazy_import(globals(), """ |
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
36 |
import codecs
|
37 |
import errno
|
|
4325.1.1
by Vincent Ladeuil
Make --coverage works for threads too. |
38 |
import threading
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
39 |
from warnings import warn
|
1
by mbp at sourcefrog
import from baz patch-364 |
40 |
|
41 |
import bzrlib
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
42 |
from bzrlib import (
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
43 |
cleanup,
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
44 |
debug,
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
45 |
errors,
|
46 |
option,
|
|
47 |
osutils,
|
|
48 |
trace,
|
|
4792.8.9
by Martin Pool
Send Command.outf through UIFactory |
49 |
ui,
|
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
50 |
win32utils,
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
51 |
)
|
52 |
""") |
|
53 |
||
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
54 |
from bzrlib.hooks import HookPoint, Hooks |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
55 |
# Compatibility - Option used to be in commands.
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
56 |
from bzrlib.option import Option |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
57 |
from bzrlib import registry |
4119.3.10
by Robert Collins
More review feedback. |
58 |
from bzrlib.symbol_versioning import ( |
59 |
deprecated_function, |
|
60 |
deprecated_in, |
|
4786.1.5
by John Arbash Meinel
Deprecate _maybe_expand_globs and remove calls to it. |
61 |
deprecated_method, |
4119.3.10
by Robert Collins
More review feedback. |
62 |
suppress_deprecation_warnings, |
63 |
)
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
64 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
65 |
|
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
66 |
class CommandInfo(object): |
67 |
"""Information about a command."""
|
|
68 |
||
69 |
def __init__(self, aliases): |
|
70 |
"""The list of aliases for the command."""
|
|
71 |
self.aliases = aliases |
|
72 |
||
73 |
@classmethod
|
|
74 |
def from_command(klass, command): |
|
75 |
"""Factory to construct a CommandInfo from a command."""
|
|
76 |
return klass(command.aliases) |
|
77 |
||
78 |
||
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
79 |
class CommandRegistry(registry.Registry): |
80 |
||
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
81 |
@staticmethod
|
82 |
def _get_name(command_name): |
|
83 |
if command_name.startswith("cmd_"): |
|
84 |
return _unsquish_command_name(command_name) |
|
85 |
else: |
|
86 |
return command_name |
|
87 |
||
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
88 |
def register(self, cmd, decorate=False): |
89 |
"""Utility function to help register a command
|
|
90 |
||
91 |
:param cmd: Command subclass to register
|
|
92 |
:param decorate: If true, allow overriding an existing command
|
|
93 |
of the same name; the old command is returned by this function.
|
|
94 |
Otherwise it is an error to try to override an existing command.
|
|
95 |
"""
|
|
96 |
k = cmd.__name__ |
|
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
97 |
k_unsquished = self._get_name(k) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
98 |
try: |
99 |
previous = self.get(k_unsquished) |
|
100 |
except KeyError: |
|
101 |
previous = _builtin_commands().get(k_unsquished) |
|
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
102 |
info = CommandInfo.from_command(cmd) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
103 |
try: |
104 |
registry.Registry.register(self, k_unsquished, cmd, |
|
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
105 |
override_existing=decorate, info=info) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
106 |
except KeyError: |
4695.5.2
by Martin Pool
Remove trace.log_error |
107 |
trace.warning('Two plugins defined the same command: %r' % k) |
108 |
trace.warning('Not loading the one in %r' % |
|
109 |
sys.modules[cmd.__module__]) |
|
110 |
trace.warning('Previously this command was registered from %r' % |
|
111 |
sys.modules[previous.__module__]) |
|
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
112 |
return previous |
113 |
||
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
114 |
def register_lazy(self, command_name, aliases, module_name): |
115 |
"""Register a command without loading its module.
|
|
116 |
||
117 |
:param command_name: The primary name of the command.
|
|
118 |
:param aliases: A list of aliases for the command.
|
|
119 |
:module_name: The module that the command lives in.
|
|
120 |
"""
|
|
121 |
key = self._get_name(command_name) |
|
122 |
registry.Registry.register_lazy(self, key, module_name, command_name, |
|
123 |
info=CommandInfo(aliases)) |
|
124 |
||
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
125 |
|
126 |
plugin_cmds = CommandRegistry() |
|
731
by Martin Pool
- merge plugin patch from john |
127 |
|
128 |
||
1492
by Robert Collins
Support decoration of commands. |
129 |
def register_command(cmd, decorate=False): |
731
by Martin Pool
- merge plugin patch from john |
130 |
global plugin_cmds |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
131 |
return plugin_cmds.register(cmd, decorate) |
731
by Martin Pool
- merge plugin patch from john |
132 |
|
133 |
||
350
by Martin Pool
- refactor command aliases into command classes |
134 |
def _squish_command_name(cmd): |
135 |
return 'cmd_' + cmd.replace('-', '_') |
|
136 |
||
137 |
||
138 |
def _unsquish_command_name(cmd): |
|
139 |
return cmd[4:].replace('_','-') |
|
140 |
||
914
by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch |
141 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
142 |
def _builtin_commands(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
143 |
import bzrlib.builtins |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
144 |
return _scan_module_for_commands(bzrlib.builtins) |
145 |
||
146 |
||
147 |
def _scan_module_for_commands(module): |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
148 |
r = {} |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
149 |
for name, obj in module.__dict__.iteritems(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
150 |
if name.startswith("cmd_"): |
1616.1.6
by Martin Pool
doc |
151 |
real_name = _unsquish_command_name(name) |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
152 |
r[real_name] = obj |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
153 |
return r |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
154 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
155 |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
156 |
def _list_bzr_commands(names): |
4119.3.10
by Robert Collins
More review feedback. |
157 |
"""Find commands from bzr's core and plugins."""
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
158 |
# to eliminate duplicates
|
159 |
names.update(builtin_command_names()) |
|
160 |
names.update(plugin_command_names()) |
|
161 |
return names |
|
162 |
||
163 |
||
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
164 |
def all_command_names(): |
4119.3.10
by Robert Collins
More review feedback. |
165 |
"""Return a set of all command names."""
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
166 |
names = set() |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
167 |
for hook in Command.hooks['list_commands']: |
4119.3.10
by Robert Collins
More review feedback. |
168 |
names = hook(names) |
169 |
if names is None: |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
170 |
raise AssertionError( |
171 |
'hook %s returned None' % Command.hooks.get_hook_name(hook)) |
|
172 |
return names |
|
173 |
||
174 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
175 |
def builtin_command_names(): |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
176 |
"""Return list of builtin command names.
|
177 |
|
|
178 |
Use of all_command_names() is encouraged rather than builtin_command_names
|
|
179 |
and/or plugin_command_names.
|
|
180 |
"""
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
181 |
return _builtin_commands().keys() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
182 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
183 |
|
184 |
def plugin_command_names(): |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
185 |
"""Returns command names from commands registered by plugins."""
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
186 |
return plugin_cmds.keys() |
187 |
||
188 |
||
4119.3.10
by Robert Collins
More review feedback. |
189 |
@deprecated_function(deprecated_in((1, 17, 0))) |
190 |
def get_all_cmds(plugins_override=False): |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
191 |
"""Return canonical name and class for most commands.
|
192 |
|
|
193 |
NB: This does not return all commands since the introduction of
|
|
194 |
command hooks, and returning the class is not sufficient to
|
|
195 |
get correctly setup commands, which is why it is deprecated.
|
|
196 |
||
197 |
Use 'all_command_names' + 'get_cmd_object' instead.
|
|
198 |
"""
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
199 |
d = _builtin_commands() |
731
by Martin Pool
- merge plugin patch from john |
200 |
if plugins_override: |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
201 |
d.update(plugin_cmds.iteritems()) |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
202 |
for k, v in d.iteritems(): |
641
by Martin Pool
- improved external-command patch from john |
203 |
yield k,v |
204 |
||
205 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
206 |
def get_cmd_object(cmd_name, plugins_override=True): |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
207 |
"""Return the command object for a command.
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
208 |
|
209 |
plugins_override
|
|
210 |
If true, plugin commands can override builtins.
|
|
350
by Martin Pool
- refactor command aliases into command classes |
211 |
"""
|
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
212 |
try: |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
213 |
return _get_cmd_object(cmd_name, plugins_override) |
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
214 |
except KeyError: |
215 |
raise errors.BzrCommandError('unknown command "%s"' % cmd_name) |
|
216 |
||
217 |
||
218 |
def _get_cmd_object(cmd_name, plugins_override=True): |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
219 |
"""Get a command object.
|
220 |
||
221 |
:param cmd_name: The name of the command.
|
|
222 |
:param plugins_override: Allow plugins to override builtins.
|
|
223 |
:return: A Command object instance
|
|
4119.3.10
by Robert Collins
More review feedback. |
224 |
:raises KeyError: If no command is found.
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
225 |
"""
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
226 |
# We want only 'ascii' command names, but the user may have typed
|
227 |
# in a Unicode name. In that case, they should just get a
|
|
228 |
# 'command not found' error later.
|
|
229 |
# In the future, we may actually support Unicode command names.
|
|
230 |
cmd = None |
|
231 |
# Get a command
|
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
232 |
for hook in Command.hooks['get_command']: |
233 |
cmd = hook(cmd, cmd_name) |
|
4119.3.10
by Robert Collins
More review feedback. |
234 |
if cmd is not None and not plugins_override and not cmd.plugin_name(): |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
235 |
# We've found a non-plugin command, don't permit it to be
|
236 |
# overridden.
|
|
4119.3.10
by Robert Collins
More review feedback. |
237 |
break
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
238 |
if cmd is None: |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
239 |
for hook in Command.hooks['get_missing_command']: |
240 |
cmd = hook(cmd_name) |
|
241 |
if cmd is not None: |
|
242 |
break
|
|
243 |
if cmd is None: |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
244 |
# No command found.
|
245 |
raise KeyError |
|
246 |
# Allow plugins to extend commands
|
|
247 |
for hook in Command.hooks['extend_command']: |
|
248 |
hook(cmd) |
|
249 |
return cmd |
|
250 |
||
251 |
||
4119.3.8
by Robert Collins
Get missing command support sorted out. |
252 |
def _try_plugin_provider(cmd_name): |
253 |
"""Probe for a plugin provider having cmd_name."""
|
|
254 |
try: |
|
255 |
plugin_metadata, provider = probe_for_provider(cmd_name) |
|
256 |
raise errors.CommandAvailableInPlugin(cmd_name, |
|
257 |
plugin_metadata, provider) |
|
258 |
except errors.NoPluginAvailable: |
|
259 |
pass
|
|
260 |
||
261 |
||
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
262 |
def probe_for_provider(cmd_name): |
263 |
"""Look for a provider for cmd_name.
|
|
264 |
||
265 |
:param cmd_name: The command name.
|
|
266 |
:return: plugin_metadata, provider for getting cmd_name.
|
|
267 |
:raises NoPluginAvailable: When no provider can supply the plugin.
|
|
268 |
"""
|
|
269 |
# look for providers that provide this command but aren't installed
|
|
270 |
for provider in command_providers_registry: |
|
271 |
try: |
|
272 |
return provider.plugin_for_command(cmd_name), provider |
|
273 |
except errors.NoPluginAvailable: |
|
274 |
pass
|
|
275 |
raise errors.NoPluginAvailable(cmd_name) |
|
276 |
||
277 |
||
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
278 |
def _get_bzr_command(cmd_or_None, cmd_name): |
279 |
"""Get a command from bzr's core."""
|
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
280 |
cmds = _builtin_commands() |
272
by Martin Pool
- Add command aliases |
281 |
try: |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
282 |
return cmds[cmd_name]() |
272
by Martin Pool
- Add command aliases |
283 |
except KeyError: |
350
by Martin Pool
- refactor command aliases into command classes |
284 |
pass
|
285 |
# look for any command which claims this as an alias
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
286 |
for real_cmd_name, cmd_class in cmds.iteritems(): |
287 |
if cmd_name in cmd_class.aliases: |
|
288 |
return cmd_class() |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
289 |
return cmd_or_None |
290 |
||
291 |
||
292 |
def _get_external_command(cmd_or_None, cmd_name): |
|
293 |
"""Lookup a command that is a shell script."""
|
|
294 |
# Only do external command lookups when no command is found so far.
|
|
295 |
if cmd_or_None is not None: |
|
296 |
return cmd_or_None |
|
297 |
from bzrlib.externalcommand import ExternalCommand |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
298 |
cmd_obj = ExternalCommand.find_command(cmd_name) |
299 |
if cmd_obj: |
|
300 |
return cmd_obj |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
301 |
|
302 |
||
303 |
def _get_plugin_command(cmd_or_None, cmd_name): |
|
304 |
"""Get a command from bzr's plugins."""
|
|
305 |
try: |
|
306 |
return plugin_cmds.get(cmd_name)() |
|
307 |
except KeyError: |
|
308 |
pass
|
|
309 |
for key in plugin_cmds.keys(): |
|
310 |
info = plugin_cmds.get_info(key) |
|
311 |
if cmd_name in info.aliases: |
|
312 |
return plugin_cmds.get(key)() |
|
313 |
return cmd_or_None |
|
272
by Martin Pool
- Add command aliases |
314 |
|
329
by Martin Pool
- refactor command functions into command classes |
315 |
|
558
by Martin Pool
- All top-level classes inherit from object |
316 |
class Command(object): |
329
by Martin Pool
- refactor command functions into command classes |
317 |
"""Base class for commands.
|
318 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
319 |
Commands are the heart of the command-line bzr interface.
|
320 |
||
321 |
The command object mostly handles the mapping of command-line
|
|
322 |
parameters into one or more bzrlib operations, and of the results
|
|
323 |
into textual output.
|
|
324 |
||
325 |
Commands normally don't have any state. All their arguments are
|
|
326 |
passed in to the run method. (Subclasses may take a different
|
|
327 |
policy if the behaviour of the instance needs to depend on e.g. a
|
|
328 |
shell plugin and not just its Python class.)
|
|
329 |
||
329
by Martin Pool
- refactor command functions into command classes |
330 |
The docstring for an actual command should give a single-line
|
331 |
summary, then a complete description of the command. A grammar
|
|
332 |
description will be inserted.
|
|
333 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
334 |
aliases
|
335 |
Other accepted names for this command.
|
|
336 |
||
329
by Martin Pool
- refactor command functions into command classes |
337 |
takes_args
|
338 |
List of argument forms, marked with whether they are optional,
|
|
339 |
repeated, etc.
|
|
340 |
||
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
341 |
Examples:
|
342 |
||
343 |
['to_location', 'from_branch?', 'file*']
|
|
344 |
||
345 |
'to_location' is required
|
|
346 |
'from_branch' is optional
|
|
347 |
'file' can be specified 0 or more times
|
|
1185.37.4
by Jamie Wilkinson
add some examples to the documentation for Command.takes_args |
348 |
|
329
by Martin Pool
- refactor command functions into command classes |
349 |
takes_options
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
350 |
List of options that may be given for this command. These can
|
351 |
be either strings, referring to globally-defined options,
|
|
352 |
or option objects. Retrieve through options().
|
|
329
by Martin Pool
- refactor command functions into command classes |
353 |
|
354 |
hidden
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
355 |
If true, this command isn't advertised. This is typically
|
356 |
for commands intended for expert users.
|
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
357 |
|
358 |
encoding_type
|
|
359 |
Command objects will get a 'outf' attribute, which has been
|
|
360 |
setup to properly handle encoding of unicode strings.
|
|
361 |
encoding_type determines what will happen when characters cannot
|
|
362 |
be encoded
|
|
363 |
strict - abort if we cannot decode
|
|
364 |
replace - put in a bogus character (typically '?')
|
|
365 |
exact - do not encode sys.stdout
|
|
366 |
||
2178.4.5
by Alexander Belchenko
Spell-checking (thanks to Aaron) |
367 |
NOTE: by default on Windows, sys.stdout is opened as a text
|
368 |
stream, therefore LF line-endings are converted to CRLF.
|
|
369 |
When a command uses encoding_type = 'exact', then
|
|
370 |
sys.stdout is forced to be a binary stream, and line-endings
|
|
2178.4.4
by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32 |
371 |
will not mangled.
|
2178.4.5
by Alexander Belchenko
Spell-checking (thanks to Aaron) |
372 |
|
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. |
373 |
:cvar hooks: An instance of CommandHooks.
|
329
by Martin Pool
- refactor command functions into command classes |
374 |
"""
|
375 |
aliases = [] |
|
376 |
takes_args = [] |
|
377 |
takes_options = [] |
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
378 |
encoding_type = 'strict' |
329
by Martin Pool
- refactor command functions into command classes |
379 |
|
380 |
hidden = False |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
381 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
382 |
def __init__(self): |
383 |
"""Construct an instance of this command."""
|
|
973
by Martin Pool
- various refactorings of command interpreter |
384 |
if self.__doc__ == Command.__doc__: |
385 |
warn("No help message set for %r" % self) |
|
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
386 |
# List of standard options directly supported
|
387 |
self.supported_std_options = [] |
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
388 |
self._operation = cleanup.OperationWithCleanups(self.run) |
389 |
||
390 |
def add_cleanup(self, cleanup_func, *args, **kwargs): |
|
4900.1.3
by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too. |
391 |
"""Register a function to call after self.run returns or raises.
|
392 |
||
393 |
Functions will be called in LIFO order.
|
|
394 |
"""
|
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
395 |
self._operation.add_cleanup(cleanup_func, *args, **kwargs) |
4900.1.3
by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too. |
396 |
|
397 |
def cleanup_now(self): |
|
398 |
"""Execute and empty pending cleanup functions immediately.
|
|
399 |
||
400 |
After cleanup_now all registered cleanups are forgotten. add_cleanup
|
|
401 |
may be called again after cleanup_now; these cleanups will be called
|
|
402 |
after self.run returns or raises (or when cleanup_now is next called).
|
|
403 |
||
404 |
This is useful for releasing expensive or contentious resources (such
|
|
405 |
as write locks) before doing further work that does not require those
|
|
406 |
resources (such as writing results to self.outf).
|
|
407 |
"""
|
|
408 |
self._operation.cleanup_now() |
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
409 |
|
4786.1.5
by John Arbash Meinel
Deprecate _maybe_expand_globs and remove calls to it. |
410 |
@deprecated_method(deprecated_in((2, 1, 0))) |
2568.2.6
by Robert Collins
Review feedback. |
411 |
def _maybe_expand_globs(self, file_list): |
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
412 |
"""Glob expand file_list if the platform does not do that itself.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
413 |
|
4786.1.5
by John Arbash Meinel
Deprecate _maybe_expand_globs and remove calls to it. |
414 |
Not used anymore, now that the bzr command-line parser globs on
|
415 |
Windows.
|
|
416 |
||
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
417 |
:return: A possibly empty list of unicode paths.
|
418 |
||
419 |
Introduced in bzrlib 0.18.
|
|
420 |
"""
|
|
4786.1.5
by John Arbash Meinel
Deprecate _maybe_expand_globs and remove calls to it. |
421 |
return file_list |
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
422 |
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
423 |
def _usage(self): |
424 |
"""Return single-line grammar for this command.
|
|
425 |
||
426 |
Only describes arguments, not options.
|
|
427 |
"""
|
|
428 |
s = 'bzr ' + self.name() + ' ' |
|
429 |
for aname in self.takes_args: |
|
430 |
aname = aname.upper() |
|
431 |
if aname[-1] in ['$', '+']: |
|
432 |
aname = aname[:-1] + '...' |
|
433 |
elif aname[-1] == '?': |
|
434 |
aname = '[' + aname[:-1] + ']' |
|
435 |
elif aname[-1] == '*': |
|
436 |
aname = '[' + aname[:-1] + '...]' |
|
437 |
s += aname + ' ' |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
438 |
s = s[:-1] # remove last space |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
439 |
return s |
440 |
||
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
441 |
def get_help_text(self, additional_see_also=None, plain=True, |
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
442 |
see_also_as_links=False, verbose=True): |
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
443 |
"""Return a text string with help for this command.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
444 |
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
445 |
:param additional_see_also: Additional help topics to be
|
446 |
cross-referenced.
|
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
447 |
:param plain: if False, raw help (reStructuredText) is
|
448 |
returned instead of plain text.
|
|
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
449 |
:param see_also_as_links: if True, convert items in 'See also'
|
2677.1.4
by Alexander Belchenko
fixes after John's review |
450 |
list to internal links (used by bzr_man rstx generator)
|
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
451 |
:param verbose: if True, display the full help, otherwise
|
452 |
leave out the descriptive sections and just display
|
|
3984.4.8
by Ian Clatworthy
tweak docstring |
453 |
usage help (e.g. Purpose, Usage, Options) with a
|
454 |
message explaining how to obtain full help.
|
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
455 |
"""
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
456 |
doc = self.help() |
457 |
if doc is None: |
|
458 |
raise NotImplementedError("sorry, no detailed help yet for %r" % self.name()) |
|
459 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
460 |
# Extract the summary (purpose) and sections out from the text
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
461 |
purpose,sections,order = self._get_help_parts(doc) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
462 |
|
463 |
# If a custom usage section was provided, use it
|
|
464 |
if sections.has_key('Usage'): |
|
465 |
usage = sections.pop('Usage') |
|
466 |
else: |
|
467 |
usage = self._usage() |
|
468 |
||
469 |
# The header is the purpose and usage
|
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
470 |
result = "" |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
471 |
result += ':Purpose: %s\n' % purpose |
472 |
if usage.find('\n') >= 0: |
|
473 |
result += ':Usage:\n%s\n' % usage |
|
474 |
else: |
|
475 |
result += ':Usage: %s\n' % usage |
|
476 |
result += '\n' |
|
477 |
||
478 |
# Add the options
|
|
4070.11.3
by Martin Pool
doc |
479 |
#
|
480 |
# XXX: optparse implicitly rewraps the help, and not always perfectly,
|
|
481 |
# so we get <https://bugs.launchpad.net/bzr/+bug/249908>. -- mbp
|
|
482 |
# 20090319
|
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
483 |
options = option.get_optparser(self.options()).format_option_help() |
4634.39.39
by Ian Clatworthy
Fix ReST syntax errors in User Reference caused by options like --1.9 that ReST option lists don't permit |
484 |
# XXX: According to the spec, ReST option lists actually don't support
|
485 |
# options like --1.9 so that causes syntax errors (in Sphinx at least).
|
|
486 |
# As that pattern always appears in the commands that break, we trap
|
|
487 |
# on that and then format that block of 'format' options as a literal
|
|
488 |
# block.
|
|
489 |
if not plain and options.find(' --1.9 ') != -1: |
|
490 |
options = options.replace(' format:\n', ' format::\n\n', 1) |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
491 |
if options.startswith('Options:'): |
492 |
result += ':' + options |
|
2666.1.9
by Ian Clatworthy
Fix case of Options in help under Python 2.4 |
493 |
elif options.startswith('options:'): |
494 |
# Python 2.4 version of optparse
|
|
495 |
result += ':Options:' + options[len('options:'):] |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
496 |
else: |
497 |
result += options |
|
498 |
result += '\n' |
|
499 |
||
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
500 |
if verbose: |
501 |
# Add the description, indenting it 2 spaces
|
|
502 |
# to match the indentation of the options
|
|
503 |
if sections.has_key(None): |
|
504 |
text = sections.pop(None) |
|
505 |
text = '\n '.join(text.splitlines()) |
|
506 |
result += ':%s:\n %s\n\n' % ('Description',text) |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
507 |
|
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
508 |
# Add the custom sections (e.g. Examples). Note that there's no need
|
509 |
# to indent these as they must be indented already in the source.
|
|
510 |
if sections: |
|
511 |
for label in order: |
|
512 |
if sections.has_key(label): |
|
513 |
result += ':%s:\n%s\n' % (label,sections[label]) |
|
514 |
result += '\n' |
|
515 |
else: |
|
3984.4.4
by Ian Clatworthy
merge bzr.dev r4054 |
516 |
result += ("See bzr help %s for more details and examples.\n\n" |
3984.4.2
by Ian Clatworthy
make help on commands concise by default |
517 |
% self.name()) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
518 |
|
519 |
# Add the aliases, source (plug-in) and see also links, if any
|
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
520 |
if self.aliases: |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
521 |
result += ':Aliases: ' |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
522 |
result += ', '.join(self.aliases) + '\n' |
523 |
plugin_name = self.plugin_name() |
|
524 |
if plugin_name is not None: |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
525 |
result += ':From: plugin "%s"\n' % plugin_name |
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
526 |
see_also = self.get_see_also(additional_see_also) |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
527 |
if see_also: |
2677.1.4
by Alexander Belchenko
fixes after John's review |
528 |
if not plain and see_also_as_links: |
529 |
see_also_links = [] |
|
530 |
for item in see_also: |
|
531 |
if item == 'topics': |
|
532 |
# topics doesn't have an independent section
|
|
533 |
# so don't create a real link
|
|
534 |
see_also_links.append(item) |
|
535 |
else: |
|
4927.2.2
by Ian Clatworthy
User Reference as topics |
536 |
# Use a Sphinx link for this entry
|
537 |
link_text = ":doc:`%s <%s-help>`" % (item, item) |
|
538 |
see_also_links.append(link_text) |
|
2677.1.4
by Alexander Belchenko
fixes after John's review |
539 |
see_also = see_also_links |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
540 |
result += ':See also: ' |
541 |
result += ', '.join(see_also) + '\n' |
|
542 |
||
3668.2.1
by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name. |
543 |
# If this will be rendered as plain text, convert it
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
544 |
if plain: |
545 |
import bzrlib.help_topics |
|
546 |
result = bzrlib.help_topics.help_as_plain_text(result) |
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
547 |
return result |
548 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
549 |
@staticmethod
|
550 |
def _get_help_parts(text): |
|
551 |
"""Split help text into a summary and named sections.
|
|
552 |
||
3974.1.1
by Ian Clatworthy
keep section ordering in help |
553 |
:return: (summary,sections,order) where summary is the top line and
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
554 |
sections is a dictionary of the rest indexed by section name.
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
555 |
order is the order the section appear in the text.
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
556 |
A section starts with a heading line of the form ":xxx:".
|
557 |
Indented text on following lines is the section value.
|
|
558 |
All text found outside a named section is assigned to the
|
|
559 |
default section which is given the key of None.
|
|
560 |
"""
|
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
561 |
def save_section(sections, order, label, section): |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
562 |
if len(section) > 0: |
563 |
if sections.has_key(label): |
|
564 |
sections[label] += '\n' + section |
|
565 |
else: |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
566 |
order.append(label) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
567 |
sections[label] = section |
3668.2.1
by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name. |
568 |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
569 |
lines = text.rstrip().splitlines() |
570 |
summary = lines.pop(0) |
|
571 |
sections = {} |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
572 |
order = [] |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
573 |
label,section = None,'' |
574 |
for line in lines: |
|
575 |
if line.startswith(':') and line.endswith(':') and len(line) > 2: |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
576 |
save_section(sections, order, label, section) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
577 |
label,section = line[1:-1],'' |
3376.2.11
by Martin Pool
Compare to None using is/is not not == |
578 |
elif (label is not None) and len(line) > 1 and not line[0].isspace(): |
3974.1.1
by Ian Clatworthy
keep section ordering in help |
579 |
save_section(sections, order, label, section) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
580 |
label,section = None,line |
581 |
else: |
|
582 |
if len(section) > 0: |
|
583 |
section += '\n' + line |
|
584 |
else: |
|
585 |
section = line |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
586 |
save_section(sections, order, label, section) |
587 |
return summary, sections, order |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
588 |
|
2432.1.28
by Robert Collins
Add a get_help_topic method to commands.Command. |
589 |
def get_help_topic(self): |
590 |
"""Return the commands help topic - its name."""
|
|
591 |
return self.name() |
|
592 |
||
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
593 |
def get_see_also(self, additional_terms=None): |
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
594 |
"""Return a list of help topics that are related to this command.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
595 |
|
2425.2.1
by Robert Collins
Command objects can now declare related help topics by having _see_also |
596 |
The list is derived from the content of the _see_also attribute. Any
|
597 |
duplicates are removed and the result is in lexical order.
|
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
598 |
:param additional_terms: Additional help topics to cross-reference.
|
2425.2.1
by Robert Collins
Command objects can now declare related help topics by having _see_also |
599 |
:return: A list of help topics.
|
600 |
"""
|
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
601 |
see_also = set(getattr(self, '_see_also', [])) |
602 |
if additional_terms: |
|
603 |
see_also.update(additional_terms) |
|
604 |
return sorted(see_also) |
|
2425.2.1
by Robert Collins
Command objects can now declare related help topics by having _see_also |
605 |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
606 |
def options(self): |
607 |
"""Return dict of valid options for this command.
|
|
608 |
||
609 |
Maps from long option name to option object."""
|
|
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
610 |
r = Option.STD_OPTIONS.copy() |
611 |
std_names = r.keys() |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
612 |
for o in self.takes_options: |
1857.1.8
by Aaron Bentley
Group enum options and add enum options to init and init-repo |
613 |
if isinstance(o, basestring): |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
614 |
o = option.Option.OPTIONS[o] |
1185.16.43
by Martin Pool
- clean up handling of option objects |
615 |
r[o.name] = o |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
616 |
if o.name in std_names: |
617 |
self.supported_std_options.append(o.name) |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
618 |
return r |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
619 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
620 |
def _setup_outf(self): |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
621 |
"""Return a file linked to stdout, which has proper encoding."""
|
4792.8.9
by Martin Pool
Send Command.outf through UIFactory |
622 |
self.outf = ui.ui_factory.make_output_stream( |
623 |
encoding_type=self.encoding_type) |
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
624 |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
625 |
def run_argv_aliases(self, argv, alias_argv=None): |
626 |
"""Parse the command line and run with extra aliases in alias_argv."""
|
|
1857.1.21
by Aaron Bentley
Fix bug from cmd_shelf passing Non to run_argv_aliases |
627 |
if argv is None: |
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
628 |
warn("Passing None for [] is deprecated from bzrlib 0.10", |
1857.1.21
by Aaron Bentley
Fix bug from cmd_shelf passing Non to run_argv_aliases |
629 |
DeprecationWarning, stacklevel=2) |
630 |
argv = [] |
|
1553.6.8
by Erik BÃ¥gfors
support for overrides |
631 |
args, opts = parse_args(self, argv, alias_argv) |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
632 |
|
633 |
# Process the standard options
|
|
3984.4.5
by Ian Clatworthy
help xxx is full help; xxx -h is concise help |
634 |
if 'help' in opts: # e.g. bzr add --help |
3984.4.6
by Ian Clatworthy
Show usage on --usage, not -h |
635 |
sys.stdout.write(self.get_help_text()) |
636 |
return 0 |
|
637 |
if 'usage' in opts: # e.g. bzr add --usage |
|
3984.4.5
by Ian Clatworthy
help xxx is full help; xxx -h is concise help |
638 |
sys.stdout.write(self.get_help_text(verbose=False)) |
639 |
return 0 |
|
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
640 |
trace.set_verbosity_level(option._verbosity_level) |
641 |
if 'verbose' in self.supported_std_options: |
|
642 |
opts['verbose'] = trace.is_verbose() |
|
643 |
elif opts.has_key('verbose'): |
|
644 |
del opts['verbose'] |
|
645 |
if 'quiet' in self.supported_std_options: |
|
646 |
opts['quiet'] = trace.is_quiet() |
|
647 |
elif opts.has_key('quiet'): |
|
648 |
del opts['quiet'] |
|
649 |
||
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
650 |
# mix arguments and options into one dictionary
|
651 |
cmdargs = _match_argform(self.name(), self.takes_args, args) |
|
652 |
cmdopts = {} |
|
653 |
for k, v in opts.items(): |
|
654 |
cmdopts[k.replace('-', '_')] = v |
|
655 |
||
656 |
all_cmd_args = cmdargs.copy() |
|
657 |
all_cmd_args.update(cmdopts) |
|
658 |
||
1685.1.80
by Wouter van Heyst
more code cleanup |
659 |
self._setup_outf() |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
660 |
|
4900.1.6
by Andrew Bennetts
Fix bzrlib.test.commands.*; they need to use 'run_direct' not 'run' so that the OperationWithCleanups is used. |
661 |
return self.run_direct(**all_cmd_args) |
662 |
||
663 |
def run_direct(self, *args, **kwargs): |
|
664 |
"""Call run directly with objects (without parsing an argv list)."""
|
|
665 |
return self._operation.run_simple(*args, **kwargs) |
|
3668.2.1
by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name. |
666 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
667 |
def run(self): |
668 |
"""Actually run the command.
|
|
329
by Martin Pool
- refactor command functions into command classes |
669 |
|
670 |
This is invoked with the options and arguments bound to
|
|
671 |
keyword parameters.
|
|
672 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
673 |
Return 0 or None if the command was successful, or a non-zero
|
674 |
shell error code if not. It's OK for this method to allow
|
|
675 |
an exception to raise up.
|
|
329
by Martin Pool
- refactor command functions into command classes |
676 |
"""
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
677 |
raise NotImplementedError('no implementation of command %r' |
1610.1.3
by Martin Pool
Better error message for Command.run() not implemented |
678 |
% self.name()) |
329
by Martin Pool
- refactor command functions into command classes |
679 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
680 |
def help(self): |
681 |
"""Return help message for this class."""
|
|
1610.1.2
by Martin Pool
Move rarely-used import into Command.help() |
682 |
from inspect import getdoc |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
683 |
if self.__doc__ is Command.__doc__: |
684 |
return None |
|
685 |
return getdoc(self) |
|
686 |
||
687 |
def name(self): |
|
688 |
return _unsquish_command_name(self.__class__.__name__) |
|
689 |
||
1733.2.5
by Michael Ellerman
Show which plugin (if any) provides a command. |
690 |
def plugin_name(self): |
691 |
"""Get the name of the plugin that provides this command.
|
|
692 |
||
693 |
:return: The name of the plugin or None if the command is builtin.
|
|
694 |
"""
|
|
695 |
mod_parts = self.__module__.split('.') |
|
696 |
if len(mod_parts) >= 3 and mod_parts[1] == 'plugins': |
|
697 |
return mod_parts[2] |
|
698 |
else: |
|
699 |
return None |
|
700 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
701 |
|
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. |
702 |
class CommandHooks(Hooks): |
703 |
"""Hooks related to Command object creation/enumeration."""
|
|
704 |
||
705 |
def __init__(self): |
|
706 |
"""Create the default hooks.
|
|
707 |
||
708 |
These are all empty initially, because by default nothing should get
|
|
709 |
notified.
|
|
710 |
"""
|
|
711 |
Hooks.__init__(self) |
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
712 |
self.create_hook(HookPoint('extend_command', |
713 |
"Called after creating a command object to allow modifications "
|
|
714 |
"such as adding or removing options, docs etc. Called with the "
|
|
715 |
"new bzrlib.commands.Command object.", (1, 13), None)) |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
716 |
self.create_hook(HookPoint('get_command', |
717 |
"Called when creating a single command. Called with "
|
|
718 |
"(cmd_or_None, command_name). get_command should either return "
|
|
719 |
"the cmd_or_None parameter, or a replacement Command object that "
|
|
4119.3.10
by Robert Collins
More review feedback. |
720 |
"should be used for the command. Note that the Command.hooks "
|
721 |
"hooks are core infrastructure. Many users will prefer to use "
|
|
722 |
"bzrlib.commands.register_command or plugin_cmds.register_lazy.", |
|
723 |
(1, 17), None)) |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
724 |
self.create_hook(HookPoint('get_missing_command', |
725 |
"Called when creating a single command if no command could be "
|
|
726 |
"found. Called with (command_name). get_missing_command should "
|
|
727 |
"either return None, or a Command object to be used for the "
|
|
4119.3.10
by Robert Collins
More review feedback. |
728 |
"command.", (1, 17), None)) |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
729 |
self.create_hook(HookPoint('list_commands', |
4119.3.10
by Robert Collins
More review feedback. |
730 |
"Called when enumerating commands. Called with a set of "
|
731 |
"cmd_name strings for all the commands found so far. This set "
|
|
732 |
" is safe to mutate - e.g. to remove a command. "
|
|
733 |
"list_commands should return the updated set of command names.", |
|
734 |
(1, 17), None)) |
|
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. |
735 |
|
736 |
Command.hooks = CommandHooks() |
|
737 |
||
738 |
||
1553.6.11
by Erik BÃ¥gfors
small bugfixes, all tests pass now |
739 |
def parse_args(command, argv, alias_argv=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
740 |
"""Parse command line.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
741 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
742 |
Arguments and options are parsed at this level before being passed
|
743 |
down to specific command handlers. This routine knows, from a
|
|
744 |
lookup table, something about the available options, what optargs
|
|
745 |
they take, and which commands will accept them.
|
|
746 |
"""
|
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
747 |
# TODO: make it a method of the Command?
|
1857.1.3
by Aaron Bentley
Make option adding depend on Option type |
748 |
parser = option.get_optparser(command.options()) |
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
749 |
if alias_argv is not None: |
750 |
args = alias_argv + argv |
|
751 |
else: |
|
752 |
args = argv |
|
683
by Martin Pool
- short option stacking patch from John A Meinel |
753 |
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
754 |
options, args = parser.parse_args(args) |
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
755 |
opts = dict([(k, v) for k, v in options.__dict__.iteritems() if |
1857.1.3
by Aaron Bentley
Make option adding depend on Option type |
756 |
v is not option.OptionParser.DEFAULT_VALUE]) |
1
by mbp at sourcefrog
import from baz patch-364 |
757 |
return args, opts |
758 |
||
759 |
||
329
by Martin Pool
- refactor command functions into command classes |
760 |
def _match_argform(cmd, takes_args, args): |
1
by mbp at sourcefrog
import from baz patch-364 |
761 |
argdict = {} |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
762 |
|
329
by Martin Pool
- refactor command functions into command classes |
763 |
# step through args and takes_args, allowing appropriate 0-many matches
|
764 |
for ap in takes_args: |
|
1
by mbp at sourcefrog
import from baz patch-364 |
765 |
argname = ap[:-1] |
766 |
if ap[-1] == '?': |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
767 |
if args: |
768 |
argdict[argname] = args.pop(0) |
|
196
by mbp at sourcefrog
selected-file diff |
769 |
elif ap[-1] == '*': # all remaining arguments |
770 |
if args: |
|
771 |
argdict[argname + '_list'] = args[:] |
|
772 |
args = [] |
|
773 |
else: |
|
774 |
argdict[argname + '_list'] = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
775 |
elif ap[-1] == '+': |
776 |
if not args: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
777 |
raise errors.BzrCommandError("command %r needs one or more %s" |
778 |
% (cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
779 |
else: |
780 |
argdict[argname + '_list'] = args[:] |
|
781 |
args = [] |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
782 |
elif ap[-1] == '$': # all but one |
783 |
if len(args) < 2: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
784 |
raise errors.BzrCommandError("command %r needs one or more %s" |
785 |
% (cmd, argname.upper())) |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
786 |
argdict[argname + '_list'] = args[:-1] |
1740.5.6
by Martin Pool
Clean up many exception classes. |
787 |
args[:-1] = [] |
1
by mbp at sourcefrog
import from baz patch-364 |
788 |
else: |
789 |
# just a plain arg
|
|
790 |
argname = ap |
|
791 |
if not args: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
792 |
raise errors.BzrCommandError("command %r requires argument %s" |
793 |
% (cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
794 |
else: |
795 |
argdict[argname] = args.pop(0) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
796 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
797 |
if args: |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
798 |
raise errors.BzrCommandError("extra argument to command %s: %s" |
799 |
% (cmd, args[0])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
800 |
|
801 |
return argdict |
|
802 |
||
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
803 |
def apply_coveraged(dirname, the_callable, *args, **kwargs): |
804 |
# Cannot use "import trace", as that would import bzrlib.trace instead of
|
|
805 |
# the standard library's trace.
|
|
806 |
trace = __import__('trace') |
|
807 |
||
808 |
tracer = trace.Trace(count=1, trace=0) |
|
809 |
sys.settrace(tracer.globaltrace) |
|
4325.1.1
by Vincent Ladeuil
Make --coverage works for threads too. |
810 |
threading.settrace(tracer.globaltrace) |
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
811 |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
812 |
try: |
813 |
return exception_to_return_code(the_callable, *args, **kwargs) |
|
814 |
finally: |
|
815 |
sys.settrace(None) |
|
816 |
results = tracer.results() |
|
817 |
results.write_results(show_missing=1, summary=False, |
|
818 |
coverdir=dirname) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
819 |
|
820 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
821 |
def apply_profiled(the_callable, *args, **kwargs): |
822 |
import hotshot |
|
823 |
import tempfile |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
824 |
import hotshot.stats |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
825 |
pffileno, pfname = tempfile.mkstemp() |
826 |
try: |
|
827 |
prof = hotshot.Profile(pfname) |
|
828 |
try: |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
829 |
ret = prof.runcall(exception_to_return_code, the_callable, *args, |
830 |
**kwargs) or 0 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
831 |
finally: |
832 |
prof.close() |
|
833 |
stats = hotshot.stats.load(pfname) |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
834 |
stats.strip_dirs() |
835 |
stats.sort_stats('cum') # 'time' |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
836 |
## XXX: Might like to write to stderr or the trace file instead but
|
837 |
## print_stats seems hardcoded to stdout
|
|
838 |
stats.print_stats(20) |
|
839 |
return ret |
|
840 |
finally: |
|
841 |
os.close(pffileno) |
|
842 |
os.remove(pfname) |
|
843 |
||
844 |
||
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
845 |
def exception_to_return_code(the_callable, *args, **kwargs): |
846 |
"""UI level helper for profiling and coverage.
|
|
847 |
||
4084.6.3
by Robert Collins
Disagreement on trailing whitespace with the test suite. |
848 |
This transforms exceptions into a return value of 3. As such its only
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
849 |
relevant to the UI layer, and should never be called where catching
|
850 |
exceptions may be desirable.
|
|
851 |
"""
|
|
852 |
try: |
|
853 |
return the_callable(*args, **kwargs) |
|
854 |
except (KeyboardInterrupt, Exception), e: |
|
855 |
# used to handle AssertionError and KeyboardInterrupt
|
|
856 |
# specially here, but hopefully they're handled ok by the logger now
|
|
857 |
exc_info = sys.exc_info() |
|
858 |
exitcode = trace.report_exception(exc_info, sys.stderr) |
|
859 |
if os.environ.get('BZR_PDB'): |
|
860 |
print '**** entering debugger' |
|
861 |
tb = exc_info[2] |
|
862 |
import pdb |
|
863 |
if sys.version_info[:2] < (2, 6): |
|
864 |
# XXX: we want to do
|
|
865 |
# pdb.post_mortem(tb)
|
|
866 |
# but because pdb.post_mortem gives bad results for tracebacks
|
|
867 |
# from inside generators, we do it manually.
|
|
868 |
# (http://bugs.python.org/issue4150, fixed in Python 2.6)
|
|
869 |
||
870 |
# Setup pdb on the traceback
|
|
871 |
p = pdb.Pdb() |
|
872 |
p.reset() |
|
873 |
p.setup(tb.tb_frame, tb) |
|
874 |
# Point the debugger at the deepest frame of the stack
|
|
875 |
p.curindex = len(p.stack) - 1 |
|
4084.6.2
by Robert Collins
Merge bzr.dev, commands.py was conflicting. |
876 |
p.curframe = p.stack[p.curindex][0] |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
877 |
# Start the pdb prompt.
|
878 |
p.print_stack_entry(p.stack[p.curindex]) |
|
879 |
p.execRcLines() |
|
880 |
p.cmdloop() |
|
881 |
else: |
|
882 |
pdb.post_mortem(tb) |
|
883 |
return exitcode |
|
884 |
||
885 |
||
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
886 |
def apply_lsprofiled(filename, the_callable, *args, **kwargs): |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
887 |
from bzrlib.lsprof import profile |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
888 |
ret, stats = profile(exception_to_return_code, the_callable, *args, **kwargs) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
889 |
stats.sort() |
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
890 |
if filename is None: |
891 |
stats.pprint() |
|
892 |
else: |
|
2654.2.2
by Ian Clatworthy
Put all format detection stuff in one spot as requested by John Arbash Meinel |
893 |
stats.save(filename) |
1551.15.30
by Aaron Bentley
Write lsprof file name to stderr, not stdout |
894 |
trace.note('Profile data written to "%s".', filename) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
895 |
return ret |
896 |
||
1553.6.9
by Erik BÃ¥gfors
PEP8-ify |
897 |
|
3123.6.2
by Aaron Bentley
Implement diff --using natively |
898 |
def shlex_split_unicode(unsplit): |
899 |
import shlex |
|
900 |
return [u.decode('utf-8') for u in shlex.split(unsplit.encode('utf-8'))] |
|
901 |
||
902 |
||
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
903 |
def get_alias(cmd, config=None): |
904 |
"""Return an expanded alias, or None if no alias exists.
|
|
905 |
||
906 |
cmd
|
|
907 |
Command to be checked for an alias.
|
|
908 |
config
|
|
909 |
Used to specify an alternative config to use,
|
|
2155.2.3
by Marius Kruger
* commands.py |
910 |
which is especially useful for testing.
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
911 |
If it is unspecified, the global config will be used.
|
912 |
"""
|
|
913 |
if config is None: |
|
914 |
import bzrlib.config |
|
915 |
config = bzrlib.config.GlobalConfig() |
|
916 |
alias = config.get_alias(cmd) |
|
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
917 |
if (alias): |
3123.6.3
by Aaron Bentley
Fix typo |
918 |
return shlex_split_unicode(alias) |
1553.6.8
by Erik BÃ¥gfors
support for overrides |
919 |
return None |
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
920 |
|
1553.6.9
by Erik BÃ¥gfors
PEP8-ify |
921 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
922 |
def run_bzr(argv): |
923 |
"""Execute a command.
|
|
924 |
||
973
by Martin Pool
- various refactorings of command interpreter |
925 |
argv
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
926 |
The command-line arguments, without the program name from argv[0]
|
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
927 |
These should already be decoded. All library/test code calling
|
928 |
run_bzr should be passing valid strings (don't need decoding).
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
929 |
|
973
by Martin Pool
- various refactorings of command interpreter |
930 |
Returns a command status or raises an exception.
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
931 |
|
932 |
Special master options: these must come before the command because
|
|
933 |
they control how the command is interpreted.
|
|
934 |
||
935 |
--no-plugins
|
|
936 |
Do not load plugin modules at all
|
|
937 |
||
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
938 |
--no-aliases
|
939 |
Do not allow aliases
|
|
940 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
941 |
--builtin
|
942 |
Only use builtin commands. (Plugins are still allowed to change
|
|
943 |
other behaviour.)
|
|
944 |
||
945 |
--profile
|
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
946 |
Run under the Python hotshot profiler.
|
947 |
||
948 |
--lsprof
|
|
949 |
Run under the Python lsprof profiler.
|
|
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
950 |
|
951 |
--coverage
|
|
952 |
Generate line coverage report in the specified directory.
|
|
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
953 |
|
954 |
--concurrency
|
|
4766.3.9
by Vincent Ladeuil
Make it clear that --concurrency is for selftest only (so far). |
955 |
Specify the number of processes that can be run concurrently (selftest).
|
1
by mbp at sourcefrog
import from baz patch-364 |
956 |
"""
|
4926.2.2
by Toon Nolten
Solution to https://bugs.launchpad.net/bzr/+bug/257170; log now records the bazaar version |
957 |
trace.mutter("bazaar version: " + bzrlib.__version__) |
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
958 |
argv = list(argv) |
2127.5.1
by mbp at sourcefrog
record command-line arguments in .bzr.log, drop some mutter statements |
959 |
trace.mutter("bzr arguments: %r", argv) |
907.1.21
by John Arbash Meinel
Adding http transport as a valid transport protocol. |
960 |
|
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
961 |
opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \ |
962 |
opt_no_aliases = False |
|
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
963 |
opt_lsprof_file = opt_coverage_dir = None |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
964 |
|
965 |
# --no-plugins is handled specially at a very early stage. We need
|
|
966 |
# to load plugins before doing other command parsing so that they
|
|
967 |
# can override commands, but this needs to happen first.
|
|
968 |
||
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
969 |
argv_copy = [] |
970 |
i = 0 |
|
971 |
while i < len(argv): |
|
972 |
a = argv[i] |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
973 |
if a == '--profile': |
974 |
opt_profile = True |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
975 |
elif a == '--lsprof': |
976 |
opt_lsprof = True |
|
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
977 |
elif a == '--lsprof-file': |
1706.2.6
by Robey Pointer
when giving --lsprof-file, assume --lsprof |
978 |
opt_lsprof = True |
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
979 |
opt_lsprof_file = argv[i + 1] |
980 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
981 |
elif a == '--no-plugins': |
982 |
opt_no_plugins = True |
|
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
983 |
elif a == '--no-aliases': |
984 |
opt_no_aliases = True |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
985 |
elif a == '--builtin': |
986 |
opt_builtin = True |
|
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
987 |
elif a == '--concurrency': |
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
988 |
os.environ['BZR_CONCURRENCY'] = argv[i + 1] |
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
989 |
i += 1 |
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
990 |
elif a == '--coverage': |
991 |
opt_coverage_dir = argv[i + 1] |
|
992 |
i += 1 |
|
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
993 |
elif a.startswith('-D'): |
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
994 |
debug.debug_flags.add(a[2:]) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
995 |
else: |
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
996 |
argv_copy.append(a) |
997 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
998 |
|
4070.8.2
by Martin Pool
Initial support for debug_flags config option |
999 |
debug.set_debug_flags_from_config() |
1000 |
||
1553.7.1
by Robey Pointer
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal) |
1001 |
argv = argv_copy |
1616.1.15
by Martin Pool
Handle 'bzr ?', etc. |
1002 |
if (not argv): |
1003 |
from bzrlib.builtins import cmd_help |
|
1558.14.2
by Aaron Bentley
Removed deprecation warning when bzr invoked with no arguments |
1004 |
cmd_help().run_argv_aliases([]) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
1005 |
return 0 |
1006 |
||
1007 |
if argv[0] == '--version': |
|
2785.1.2
by bialix at ukr
bugfix for #131100 |
1008 |
from bzrlib.builtins import cmd_version |
1009 |
cmd_version().run_argv_aliases([]) |
|
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
1010 |
return 0 |
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1011 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1012 |
if not opt_no_plugins: |
973
by Martin Pool
- various refactorings of command interpreter |
1013 |
from bzrlib.plugin import load_plugins |
1014 |
load_plugins() |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
1015 |
else: |
1016 |
from bzrlib.plugin import disable_plugins |
|
1017 |
disable_plugins() |
|
973
by Martin Pool
- various refactorings of command interpreter |
1018 |
|
1553.6.17
by Erik BÃ¥gfors
fix for broken --no-aliases |
1019 |
alias_argv = None |
1020 |
||
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
1021 |
if not opt_no_aliases: |
1553.6.8
by Erik BÃ¥gfors
support for overrides |
1022 |
alias_argv = get_alias(argv[0]) |
1023 |
if alias_argv: |
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
1024 |
user_encoding = osutils.get_user_encoding() |
1025 |
alias_argv = [a.decode(user_encoding) for a in alias_argv] |
|
1553.6.8
by Erik BÃ¥gfors
support for overrides |
1026 |
argv[0] = alias_argv.pop(0) |
1553.6.1
by Erik BÃ¥gfors
support for aliases in bazaar.conf |
1027 |
|
1948.1.1
by John Arbash Meinel
Raise a reasonable error when a command is non-ascii |
1028 |
cmd = argv.pop(0) |
1948.1.10
by John Arbash Meinel
Simplify changes to command.py |
1029 |
# We want only 'ascii' command names, but the user may have typed
|
1030 |
# in a Unicode name. In that case, they should just get a
|
|
1031 |
# 'command not found' error later.
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1032 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
1033 |
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin) |
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
1034 |
run = cmd_obj.run_argv_aliases |
1035 |
run_argv = [argv, alias_argv] |
|
1534.7.154
by Aaron Bentley
Removed changes from bzr.ab 1529..1536 |
1036 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1037 |
try: |
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1038 |
# We can be called recursively (tests for example), but we don't want
|
1039 |
# the verbosity level to propagate.
|
|
1040 |
saved_verbosity_level = option._verbosity_level |
|
1041 |
option._verbosity_level = 0 |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1042 |
if opt_lsprof: |
3169.3.4
by Andrew Bennetts
Warn if --coverage is used with a conflicting global option. |
1043 |
if opt_coverage_dir: |
1044 |
trace.warning( |
|
1045 |
'--coverage ignored, because --lsprof is in use.') |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
1046 |
ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1047 |
elif opt_profile: |
3169.3.4
by Andrew Bennetts
Warn if --coverage is used with a conflicting global option. |
1048 |
if opt_coverage_dir: |
1049 |
trace.warning( |
|
1050 |
'--coverage ignored, because --profile is in use.') |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
1051 |
ret = apply_profiled(run, *run_argv) |
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
1052 |
elif opt_coverage_dir: |
1053 |
ret = apply_coveraged(opt_coverage_dir, run, *run_argv) |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1054 |
else: |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
1055 |
ret = run(*run_argv) |
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1056 |
return ret or 0 |
1057 |
finally: |
|
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1058 |
# reset, in case we may do other commands later within the same
|
1059 |
# process. Commands that want to execute sub-commands must propagate
|
|
1060 |
# --verbose in their own way.
|
|
4682.1.1
by John Arbash Meinel
Put the 'debug_memory' check into the finally clause. |
1061 |
if 'memory' in debug.debug_flags: |
1062 |
trace.debug_memory('Process status after command:', short=False) |
|
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1063 |
option._verbosity_level = saved_verbosity_level |
267
by Martin Pool
- better reporting of errors |
1064 |
|
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. |
1065 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1066 |
def display_command(func): |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1067 |
"""Decorator that suppresses pipe/interrupt errors."""
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1068 |
def ignore_pipe(*args, **kwargs): |
1069 |
try: |
|
1185.35.22
by Aaron Bentley
Handled more pipe errors for display commands. |
1070 |
result = func(*args, **kwargs) |
1071 |
sys.stdout.flush() |
|
1072 |
return result |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1073 |
except IOError, e: |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1074 |
if getattr(e, 'errno', None) is None: |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1075 |
raise
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1076 |
if e.errno != errno.EPIPE: |
1711.4.31
by John Arbash Meinel
Catch proper error instead of EPIPE on win32, also don't double flush |
1077 |
# Win32 raises IOError with errno=0 on a broken pipe
|
2304.2.1
by Alexander Belchenko
Suppress IOError with errno=22 (Invalid argument) on win32 when pipe is broken |
1078 |
if sys.platform != 'win32' or (e.errno not in (0, errno.EINVAL)): |
1711.4.31
by John Arbash Meinel
Catch proper error instead of EPIPE on win32, also don't double flush |
1079 |
raise
|
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1080 |
pass
|
1185.12.69
by Aaron Bentley
Ignored ^C in display commands |
1081 |
except KeyboardInterrupt: |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1082 |
pass
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1083 |
return ignore_pipe |
267
by Martin Pool
- better reporting of errors |
1084 |
|
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
1085 |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1086 |
def install_bzr_command_hooks(): |
1087 |
"""Install the hooks to supply bzr's own commands."""
|
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1088 |
if _list_bzr_commands in Command.hooks["list_commands"]: |
1089 |
return
|
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1090 |
Command.hooks.install_named_hook("list_commands", _list_bzr_commands, |
1091 |
"bzr commands") |
|
1092 |
Command.hooks.install_named_hook("get_command", _get_bzr_command, |
|
1093 |
"bzr commands") |
|
1094 |
Command.hooks.install_named_hook("get_command", _get_plugin_command, |
|
1095 |
"bzr plugin commands") |
|
1096 |
Command.hooks.install_named_hook("get_command", _get_external_command, |
|
1097 |
"bzr external command lookup") |
|
1098 |
Command.hooks.install_named_hook("get_missing_command", _try_plugin_provider, |
|
1099 |
"bzr plugin-provider-db check") |
|
1100 |
||
1101 |
||
4355.2.1
by Alexander Belchenko
Using unicode Windows API to obtain command-line arguments. |
1102 |
def main(argv=None): |
1103 |
"""Main entry point of command-line interface.
|
|
1104 |
||
1105 |
:param argv: list of unicode command-line arguments similar to sys.argv.
|
|
1106 |
argv[0] is script name usually, it will be ignored.
|
|
1107 |
Don't pass here sys.argv because this list contains plain strings
|
|
1108 |
and not unicode; pass None instead.
|
|
1109 |
||
1110 |
:return: exit code of bzr command.
|
|
1111 |
"""
|
|
1104
by Martin Pool
- Add a simple UIFactory |
1112 |
import bzrlib.ui |
3882.8.11
by Martin Pool
Choose the UIFactory class depending on the terminal capabilities |
1113 |
bzrlib.ui.ui_factory = bzrlib.ui.make_ui_for_terminal( |
1114 |
sys.stdin, sys.stdout, sys.stderr) |
|
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1115 |
|
3427.5.1
by John Arbash Meinel
Have the bzrlib.commands.main() function suppress deprecation warnings when running a final release. |
1116 |
# Is this a final release version? If so, we should suppress warnings
|
1117 |
if bzrlib.version_info[3] == 'final': |
|
4634.72.1
by John Arbash Meinel
Fix bug #44062, Always suppress deprecation warnings. |
1118 |
suppress_deprecation_warnings(override=True) |
4355.2.1
by Alexander Belchenko
Using unicode Windows API to obtain command-line arguments. |
1119 |
if argv is None: |
1120 |
argv = osutils.get_unicode_argv() |
|
1121 |
else: |
|
4355.2.3
by Alexander Belchenko
commands.py: main() function expect to get argv argument as list of unicode or pure ascii strings. |
1122 |
new_argv = [] |
4355.2.1
by Alexander Belchenko
Using unicode Windows API to obtain command-line arguments. |
1123 |
try: |
4355.2.3
by Alexander Belchenko
commands.py: main() function expect to get argv argument as list of unicode or pure ascii strings. |
1124 |
# ensure all arguments are unicode strings
|
1125 |
for a in argv[1:]: |
|
1126 |
if isinstance(a, unicode): |
|
1127 |
new_argv.append(a) |
|
1128 |
else: |
|
1129 |
new_argv.append(a.decode('ascii')) |
|
4355.2.1
by Alexander Belchenko
Using unicode Windows API to obtain command-line arguments. |
1130 |
except UnicodeDecodeError: |
1131 |
raise errors.BzrError("argv should be list of unicode strings.") |
|
4355.2.3
by Alexander Belchenko
commands.py: main() function expect to get argv argument as list of unicode or pure ascii strings. |
1132 |
argv = new_argv |
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
1133 |
ret = run_bzr_catch_errors(argv) |
4906.1.6
by John Arbash Meinel
Supply the flag so it is a bit clearer. |
1134 |
bzrlib.ui.ui_factory.log_transport_activity( |
1135 |
display=('bytes' in debug.debug_flags)) |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
1136 |
trace.mutter("return code %d", ret) |
4574.3.10
by Martin Pool
Report extension load failures before finishing bzr main process |
1137 |
osutils.report_extension_load_failures() |
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
1138 |
return ret |
1185.3.19
by Martin Pool
- split out commandline error reporting for ease of testing |
1139 |
|
1140 |
||
1141 |
def run_bzr_catch_errors(argv): |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1142 |
"""Run a bzr command with parameters as described by argv.
|
4084.6.3
by Robert Collins
Disagreement on trailing whitespace with the test suite. |
1143 |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1144 |
This function assumed that that UI layer is setup, that symbol deprecations
|
1145 |
are already applied, and that unicode decoding has already been performed on argv.
|
|
1146 |
"""
|
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1147 |
install_bzr_command_hooks() |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1148 |
return exception_to_return_code(run_bzr, argv) |
1
by mbp at sourcefrog
import from baz patch-364 |
1149 |
|
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1150 |
|
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
1151 |
def run_bzr_catch_user_errors(argv): |
1152 |
"""Run bzr and report user errors, but let internal errors propagate.
|
|
1153 |
||
1154 |
This is used for the test suite, and might be useful for other programs
|
|
1155 |
that want to wrap the commandline interface.
|
|
1156 |
"""
|
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1157 |
install_bzr_command_hooks() |
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
1158 |
try: |
1159 |
return run_bzr(argv) |
|
1160 |
except Exception, e: |
|
1161 |
if (isinstance(e, (OSError, IOError)) |
|
1162 |
or not getattr(e, 'internal_error', True)): |
|
1163 |
trace.report_exception(sys.exc_info(), sys.stderr) |
|
1164 |
return 3 |
|
1165 |
else: |
|
1166 |
raise
|
|
1167 |
||
1168 |
||
2432.1.15
by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name. |
1169 |
class HelpCommandIndex(object): |
1170 |
"""A index for bzr help that returns commands."""
|
|
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1171 |
|
2432.1.17
by Robert Collins
Add prefixes to HelpIndexes. |
1172 |
def __init__(self): |
1173 |
self.prefix = 'commands/' |
|
1174 |
||
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
1175 |
def get_topics(self, topic): |
1176 |
"""Search for topic amongst commands.
|
|
1177 |
||
1178 |
:param topic: A topic to search for.
|
|
1179 |
:return: A list which is either empty or contains a single
|
|
1180 |
Command entry.
|
|
1181 |
"""
|
|
2432.1.18
by Robert Collins
Add support for doing bzr help commands/COMMANDNAME. |
1182 |
if topic and topic.startswith(self.prefix): |
1183 |
topic = topic[len(self.prefix):] |
|
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
1184 |
try: |
1185 |
cmd = _get_cmd_object(topic) |
|
1186 |
except KeyError: |
|
1187 |
return [] |
|
1188 |
else: |
|
1189 |
return [cmd] |
|
1190 |
||
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1191 |
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1192 |
class Provider(object): |
3246.7.3
by Martin Albisetti
Code cleanup and documentation |
1193 |
'''Generic class to be overriden by plugins'''
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1194 |
|
1195 |
def plugin_for_command(self, cmd_name): |
|
3246.7.3
by Martin Albisetti
Code cleanup and documentation |
1196 |
'''Takes a command and returns the information for that plugin
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1197 |
|
1198 |
:return: A dictionary with all the available information
|
|
3246.7.3
by Martin Albisetti
Code cleanup and documentation |
1199 |
for the requested plugin
|
1200 |
'''
|
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1201 |
raise NotImplementedError |
1202 |
||
1203 |
||
1204 |
class ProvidersRegistry(registry.Registry): |
|
1205 |
'''This registry exists to allow other providers to exist'''
|
|
3246.7.3
by Martin Albisetti
Code cleanup and documentation |
1206 |
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1207 |
def __iter__(self): |
1208 |
for key, provider in self.iteritems(): |
|
1209 |
yield provider |
|
1210 |
||
1211 |
command_providers_registry = ProvidersRegistry() |
|
1212 |
||
1213 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1214 |
if __name__ == '__main__': |
1215 |
sys.exit(main(sys.argv)) |