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