bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5609.16.1
by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred. |
1 |
# Copyright (C) 2005-2011 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 |
|
6379.6.1
by Jelmer Vernooij
Import absolute_import in a few places. |
17 |
from __future__ import absolute_import |
1
by mbp at sourcefrog
import from baz patch-364 |
18 |
|
1095
by Martin Pool
todo |
19 |
# TODO: Define arguments by objects, rather than just using names.
|
20 |
# Those objects can specify the expected type of the argument, which
|
|
1610.1.4
by Martin Pool
Doc |
21 |
# would help with validation and shell completion. They could also provide
|
22 |
# help/explanation for that argument in a structured way.
|
|
23 |
||
24 |
# TODO: Specific "examples" property on commands for consistent formatting.
|
|
1095
by Martin Pool
todo |
25 |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
26 |
import os |
27 |
import sys |
|
28 |
||
7045.4.23
by Jelmer Vernooij
Fix some help tests. |
29 |
from . import ( |
30 |
i18n, |
|
31 |
option, |
|
32 |
osutils, |
|
33 |
)
|
|
34 |
||
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
35 |
from .lazy_import import lazy_import |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
36 |
lazy_import(globals(), """ |
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
37 |
import errno
|
1
by mbp at sourcefrog
import from baz patch-364 |
38 |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
39 |
import breezy
|
40 |
from breezy import (
|
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
41 |
cleanup,
|
4913.5.24
by Gordon Tyler
Added cmdline.split function, which replaces commands.shlex_split_unicode. |
42 |
cmdline,
|
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 |
trace,
|
4792.8.9
by Martin Pool
Send Command.outf through UIFactory |
45 |
ui,
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
46 |
)
|
47 |
""") |
|
48 |
||
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
49 |
from .hooks import Hooks |
50 |
from .i18n import gettext |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
51 |
# Compatibility - Option used to be in commands.
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
52 |
from .option import Option |
6651.4.2
by Martin
Move plugin_name logic from commands to plugin to fix test |
53 |
from .plugin import disable_plugins, load_plugins, plugin_name |
6731.1.4
by Jelmer Vernooij
Move BadOptionValue to breezy.option. |
54 |
from . import errors, registry |
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
55 |
from .sixish import ( |
6621.2.26
by Martin
Misc set of changes to get started with selftest on Python 3 |
56 |
string_types, |
57 |
)
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
58 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
59 |
|
6731.1.4
by Jelmer Vernooij
Move BadOptionValue to breezy.option. |
60 |
class BzrOptionError(errors.BzrCommandError): |
61 |
||
62 |
_fmt = "Error in command line options" |
|
63 |
||
64 |
||
6734.1.1
by Jelmer Vernooij
Fix more imports. |
65 |
class CommandAvailableInPlugin(Exception): |
66 |
||
67 |
internal_error = False |
|
68 |
||
69 |
def __init__(self, cmd_name, plugin_metadata, provider): |
|
70 |
||
71 |
self.plugin_metadata = plugin_metadata |
|
72 |
self.cmd_name = cmd_name |
|
73 |
self.provider = provider |
|
74 |
||
75 |
def __str__(self): |
|
76 |
||
77 |
_fmt = ('"%s" is not a standard brz command. \n' |
|
78 |
'However, the following official plugin provides this command: %s\n' |
|
79 |
'You can install it by going to: %s' |
|
80 |
% (self.cmd_name, self.plugin_metadata['name'], |
|
81 |
self.plugin_metadata['url'])) |
|
82 |
||
83 |
return _fmt |
|
84 |
||
85 |
||
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
86 |
class CommandInfo(object): |
87 |
"""Information about a command.""" |
|
88 |
||
89 |
def __init__(self, aliases): |
|
90 |
"""The list of aliases for the command.""" |
|
91 |
self.aliases = aliases |
|
92 |
||
93 |
@classmethod
|
|
94 |
def from_command(klass, command): |
|
95 |
"""Factory to construct a CommandInfo from a command.""" |
|
96 |
return klass(command.aliases) |
|
97 |
||
98 |
||
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
99 |
class CommandRegistry(registry.Registry): |
5018.1.9
by Martin Pool
Handle aliases directly in CommandRegistry |
100 |
"""Special registry mapping command names to command classes. |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
101 |
|
5018.1.9
by Martin Pool
Handle aliases directly in CommandRegistry |
102 |
:ivar overridden_registry: Look in this registry for commands being
|
103 |
overridden by this registry. This can be used to tell plugin commands
|
|
104 |
about the builtin they're decorating.
|
|
5018.1.6
by Martin Pool
Avoid more cases of using a dict of all builtins |
105 |
"""
|
106 |
||
5018.1.9
by Martin Pool
Handle aliases directly in CommandRegistry |
107 |
def __init__(self): |
108 |
registry.Registry.__init__(self) |
|
109 |
self.overridden_registry = None |
|
110 |
# map from aliases to the real command that implements the name
|
|
111 |
self._alias_dict = {} |
|
112 |
||
113 |
def get(self, command_name): |
|
114 |
real_name = self._alias_dict.get(command_name, command_name) |
|
115 |
return registry.Registry.get(self, real_name) |
|
116 |
||
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
117 |
@staticmethod
|
118 |
def _get_name(command_name): |
|
119 |
if command_name.startswith("cmd_"): |
|
120 |
return _unsquish_command_name(command_name) |
|
121 |
else: |
|
122 |
return command_name |
|
123 |
||
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
124 |
def register(self, cmd, decorate=False): |
125 |
"""Utility function to help register a command |
|
126 |
||
127 |
:param cmd: Command subclass to register
|
|
128 |
:param decorate: If true, allow overriding an existing command
|
|
129 |
of the same name; the old command is returned by this function.
|
|
130 |
Otherwise it is an error to try to override an existing command.
|
|
131 |
"""
|
|
132 |
k = cmd.__name__ |
|
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
133 |
k_unsquished = self._get_name(k) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
134 |
try: |
135 |
previous = self.get(k_unsquished) |
|
136 |
except KeyError: |
|
5018.1.6
by Martin Pool
Avoid more cases of using a dict of all builtins |
137 |
previous = None |
138 |
if self.overridden_registry: |
|
139 |
try: |
|
140 |
previous = self.overridden_registry.get(k_unsquished) |
|
141 |
except KeyError: |
|
142 |
pass
|
|
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
143 |
info = CommandInfo.from_command(cmd) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
144 |
try: |
145 |
registry.Registry.register(self, k_unsquished, cmd, |
|
3785.1.2
by Aaron Bentley
Avoid getting plugins unnecessarily |
146 |
override_existing=decorate, info=info) |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
147 |
except KeyError: |
4695.5.2
by Martin Pool
Remove trace.log_error |
148 |
trace.warning('Two plugins defined the same command: %r' % k) |
149 |
trace.warning('Not loading the one in %r' % |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
150 |
sys.modules[cmd.__module__]) |
4695.5.2
by Martin Pool
Remove trace.log_error |
151 |
trace.warning('Previously this command was registered from %r' % |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
152 |
sys.modules[previous.__module__]) |
5018.1.9
by Martin Pool
Handle aliases directly in CommandRegistry |
153 |
for a in cmd.aliases: |
154 |
self._alias_dict[a] = k_unsquished |
|
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
155 |
return previous |
156 |
||
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
157 |
def register_lazy(self, command_name, aliases, module_name): |
158 |
"""Register a command without loading its module. |
|
159 |
||
160 |
:param command_name: The primary name of the command.
|
|
161 |
:param aliases: A list of aliases for the command.
|
|
162 |
:module_name: The module that the command lives in.
|
|
163 |
"""
|
|
164 |
key = self._get_name(command_name) |
|
165 |
registry.Registry.register_lazy(self, key, module_name, command_name, |
|
166 |
info=CommandInfo(aliases)) |
|
5018.1.9
by Martin Pool
Handle aliases directly in CommandRegistry |
167 |
for a in aliases: |
168 |
self._alias_dict[a] = key |
|
3785.1.4
by Aaron Bentley
Enable lazy-loading of commands |
169 |
|
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
170 |
|
171 |
plugin_cmds = CommandRegistry() |
|
5018.1.5
by Martin Pool
Rename registry to builtin_command_registry |
172 |
builtin_command_registry = CommandRegistry() |
5018.1.6
by Martin Pool
Avoid more cases of using a dict of all builtins |
173 |
plugin_cmds.overridden_registry = builtin_command_registry |
731
by Martin Pool
- merge plugin patch from john |
174 |
|
175 |
||
1492
by Robert Collins
Support decoration of commands. |
176 |
def register_command(cmd, decorate=False): |
5018.1.7
by Martin Pool
doc |
177 |
"""Register a plugin command. |
178 |
||
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
179 |
Should generally be avoided in favor of lazy registration.
|
5018.1.7
by Martin Pool
doc |
180 |
"""
|
731
by Martin Pool
- merge plugin patch from john |
181 |
global plugin_cmds |
3785.1.1
by Aaron Bentley
Switch from dict to Registry for plugin_cmds |
182 |
return plugin_cmds.register(cmd, decorate) |
731
by Martin Pool
- merge plugin patch from john |
183 |
|
184 |
||
350
by Martin Pool
- refactor command aliases into command classes |
185 |
def _squish_command_name(cmd): |
186 |
return 'cmd_' + cmd.replace('-', '_') |
|
187 |
||
188 |
||
189 |
def _unsquish_command_name(cmd): |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
190 |
return cmd[4:].replace('_', '-') |
350
by Martin Pool
- refactor command aliases into command classes |
191 |
|
914
by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch |
192 |
|
5018.1.3
by Martin Pool
Put builtin commands into a real registry |
193 |
def _register_builtin_commands(): |
5018.1.5
by Martin Pool
Rename registry to builtin_command_registry |
194 |
if builtin_command_registry.keys(): |
5018.1.3
by Martin Pool
Put builtin commands into a real registry |
195 |
# only load once
|
196 |
return
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
197 |
import breezy.builtins |
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
198 |
for cmd_class in _scan_module_for_commands(breezy.builtins): |
5018.1.5
by Martin Pool
Rename registry to builtin_command_registry |
199 |
builtin_command_registry.register(cmd_class) |
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
200 |
breezy.builtins._register_lazy_builtins() |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
201 |
|
202 |
||
203 |
def _scan_module_for_commands(module): |
|
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
204 |
module_dict = module.__dict__ |
205 |
for name in module_dict: |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
206 |
if name.startswith("cmd_"): |
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
207 |
yield module_dict[name] |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
208 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
209 |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
210 |
def _list_bzr_commands(names): |
5018.1.7
by Martin Pool
doc |
211 |
"""Find commands from bzr's core and plugins. |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
212 |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
213 |
This is not the public interface, just the default hook called by
|
214 |
all_command_names.
|
|
5018.1.7
by Martin Pool
doc |
215 |
"""
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
216 |
# to eliminate duplicates
|
217 |
names.update(builtin_command_names()) |
|
218 |
names.update(plugin_command_names()) |
|
219 |
return names |
|
220 |
||
221 |
||
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
222 |
def all_command_names(): |
4119.3.10
by Robert Collins
More review feedback. |
223 |
"""Return a set of all command names.""" |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
224 |
names = set() |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
225 |
for hook in Command.hooks['list_commands']: |
4119.3.10
by Robert Collins
More review feedback. |
226 |
names = hook(names) |
227 |
if names is None: |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
228 |
raise AssertionError( |
229 |
'hook %s returned None' % Command.hooks.get_hook_name(hook)) |
|
230 |
return names |
|
231 |
||
232 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
233 |
def builtin_command_names(): |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
234 |
"""Return list of builtin command names. |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
235 |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
236 |
Use of all_command_names() is encouraged rather than builtin_command_names
|
237 |
and/or plugin_command_names.
|
|
238 |
"""
|
|
5255.5.1
by Ian Clatworthy
Ensure builtin_command_names() is initialized correctly |
239 |
_register_builtin_commands() |
5018.1.5
by Martin Pool
Rename registry to builtin_command_registry |
240 |
return builtin_command_registry.keys() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
241 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
242 |
|
243 |
def plugin_command_names(): |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
244 |
"""Returns command names from commands registered by plugins.""" |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
245 |
return plugin_cmds.keys() |
246 |
||
247 |
||
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
248 |
# Overrides for common mispellings that heuristics get wrong
|
249 |
_GUESS_OVERRIDES = { |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
250 |
'ic': {'ci': 0}, # heuristic finds nick |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
251 |
}
|
252 |
||
253 |
||
254 |
def guess_command(cmd_name): |
|
255 |
"""Guess what command a user typoed. |
|
256 |
||
257 |
:param cmd_name: Command to search for
|
|
258 |
:return: None if no command was found, name of a command otherwise
|
|
259 |
"""
|
|
260 |
names = set() |
|
261 |
for name in all_command_names(): |
|
262 |
names.add(name) |
|
263 |
cmd = get_cmd_object(name) |
|
264 |
names.update(cmd.aliases) |
|
265 |
# candidate: modified levenshtein distance against cmd_name.
|
|
266 |
costs = {} |
|
267 |
from . import patiencediff |
|
268 |
for name in sorted(names): |
|
269 |
matcher = patiencediff.PatienceSequenceMatcher(None, cmd_name, name) |
|
270 |
distance = 0.0 |
|
271 |
opcodes = matcher.get_opcodes() |
|
272 |
for opcode, l1, l2, r1, r2 in opcodes: |
|
273 |
if opcode == 'delete': |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
274 |
distance += l2 - l1 |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
275 |
elif opcode == 'replace': |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
276 |
distance += max(l2 - l1, r2 - l1) |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
277 |
elif opcode == 'insert': |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
278 |
distance += r2 - r1 |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
279 |
elif opcode == 'equal': |
280 |
# Score equal ranges lower, making similar commands of equal
|
|
281 |
# length closer than arbitrary same length commands.
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
282 |
distance -= 0.1 * (l2 - l1) |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
283 |
costs[name] = distance |
284 |
costs.update(_GUESS_OVERRIDES.get(cmd_name, {})) |
|
6754.2.2
by Martin
Remove wayward dict.iteritems() call |
285 |
costs = sorted((costs[key], key) for key in costs) |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
286 |
if not costs: |
287 |
return
|
|
288 |
if costs[0][0] > 4: |
|
289 |
return
|
|
290 |
candidate = costs[0][1] |
|
291 |
return candidate |
|
292 |
||
293 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
294 |
def get_cmd_object(cmd_name, plugins_override=True): |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
295 |
"""Return the command object for a command. |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
296 |
|
297 |
plugins_override
|
|
298 |
If true, plugin commands can override builtins.
|
|
350
by Martin Pool
- refactor command aliases into command classes |
299 |
"""
|
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
300 |
try: |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
301 |
return _get_cmd_object(cmd_name, plugins_override) |
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
302 |
except KeyError: |
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
303 |
# No command found, see if this was a typo
|
304 |
candidate = guess_command(cmd_name) |
|
305 |
if candidate is not None: |
|
306 |
raise errors.BzrCommandError( |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
307 |
gettext('unknown command "%s". Perhaps you meant "%s"') |
308 |
% (cmd_name, candidate)) |
|
6690.5.2
by Jelmer Vernooij
Add tests for guess_command. |
309 |
raise errors.BzrCommandError(gettext('unknown command "%s"') |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
310 |
% cmd_name) |
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
311 |
|
312 |
||
5058.2.1
by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when |
313 |
def _get_cmd_object(cmd_name, plugins_override=True, check_missing=True): |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
314 |
"""Get a command object. |
315 |
||
316 |
:param cmd_name: The name of the command.
|
|
317 |
:param plugins_override: Allow plugins to override builtins.
|
|
5058.2.1
by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when |
318 |
:param check_missing: Look up commands not found in the regular index via
|
319 |
the get_missing_command hook.
|
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
320 |
:return: A Command object instance
|
4119.3.10
by Robert Collins
More review feedback. |
321 |
:raises KeyError: If no command is found.
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
322 |
"""
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
323 |
# We want only 'ascii' command names, but the user may have typed
|
324 |
# in a Unicode name. In that case, they should just get a
|
|
325 |
# 'command not found' error later.
|
|
326 |
# In the future, we may actually support Unicode command names.
|
|
327 |
cmd = None |
|
328 |
# Get a command
|
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
329 |
for hook in Command.hooks['get_command']: |
330 |
cmd = hook(cmd, cmd_name) |
|
4119.3.10
by Robert Collins
More review feedback. |
331 |
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. |
332 |
# We've found a non-plugin command, don't permit it to be
|
333 |
# overridden.
|
|
4119.3.10
by Robert Collins
More review feedback. |
334 |
break
|
5058.2.1
by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when |
335 |
if cmd is None and check_missing: |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
336 |
for hook in Command.hooks['get_missing_command']: |
337 |
cmd = hook(cmd_name) |
|
338 |
if cmd is not None: |
|
339 |
break
|
|
340 |
if cmd is None: |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
341 |
# No command found.
|
342 |
raise KeyError |
|
343 |
# Allow plugins to extend commands
|
|
6240.5.7
by Jelmer Vernooij
Drop exception suppression support. |
344 |
for hook in Command.hooks['extend_command']: |
345 |
hook(cmd) |
|
5741.3.1
by Martin Pool
Add Command.invoked_as |
346 |
if getattr(cmd, 'invoked_as', None) is None: |
347 |
cmd.invoked_as = cmd_name |
|
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
348 |
return cmd |
349 |
||
350 |
||
6734.1.1
by Jelmer Vernooij
Fix more imports. |
351 |
class NoPluginAvailable(errors.BzrError): |
352 |
pass
|
|
353 |
||
354 |
||
4119.3.8
by Robert Collins
Get missing command support sorted out. |
355 |
def _try_plugin_provider(cmd_name): |
356 |
"""Probe for a plugin provider having cmd_name.""" |
|
357 |
try: |
|
358 |
plugin_metadata, provider = probe_for_provider(cmd_name) |
|
6734.1.1
by Jelmer Vernooij
Fix more imports. |
359 |
raise CommandAvailableInPlugin(cmd_name, plugin_metadata, provider) |
360 |
except NoPluginAvailable: |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
361 |
pass
|
362 |
||
363 |
||
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
364 |
def probe_for_provider(cmd_name): |
365 |
"""Look for a provider for cmd_name. |
|
366 |
||
367 |
:param cmd_name: The command name.
|
|
368 |
:return: plugin_metadata, provider for getting cmd_name.
|
|
369 |
:raises NoPluginAvailable: When no provider can supply the plugin.
|
|
370 |
"""
|
|
371 |
# look for providers that provide this command but aren't installed
|
|
372 |
for provider in command_providers_registry: |
|
373 |
try: |
|
374 |
return provider.plugin_for_command(cmd_name), provider |
|
6734.1.1
by Jelmer Vernooij
Fix more imports. |
375 |
except NoPluginAvailable: |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
376 |
pass
|
6734.1.1
by Jelmer Vernooij
Fix more imports. |
377 |
raise NoPluginAvailable(cmd_name) |
4119.3.4
by Robert Collins
Add Command lookup hooks: list_commands and get_command. |
378 |
|
379 |
||
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
380 |
def _get_bzr_command(cmd_or_None, cmd_name): |
381 |
"""Get a command from bzr's core.""" |
|
272
by Martin Pool
- Add command aliases |
382 |
try: |
5018.1.6
by Martin Pool
Avoid more cases of using a dict of all builtins |
383 |
cmd_class = builtin_command_registry.get(cmd_name) |
272
by Martin Pool
- Add command aliases |
384 |
except KeyError: |
350
by Martin Pool
- refactor command aliases into command classes |
385 |
pass
|
5018.1.6
by Martin Pool
Avoid more cases of using a dict of all builtins |
386 |
else: |
387 |
return cmd_class() |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
388 |
return cmd_or_None |
389 |
||
390 |
||
391 |
def _get_external_command(cmd_or_None, cmd_name): |
|
392 |
"""Lookup a command that is a shell script.""" |
|
393 |
# Only do external command lookups when no command is found so far.
|
|
394 |
if cmd_or_None is not None: |
|
395 |
return cmd_or_None |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
396 |
from breezy.externalcommand import ExternalCommand |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
397 |
cmd_obj = ExternalCommand.find_command(cmd_name) |
398 |
if cmd_obj: |
|
399 |
return cmd_obj |
|
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
400 |
|
401 |
||
402 |
def _get_plugin_command(cmd_or_None, cmd_name): |
|
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
403 |
"""Get a command from brz's plugins.""" |
4119.3.6
by Robert Collins
Refactor commands.__get_cmd_object to be default-installed hooks. |
404 |
try: |
405 |
return plugin_cmds.get(cmd_name)() |
|
406 |
except KeyError: |
|
407 |
pass
|
|
408 |
for key in plugin_cmds.keys(): |
|
409 |
info = plugin_cmds.get_info(key) |
|
410 |
if cmd_name in info.aliases: |
|
411 |
return plugin_cmds.get(key)() |
|
412 |
return cmd_or_None |
|
272
by Martin Pool
- Add command aliases |
413 |
|
329
by Martin Pool
- refactor command functions into command classes |
414 |
|
558
by Martin Pool
- All top-level classes inherit from object |
415 |
class Command(object): |
329
by Martin Pool
- refactor command functions into command classes |
416 |
"""Base class for commands. |
417 |
||
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
418 |
Commands are the heart of the command-line brz interface.
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
419 |
|
420 |
The command object mostly handles the mapping of command-line
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
421 |
parameters into one or more breezy operations, and of the results
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
422 |
into textual output.
|
423 |
||
424 |
Commands normally don't have any state. All their arguments are
|
|
425 |
passed in to the run method. (Subclasses may take a different
|
|
426 |
policy if the behaviour of the instance needs to depend on e.g. a
|
|
427 |
shell plugin and not just its Python class.)
|
|
428 |
||
329
by Martin Pool
- refactor command functions into command classes |
429 |
The docstring for an actual command should give a single-line
|
430 |
summary, then a complete description of the command. A grammar
|
|
431 |
description will be inserted.
|
|
432 |
||
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
433 |
:cvar aliases: Other accepted names for this command.
|
434 |
||
435 |
:cvar takes_args: List of argument forms, marked with whether they are
|
|
436 |
optional, repeated, etc. Examples::
|
|
437 |
||
438 |
['to_location', 'from_branch?', 'file*']
|
|
439 |
||
440 |
* 'to_location' is required
|
|
441 |
* 'from_branch' is optional
|
|
442 |
* 'file' can be specified 0 or more times
|
|
443 |
||
444 |
:cvar takes_options: List of options that may be given for this command.
|
|
445 |
These can be either strings, referring to globally-defined options, or
|
|
446 |
option objects. Retrieve through options().
|
|
447 |
||
448 |
:cvar hidden: If true, this command isn't advertised. This is typically
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
449 |
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() |
450 |
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
451 |
:cvar encoding_type: Command objects will get a 'outf' attribute, which has
|
452 |
been setup to properly handle encoding of unicode strings.
|
|
453 |
encoding_type determines what will happen when characters cannot be
|
|
454 |
encoded:
|
|
455 |
||
456 |
* strict - abort if we cannot decode
|
|
457 |
* replace - put in a bogus character (typically '?')
|
|
458 |
* exact - do not encode sys.stdout
|
|
459 |
||
460 |
NOTE: by default on Windows, sys.stdout is opened as a text stream,
|
|
461 |
therefore LF line-endings are converted to CRLF. When a command uses
|
|
462 |
encoding_type = 'exact', then sys.stdout is forced to be a binary
|
|
463 |
stream, and line-endings will not mangled.
|
|
464 |
||
465 |
:cvar invoked_as:
|
|
5741.3.1
by Martin Pool
Add Command.invoked_as |
466 |
A string indicating the real name under which this command was
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
467 |
invoked, before expansion of aliases.
|
5741.3.1
by Martin Pool
Add Command.invoked_as |
468 |
(This may be None if the command was constructed and run in-process.)
|
469 |
||
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. |
470 |
:cvar hooks: An instance of CommandHooks.
|
5741.3.1
by Martin Pool
Add Command.invoked_as |
471 |
|
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
472 |
:cvar __doc__: The help shown by 'brz help command' for this command.
|
5264.1.2
by Robert Collins
Final fix for 'no help for command' issue. We now show a clean message |
473 |
This is set by assigning explicitly to __doc__ so that -OO can
|
474 |
be used::
|
|
475 |
||
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
476 |
class Foo(Command):
|
477 |
__doc__ = "My help goes here"
|
|
329
by Martin Pool
- refactor command functions into command classes |
478 |
"""
|
479 |
aliases = [] |
|
480 |
takes_args = [] |
|
481 |
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() |
482 |
encoding_type = 'strict' |
5741.3.1
by Martin Pool
Add Command.invoked_as |
483 |
invoked_as = None |
5875.4.6
by INADA Naoki
Call i18n.install in get_help_text. |
484 |
l10n = True |
329
by Martin Pool
- refactor command functions into command classes |
485 |
|
486 |
hidden = False |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
487 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
488 |
def __init__(self): |
489 |
"""Construct an instance of this command.""" |
|
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
490 |
# List of standard options directly supported
|
491 |
self.supported_std_options = [] |
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
492 |
self._setup_run() |
5050.1.3
by Vincent Ladeuil
Delete spurious spaces. |
493 |
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
494 |
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. |
495 |
"""Register a function to call after self.run returns or raises. |
496 |
||
497 |
Functions will be called in LIFO order.
|
|
498 |
"""
|
|
4900.1.1
by Andrew Bennetts
Add add_cleanup to Command. |
499 |
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. |
500 |
|
501 |
def cleanup_now(self): |
|
502 |
"""Execute and empty pending cleanup functions immediately. |
|
503 |
||
504 |
After cleanup_now all registered cleanups are forgotten. add_cleanup
|
|
505 |
may be called again after cleanup_now; these cleanups will be called
|
|
506 |
after self.run returns or raises (or when cleanup_now is next called).
|
|
507 |
||
508 |
This is useful for releasing expensive or contentious resources (such
|
|
509 |
as write locks) before doing further work that does not require those
|
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
510 |
resources (such as writing results to self.outf). Note though, that
|
511 |
as it releases all resources, this may release locks that the command
|
|
512 |
wants to hold, so use should be done with care.
|
|
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. |
513 |
"""
|
514 |
self._operation.cleanup_now() |
|
5050.1.3
by Vincent Ladeuil
Delete spurious spaces. |
515 |
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
516 |
def _usage(self): |
517 |
"""Return single-line grammar for this command. |
|
518 |
||
519 |
Only describes arguments, not options.
|
|
520 |
"""
|
|
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
521 |
s = 'brz ' + self.name() + ' ' |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
522 |
for aname in self.takes_args: |
523 |
aname = aname.upper() |
|
524 |
if aname[-1] in ['$', '+']: |
|
525 |
aname = aname[:-1] + '...' |
|
526 |
elif aname[-1] == '?': |
|
527 |
aname = '[' + aname[:-1] + ']' |
|
528 |
elif aname[-1] == '*': |
|
529 |
aname = '[' + aname[:-1] + '...]' |
|
530 |
s += aname + ' ' |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
531 |
s = s[:-1] # remove last space |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
532 |
return s |
533 |
||
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
534 |
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 |
535 |
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. |
536 |
"""Return a text string with help for this command. |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
537 |
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
538 |
:param additional_see_also: Additional help topics to be
|
539 |
cross-referenced.
|
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
540 |
:param plain: if False, raw help (reStructuredText) is
|
541 |
returned instead of plain text.
|
|
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
542 |
:param see_also_as_links: if True, convert items in 'See also'
|
2677.1.4
by Alexander Belchenko
fixes after John's review |
543 |
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 |
544 |
:param verbose: if True, display the full help, otherwise
|
545 |
leave out the descriptive sections and just display
|
|
3984.4.8
by Ian Clatworthy
tweak docstring |
546 |
usage help (e.g. Purpose, Usage, Options) with a
|
547 |
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. |
548 |
"""
|
6112.1.1
by Jonathan Riddell
check for installed i18n before doing install |
549 |
if self.l10n: |
5875.3.25
by Vincent Ladeuil
Fix test failures and make sure we don't rely on a default translation. |
550 |
i18n.install() # Install i18n only for get_help_text for now. |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
551 |
doc = self.help() |
5875.3.1
by INADA Naoki
Implement command help l10n. |
552 |
if doc: |
5875.4.1
by INADA Naoki
Add comment about describing ":Usage:" section is not translated. |
553 |
# Note: If self.gettext() translates ':Usage:\n', the section will
|
554 |
# be shown after "Description" section and we don't want to
|
|
555 |
# translate the usage string.
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
556 |
# Though, brz export-pot don't exports :Usage: section and it must
|
5875.4.1
by INADA Naoki
Add comment about describing ":Usage:" section is not translated. |
557 |
# not be translated.
|
5875.3.25
by Vincent Ladeuil
Fix test failures and make sure we don't rely on a default translation. |
558 |
doc = self.gettext(doc) |
5875.3.1
by INADA Naoki
Implement command help l10n. |
559 |
else: |
560 |
doc = gettext("No help for this command.") |
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
561 |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
562 |
# Extract the summary (purpose) and sections out from the text
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
563 |
purpose, sections, order = self._get_help_parts(doc) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
564 |
|
565 |
# If a custom usage section was provided, use it
|
|
6619.3.1
by Jelmer Vernooij
Apply 2to3 has_key fix. |
566 |
if 'Usage' in sections: |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
567 |
usage = sections.pop('Usage') |
568 |
else: |
|
569 |
usage = self._usage() |
|
570 |
||
571 |
# The header is the purpose and usage
|
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
572 |
result = "" |
5875.3.26
by Vincent Ladeuil
Tweak test_help some more. |
573 |
result += gettext(':Purpose: %s\n') % (purpose,) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
574 |
if usage.find('\n') >= 0: |
5875.3.23
by Vincent Ladeuil
Put the '\n' back into the formats and fix tests accordingly (reducing code duplication). |
575 |
result += gettext(':Usage:\n%s\n') % (usage,) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
576 |
else: |
5875.3.23
by Vincent Ladeuil
Put the '\n' back into the formats and fix tests accordingly (reducing code duplication). |
577 |
result += gettext(':Usage: %s\n') % (usage,) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
578 |
result += '\n' |
579 |
||
580 |
# Add the options
|
|
4070.11.3
by Martin Pool
doc |
581 |
#
|
582 |
# XXX: optparse implicitly rewraps the help, and not always perfectly,
|
|
583 |
# so we get <https://bugs.launchpad.net/bzr/+bug/249908>. -- mbp
|
|
584 |
# 20090319
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
585 |
parser = option.get_optparser( |
586 |
[v for k, v in sorted(self.options().items())]) |
|
5875.3.15
by INADA Naoki
Use better variable name. |
587 |
options = parser.format_option_help() |
5860.1.1
by Vincent Ladeuil
Fix some ReST typos in the configuration help and restore the workaround for dotted format names breaking sphinx. |
588 |
# FIXME: According to the spec, ReST option lists actually don't
|
589 |
# support options like --1.14 so that causes syntax errors (in Sphinx
|
|
590 |
# at least). As that pattern always appears in the commands that
|
|
591 |
# break, we trap on that and then format that block of 'format' options
|
|
592 |
# as a literal block. We use the most recent format still listed so we
|
|
593 |
# don't have to do that too often -- vila 20110514
|
|
594 |
if not plain and options.find(' --1.14 ') != -1: |
|
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 |
595 |
options = options.replace(' format:\n', ' format::\n\n', 1) |
5875.3.14
by INADA Naoki
Change how to use gettext for section titles. |
596 |
if options.startswith('Options:'): |
597 |
result += gettext(':Options:%s') % (options[len('options:'):],) |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
598 |
else: |
599 |
result += options |
|
600 |
result += '\n' |
|
601 |
||
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
602 |
if verbose: |
603 |
# Add the description, indenting it 2 spaces
|
|
604 |
# to match the indentation of the options
|
|
6619.3.1
by Jelmer Vernooij
Apply 2to3 has_key fix. |
605 |
if None in sections: |
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
606 |
text = sections.pop(None) |
607 |
text = '\n '.join(text.splitlines()) |
|
5875.3.23
by Vincent Ladeuil
Put the '\n' back into the formats and fix tests accordingly (reducing code duplication). |
608 |
result += gettext(':Description:\n %s\n\n') % (text,) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
609 |
|
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
610 |
# Add the custom sections (e.g. Examples). Note that there's no need
|
611 |
# to indent these as they must be indented already in the source.
|
|
612 |
if sections: |
|
613 |
for label in order: |
|
5875.3.1
by INADA Naoki
Implement command help l10n. |
614 |
if label in sections: |
615 |
result += ':%s:\n%s\n' % (label, sections[label]) |
|
3984.4.1
by Ian Clatworthy
get_help_text() verbose parameter & keep custom sections ordered |
616 |
result += '\n' |
617 |
else: |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
618 |
result += (gettext("See brz help %s for more details and examples.\n\n") |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
619 |
% self.name()) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
620 |
|
621 |
# Add the aliases, source (plug-in) and see also links, if any
|
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
622 |
if self.aliases: |
5875.3.14
by INADA Naoki
Change how to use gettext for section titles. |
623 |
result += gettext(':Aliases: ') |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
624 |
result += ', '.join(self.aliases) + '\n' |
625 |
plugin_name = self.plugin_name() |
|
626 |
if plugin_name is not None: |
|
5875.3.14
by INADA Naoki
Change how to use gettext for section titles. |
627 |
result += gettext(':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. |
628 |
see_also = self.get_see_also(additional_see_also) |
2432.1.12
by Robert Collins
Relocate command help onto Command. |
629 |
if see_also: |
2677.1.4
by Alexander Belchenko
fixes after John's review |
630 |
if not plain and see_also_as_links: |
631 |
see_also_links = [] |
|
632 |
for item in see_also: |
|
633 |
if item == 'topics': |
|
634 |
# topics doesn't have an independent section
|
|
635 |
# so don't create a real link
|
|
636 |
see_also_links.append(item) |
|
637 |
else: |
|
4927.2.2
by Ian Clatworthy
User Reference as topics |
638 |
# Use a Sphinx link for this entry
|
6147.1.1
by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations |
639 |
link_text = gettext(":doc:`{0} <{1}-help>`").format( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
640 |
item, item) |
4927.2.2
by Ian Clatworthy
User Reference as topics |
641 |
see_also_links.append(link_text) |
2677.1.4
by Alexander Belchenko
fixes after John's review |
642 |
see_also = see_also_links |
5875.3.14
by INADA Naoki
Change how to use gettext for section titles. |
643 |
result += gettext(':See also: %s') % ', '.join(see_also) + '\n' |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
644 |
|
3668.2.1
by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name. |
645 |
# If this will be rendered as plain text, convert it
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
646 |
if plain: |
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
647 |
import breezy.help_topics |
648 |
result = breezy.help_topics.help_as_plain_text(result) |
|
2432.1.12
by Robert Collins
Relocate command help onto Command. |
649 |
return result |
650 |
||
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
651 |
@staticmethod
|
652 |
def _get_help_parts(text): |
|
653 |
"""Split help text into a summary and named sections. |
|
654 |
||
3974.1.1
by Ian Clatworthy
keep section ordering in help |
655 |
:return: (summary,sections,order) where summary is the top line and
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
656 |
sections is a dictionary of the rest indexed by section name.
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
657 |
order is the order the section appear in the text.
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
658 |
A section starts with a heading line of the form ":xxx:".
|
659 |
Indented text on following lines is the section value.
|
|
660 |
All text found outside a named section is assigned to the
|
|
661 |
default section which is given the key of None.
|
|
662 |
"""
|
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
663 |
def save_section(sections, order, label, section): |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
664 |
if len(section) > 0: |
6619.3.1
by Jelmer Vernooij
Apply 2to3 has_key fix. |
665 |
if label in sections: |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
666 |
sections[label] += '\n' + section |
667 |
else: |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
668 |
order.append(label) |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
669 |
sections[label] = section |
3668.2.1
by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name. |
670 |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
671 |
lines = text.rstrip().splitlines() |
672 |
summary = lines.pop(0) |
|
673 |
sections = {} |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
674 |
order = [] |
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
675 |
label, section = None, '' |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
676 |
for line in lines: |
677 |
if line.startswith(':') and line.endswith(':') and len(line) > 2: |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
678 |
save_section(sections, order, label, section) |
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
679 |
label, section = line[1:-1], '' |
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
680 |
elif (label is not None and len(line) > 1 and |
681 |
not line[0].isspace()): |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
682 |
save_section(sections, order, label, section) |
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
683 |
label, section = None, line |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
684 |
else: |
685 |
if len(section) > 0: |
|
686 |
section += '\n' + line |
|
687 |
else: |
|
688 |
section = line |
|
3974.1.1
by Ian Clatworthy
keep section ordering in help |
689 |
save_section(sections, order, label, section) |
690 |
return summary, sections, order |
|
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
691 |
|
2432.1.28
by Robert Collins
Add a get_help_topic method to commands.Command. |
692 |
def get_help_topic(self): |
693 |
"""Return the commands help topic - its name.""" |
|
694 |
return self.name() |
|
695 |
||
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
696 |
def get_see_also(self, additional_terms=None): |
2677.1.2
by Alexander Belchenko
bzr_man: see also topics as cross-reference links |
697 |
"""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 |
698 |
|
2425.2.1
by Robert Collins
Command objects can now declare related help topics by having _see_also |
699 |
The list is derived from the content of the _see_also attribute. Any
|
700 |
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. |
701 |
: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 |
702 |
:return: A list of help topics.
|
703 |
"""
|
|
2432.1.21
by Robert Collins
Teach Command.get_help_text to show additional help cross references when supplied. |
704 |
see_also = set(getattr(self, '_see_also', [])) |
705 |
if additional_terms: |
|
706 |
see_also.update(additional_terms) |
|
707 |
return sorted(see_also) |
|
2425.2.1
by Robert Collins
Command objects can now declare related help topics by having _see_also |
708 |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
709 |
def options(self): |
710 |
"""Return dict of valid options for this command. |
|
711 |
||
712 |
Maps from long option name to option object."""
|
|
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
713 |
r = Option.STD_OPTIONS.copy() |
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
714 |
std_names = set(r) |
1185.16.43
by Martin Pool
- clean up handling of option objects |
715 |
for o in self.takes_options: |
6621.2.26
by Martin
Misc set of changes to get started with selftest on Python 3 |
716 |
if isinstance(o, string_types): |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
717 |
o = option.Option.OPTIONS[o] |
1185.16.43
by Martin Pool
- clean up handling of option objects |
718 |
r[o.name] = o |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
719 |
if o.name in std_names: |
720 |
self.supported_std_options.append(o.name) |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
721 |
return r |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
722 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
723 |
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() |
724 |
"""Return a file linked to stdout, which has proper encoding.""" |
4792.8.9
by Martin Pool
Send Command.outf through UIFactory |
725 |
self.outf = ui.ui_factory.make_output_stream( |
726 |
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() |
727 |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
728 |
def run_argv_aliases(self, argv, alias_argv=None): |
729 |
"""Parse the command line and run with extra aliases in alias_argv.""" |
|
1553.6.8
by Erik Bågfors
support for overrides |
730 |
args, opts = parse_args(self, argv, alias_argv) |
5875.4.2
by INADA Naoki
Command.run_argv_aliases() always calls self._setup_outf. |
731 |
self._setup_outf() |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
732 |
|
733 |
# Process the standard options
|
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
734 |
if 'help' in opts: # e.g. brz add --help |
5875.3.1
by INADA Naoki
Implement command help l10n. |
735 |
self.outf.write(self.get_help_text()) |
3984.4.6
by Ian Clatworthy
Show usage on --usage, not -h |
736 |
return 0 |
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
737 |
if 'usage' in opts: # e.g. brz add --usage |
5875.3.16
by INADA Naoki
Use _outf for '--using' too. |
738 |
self.outf.write(self.get_help_text(verbose=False)) |
3984.4.5
by Ian Clatworthy
help xxx is full help; xxx -h is concise help |
739 |
return 0 |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
740 |
trace.set_verbosity_level(option._verbosity_level) |
741 |
if 'verbose' in self.supported_std_options: |
|
742 |
opts['verbose'] = trace.is_verbose() |
|
6619.3.1
by Jelmer Vernooij
Apply 2to3 has_key fix. |
743 |
elif 'verbose' in opts: |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
744 |
del opts['verbose'] |
745 |
if 'quiet' in self.supported_std_options: |
|
746 |
opts['quiet'] = trace.is_quiet() |
|
6619.3.1
by Jelmer Vernooij
Apply 2to3 has_key fix. |
747 |
elif 'quiet' in opts: |
2768.1.4
by Ian Clatworthy
Process --verbose and --quiet standard options |
748 |
del opts['quiet'] |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
749 |
# mix arguments and options into one dictionary
|
750 |
cmdargs = _match_argform(self.name(), self.takes_args, args) |
|
751 |
cmdopts = {} |
|
752 |
for k, v in opts.items(): |
|
753 |
cmdopts[k.replace('-', '_')] = v |
|
754 |
||
755 |
all_cmd_args = cmdargs.copy() |
|
756 |
all_cmd_args.update(cmdopts) |
|
757 |
||
5463.1.2
by Martin Pool
Make run_argv_aliases reset the global verbosity after running |
758 |
try: |
759 |
return self.run(**all_cmd_args) |
|
760 |
finally: |
|
761 |
# reset it, so that other commands run in the same process won't
|
|
5609.16.1
by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred. |
762 |
# inherit state. Before we reset it, log any activity, so that it
|
763 |
# gets properly tracked.
|
|
764 |
ui.ui_factory.log_transport_activity( |
|
765 |
display=('bytes' in debug.debug_flags)) |
|
5463.1.2
by Martin Pool
Make run_argv_aliases reset the global verbosity after running |
766 |
trace.set_verbosity_level(0) |
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
767 |
|
768 |
def _setup_run(self): |
|
769 |
"""Wrap the defined run method on self with a cleanup. |
|
770 |
||
771 |
This is called by __init__ to make the Command be able to be run
|
|
772 |
by just calling run(), as it could be before cleanups were added.
|
|
773 |
||
774 |
If a different form of cleanups are in use by your Command subclass,
|
|
775 |
you can override this method.
|
|
776 |
"""
|
|
777 |
class_run = self.run |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
778 |
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
779 |
def run(*args, **kwargs): |
6240.5.7
by Jelmer Vernooij
Drop exception suppression support. |
780 |
for hook in Command.hooks['pre_command']: |
781 |
hook(self) |
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
782 |
self._operation = cleanup.OperationWithCleanups(class_run) |
783 |
try: |
|
784 |
return self._operation.run_simple(*args, **kwargs) |
|
785 |
finally: |
|
786 |
del self._operation |
|
6240.5.7
by Jelmer Vernooij
Drop exception suppression support. |
787 |
for hook in Command.hooks['post_command']: |
788 |
hook(self) |
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
789 |
self.run = run |
790 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
791 |
def run(self): |
792 |
"""Actually run the command. |
|
329
by Martin Pool
- refactor command functions into command classes |
793 |
|
794 |
This is invoked with the options and arguments bound to
|
|
795 |
keyword parameters.
|
|
796 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
797 |
Return 0 or None if the command was successful, or a non-zero
|
798 |
shell error code if not. It's OK for this method to allow
|
|
799 |
an exception to raise up.
|
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
800 |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
801 |
This method is automatically wrapped by Command.__init__ with a
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
802 |
cleanup operation, stored as self._operation. This can be used
|
803 |
via self.add_cleanup to perform automatic cleanups at the end of
|
|
804 |
run().
|
|
805 |
||
806 |
The argument for run are assembled by introspection. So for instance,
|
|
807 |
if your command takes an argument files, you would declare::
|
|
808 |
||
809 |
def run(self, files=None):
|
|
810 |
pass
|
|
329
by Martin Pool
- refactor command functions into command classes |
811 |
"""
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
812 |
raise NotImplementedError('no implementation of command %r' |
1610.1.3
by Martin Pool
Better error message for Command.run() not implemented |
813 |
% self.name()) |
329
by Martin Pool
- refactor command functions into command classes |
814 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
815 |
def help(self): |
816 |
"""Return help message for this class.""" |
|
1610.1.2
by Martin Pool
Move rarely-used import into Command.help() |
817 |
from inspect import getdoc |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
818 |
if self.__doc__ is Command.__doc__: |
819 |
return None |
|
820 |
return getdoc(self) |
|
821 |
||
5875.4.3
by INADA Naoki
Don't use property |
822 |
def gettext(self, message): |
5875.3.1
by INADA Naoki
Implement command help l10n. |
823 |
"""Returns the gettext function used to translate this command's help. |
824 |
||
5875.3.18
by INADA Naoki
Fix docstring of Command.get_gettext |
825 |
Commands provided by plugins should override this to use their
|
826 |
own i18n system.
|
|
5875.3.1
by INADA Naoki
Implement command help l10n. |
827 |
"""
|
5875.3.25
by Vincent Ladeuil
Fix test failures and make sure we don't rely on a default translation. |
828 |
return i18n.gettext_per_paragraph(message) |
5875.3.1
by INADA Naoki
Implement command help l10n. |
829 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
830 |
def name(self): |
5741.3.1
by Martin Pool
Add Command.invoked_as |
831 |
"""Return the canonical name for this command. |
832 |
||
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
833 |
The name under which it was actually invoked is available in invoked_as
|
5741.3.1
by Martin Pool
Add Command.invoked_as |
834 |
"""
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
835 |
return _unsquish_command_name(self.__class__.__name__) |
836 |
||
1733.2.5
by Michael Ellerman
Show which plugin (if any) provides a command. |
837 |
def plugin_name(self): |
838 |
"""Get the name of the plugin that provides this command. |
|
839 |
||
840 |
:return: The name of the plugin or None if the command is builtin.
|
|
841 |
"""
|
|
6651.4.2
by Martin
Move plugin_name logic from commands to plugin to fix test |
842 |
return plugin_name(self.__module__) |
1733.2.5
by Michael Ellerman
Show which plugin (if any) provides a command. |
843 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
844 |
|
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. |
845 |
class CommandHooks(Hooks): |
846 |
"""Hooks related to Command object creation/enumeration.""" |
|
847 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
848 |
def __init__(self): |
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. |
849 |
"""Create the default hooks. |
850 |
||
851 |
These are all empty initially, because by default nothing should get
|
|
852 |
notified.
|
|
853 |
"""
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
854 |
Hooks.__init__(self, "breezy.commands", "Command.hooks") |
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
855 |
self.add_hook( |
856 |
'extend_command', |
|
857 |
"Called after creating a command object to allow modifications "
|
|
858 |
"such as adding or removing options, docs etc. Called with the "
|
|
859 |
"new breezy.commands.Command object.", (1, 13)) |
|
860 |
self.add_hook( |
|
861 |
'get_command', |
|
862 |
"Called when creating a single command. Called with "
|
|
863 |
"(cmd_or_None, command_name). get_command should either return "
|
|
864 |
"the cmd_or_None parameter, or a replacement Command object that "
|
|
865 |
"should be used for the command. Note that the Command.hooks "
|
|
866 |
"hooks are core infrastructure. Many users will prefer to use "
|
|
867 |
"breezy.commands.register_command or plugin_cmds.register_lazy.", |
|
868 |
(1, 17)) |
|
869 |
self.add_hook( |
|
870 |
'get_missing_command', |
|
871 |
"Called when creating a single command if no command could be "
|
|
872 |
"found. Called with (command_name). get_missing_command should "
|
|
873 |
"either return None, or a Command object to be used for the "
|
|
874 |
"command.", (1, 17)) |
|
875 |
self.add_hook( |
|
876 |
'list_commands', |
|
877 |
"Called when enumerating commands. Called with a set of "
|
|
878 |
"cmd_name strings for all the commands found so far. This set "
|
|
879 |
" is safe to mutate - e.g. to remove a command. "
|
|
880 |
"list_commands should return the updated set of command names.", |
|
881 |
(1, 17)) |
|
882 |
self.add_hook( |
|
883 |
'pre_command', |
|
884 |
"Called prior to executing a command. Called with the command "
|
|
885 |
"object.", (2, 6)) |
|
886 |
self.add_hook( |
|
887 |
'post_command', |
|
888 |
"Called after executing a command. Called with the command "
|
|
889 |
"object.", (2, 6)) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
890 |
|
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. |
891 |
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
892 |
Command.hooks = CommandHooks() |
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. |
893 |
|
894 |
||
1553.6.11
by Erik Bågfors
small bugfixes, all tests pass now |
895 |
def parse_args(command, argv, alias_argv=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
896 |
"""Parse command line. |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
897 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
898 |
Arguments and options are parsed at this level before being passed
|
899 |
down to specific command handlers. This routine knows, from a
|
|
900 |
lookup table, something about the available options, what optargs
|
|
901 |
they take, and which commands will accept them.
|
|
902 |
"""
|
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
903 |
# TODO: make it a method of the Command?
|
7045.4.23
by Jelmer Vernooij
Fix some help tests. |
904 |
parser = option.get_optparser( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
905 |
[v for k, v in sorted(command.options().items())]) |
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
906 |
if alias_argv is not None: |
907 |
args = alias_argv + argv |
|
908 |
else: |
|
909 |
args = argv |
|
683
by Martin Pool
- short option stacking patch from John A Meinel |
910 |
|
7078.15.1
by Jelmer Vernooij
Fix some more tests. |
911 |
# python 2's optparse raises this exception if a non-ascii
|
5514.3.2
by Rory Yorke
Added comment on try-except around pargse_args(), w/ pointer to Python bug. |
912 |
# option name is given. See http://bugs.python.org/issue2931
|
5514.3.1
by Rory Yorke
Report an error if a non-ASCII option name is given (bug 140563). |
913 |
try: |
914 |
options, args = parser.parse_args(args) |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
915 |
except UnicodeEncodeError: |
6171.2.1
by Vincent Ladeuil
Global options respect their hidden attribute |
916 |
raise errors.BzrCommandError( |
917 |
gettext('Only ASCII permitted in option names')) |
|
5514.3.1
by Rory Yorke
Report an error if a non-ASCII option name is given (bug 140563). |
918 |
|
6656.1.1
by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers |
919 |
opts = dict((k, v) for k, v in options.__dict__.items() if |
920 |
v is not option.OptionParser.DEFAULT_VALUE) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
921 |
return args, opts |
922 |
||
923 |
||
329
by Martin Pool
- refactor command functions into command classes |
924 |
def _match_argform(cmd, takes_args, args): |
1
by mbp at sourcefrog
import from baz patch-364 |
925 |
argdict = {} |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
926 |
|
329
by Martin Pool
- refactor command functions into command classes |
927 |
# step through args and takes_args, allowing appropriate 0-many matches
|
928 |
for ap in takes_args: |
|
1
by mbp at sourcefrog
import from baz patch-364 |
929 |
argname = ap[:-1] |
930 |
if ap[-1] == '?': |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
931 |
if args: |
932 |
argdict[argname] = args.pop(0) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
933 |
elif ap[-1] == '*': # all remaining arguments |
196
by mbp at sourcefrog
selected-file diff |
934 |
if args: |
935 |
argdict[argname + '_list'] = args[:] |
|
936 |
args = [] |
|
937 |
else: |
|
938 |
argdict[argname + '_list'] = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
939 |
elif ap[-1] == '+': |
940 |
if not args: |
|
6138.3.7
by Jonathan Riddell
add gettext() to BzrCommandError uses |
941 |
raise errors.BzrCommandError(gettext( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
942 |
"command {0!r} needs one or more {1}").format( |
943 |
cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
944 |
else: |
945 |
argdict[argname + '_list'] = args[:] |
|
946 |
args = [] |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
947 |
elif ap[-1] == '$': # all but one |
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 |
948 |
if len(args) < 2: |
6138.3.7
by Jonathan Riddell
add gettext() to BzrCommandError uses |
949 |
raise errors.BzrCommandError( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
950 |
gettext("command {0!r} needs one or more {1}").format( |
951 |
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 |
952 |
argdict[argname + '_list'] = args[:-1] |
1740.5.6
by Martin Pool
Clean up many exception classes. |
953 |
args[:-1] = [] |
1
by mbp at sourcefrog
import from baz patch-364 |
954 |
else: |
955 |
# just a plain arg
|
|
956 |
argname = ap |
|
957 |
if not args: |
|
6138.3.7
by Jonathan Riddell
add gettext() to BzrCommandError uses |
958 |
raise errors.BzrCommandError( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
959 |
gettext("command {0!r} requires argument {1}").format( |
960 |
cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
961 |
else: |
962 |
argdict[argname] = args.pop(0) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
963 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
964 |
if args: |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
965 |
raise errors.BzrCommandError(gettext( |
966 |
"extra argument to command {0}: {1}").format( |
|
967 |
cmd, args[0])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
968 |
|
969 |
return argdict |
|
970 |
||
6759.3.2
by Jelmer Vernooij
Just use an absolute import for trace. :) |
971 |
|
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
972 |
def apply_coveraged(the_callable, *args, **kwargs): |
973 |
import coverage |
|
974 |
cov = coverage.Coverage() |
|
975 |
os.environ['COVERAGE_PROCESS_START'] = cov.config_file |
|
976 |
cov.start() |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
977 |
try: |
978 |
return exception_to_return_code(the_callable, *args, **kwargs) |
|
979 |
finally: |
|
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
980 |
cov.stop() |
981 |
cov.save() |
|
1
by mbp at sourcefrog
import from baz patch-364 |
982 |
|
983 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
984 |
def apply_profiled(the_callable, *args, **kwargs): |
985 |
import hotshot |
|
986 |
import tempfile |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
987 |
import hotshot.stats |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
988 |
pffileno, pfname = tempfile.mkstemp() |
989 |
try: |
|
990 |
prof = hotshot.Profile(pfname) |
|
991 |
try: |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
992 |
ret = prof.runcall(exception_to_return_code, the_callable, *args, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
993 |
**kwargs) or 0 |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
994 |
finally: |
995 |
prof.close() |
|
996 |
stats = hotshot.stats.load(pfname) |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
997 |
stats.strip_dirs() |
998 |
stats.sort_stats('cum') # 'time' |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
999 |
# XXX: Might like to write to stderr or the trace file instead but
|
1000 |
# print_stats seems hardcoded to stdout
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
1001 |
stats.print_stats(20) |
1002 |
return ret |
|
1003 |
finally: |
|
1004 |
os.close(pffileno) |
|
1005 |
os.remove(pfname) |
|
1006 |
||
1007 |
||
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1008 |
def exception_to_return_code(the_callable, *args, **kwargs): |
1009 |
"""UI level helper for profiling and coverage. |
|
1010 |
||
4084.6.3
by Robert Collins
Disagreement on trailing whitespace with the test suite. |
1011 |
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. |
1012 |
relevant to the UI layer, and should never be called where catching
|
1013 |
exceptions may be desirable.
|
|
1014 |
"""
|
|
1015 |
try: |
|
1016 |
return the_callable(*args, **kwargs) |
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
1017 |
except (KeyboardInterrupt, Exception): |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1018 |
# used to handle AssertionError and KeyboardInterrupt
|
1019 |
# specially here, but hopefully they're handled ok by the logger now
|
|
1020 |
exc_info = sys.exc_info() |
|
1021 |
exitcode = trace.report_exception(exc_info, sys.stderr) |
|
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1022 |
if os.environ.get('BRZ_PDB'): |
6619.3.3
by Jelmer Vernooij
Apply 2to3 print fix. |
1023 |
print('**** entering debugger') |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1024 |
import pdb |
6555.1.2
by Jelmer Vernooij
Inline traceback specification. |
1025 |
pdb.post_mortem(exc_info[2]) |
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1026 |
return exitcode |
1027 |
||
1028 |
||
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) |
1029 |
def apply_lsprofiled(filename, the_callable, *args, **kwargs): |
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1030 |
from breezy.lsprof import profile |
6027.1.3
by Vincent Ladeuil
Remove bzrlib.commands deprecated stuff. |
1031 |
ret, stats = profile(exception_to_return_code, the_callable, |
1032 |
*args, **kwargs) |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1033 |
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) |
1034 |
if filename is None: |
1035 |
stats.pprint() |
|
1036 |
else: |
|
2654.2.2
by Ian Clatworthy
Put all format detection stuff in one spot as requested by John Arbash Meinel |
1037 |
stats.save(filename) |
6138.3.2
by Jonathan Riddell
gettext-ify bzrlib/commit.py |
1038 |
trace.note(gettext('Profile data written to "%s".'), filename) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1039 |
return ret |
1040 |
||
1553.6.9
by Erik Bågfors
PEP8-ify |
1041 |
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
1042 |
def get_alias(cmd, config=None): |
1043 |
"""Return an expanded alias, or None if no alias exists. |
|
1044 |
||
1045 |
cmd
|
|
1046 |
Command to be checked for an alias.
|
|
1047 |
config
|
|
1048 |
Used to specify an alternative config to use,
|
|
2155.2.3
by Marius Kruger
* commands.py |
1049 |
which is especially useful for testing.
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
1050 |
If it is unspecified, the global config will be used.
|
1051 |
"""
|
|
1052 |
if config is None: |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1053 |
import breezy.config |
1054 |
config = breezy.config.GlobalConfig() |
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
1055 |
alias = config.get_alias(cmd) |
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1056 |
if (alias): |
4913.5.24
by Gordon Tyler
Added cmdline.split function, which replaces commands.shlex_split_unicode. |
1057 |
return cmdline.split(alias) |
1553.6.8
by Erik Bågfors
support for overrides |
1058 |
return None |
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1059 |
|
1553.6.9
by Erik Bågfors
PEP8-ify |
1060 |
|
5051.1.1
by Robert Collins
* ``bzrlib.comands.run_bzr`` is more extensible: callers can supply the |
1061 |
def run_bzr(argv, load_plugins=load_plugins, disable_plugins=disable_plugins): |
1
by mbp at sourcefrog
import from baz patch-364 |
1062 |
"""Execute a command. |
1063 |
||
5051.1.1
by Robert Collins
* ``bzrlib.comands.run_bzr`` is more extensible: callers can supply the |
1064 |
:param argv: The command-line arguments, without the program name from
|
1065 |
argv[0] These should already be decoded. All library/test code calling
|
|
1066 |
run_bzr should be passing valid strings (don't need decoding).
|
|
1067 |
:param load_plugins: What function to call when triggering plugin loading.
|
|
1068 |
This function should take no arguments and cause all plugins to be
|
|
1069 |
loaded.
|
|
1070 |
:param disable_plugins: What function to call when disabling plugin
|
|
1071 |
loading. This function should take no arguments and cause all plugin
|
|
1072 |
loading to be prohibited (so that code paths in your application that
|
|
1073 |
know about some plugins possibly being present will fail to import
|
|
1074 |
those plugins even if they are installed.)
|
|
1075 |
:return: Returns a command exit code or raises an exception.
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1076 |
|
1077 |
Special master options: these must come before the command because
|
|
1078 |
they control how the command is interpreted.
|
|
1079 |
||
1080 |
--no-plugins
|
|
1081 |
Do not load plugin modules at all
|
|
1082 |
||
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1083 |
--no-aliases
|
1084 |
Do not allow aliases
|
|
1085 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1086 |
--builtin
|
1087 |
Only use builtin commands. (Plugins are still allowed to change
|
|
1088 |
other behaviour.)
|
|
1089 |
||
1090 |
--profile
|
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1091 |
Run under the Python hotshot profiler.
|
1092 |
||
1093 |
--lsprof
|
|
1094 |
Run under the Python lsprof profiler.
|
|
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
1095 |
|
1096 |
--coverage
|
|
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1097 |
Generate code coverage report
|
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
1098 |
|
1099 |
--concurrency
|
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
1100 |
Specify the number of processes that can be run concurrently
|
1101 |
(selftest).
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
1102 |
"""
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1103 |
trace.mutter("breezy version: " + breezy.__version__) |
5785.1.2
by Martin
Move _specified_or_unicode_argv call inside run_bzr as it may raise an error that should be reported |
1104 |
argv = _specified_or_unicode_argv(argv) |
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
1105 |
trace.mutter("brz arguments: %r", argv) |
907.1.21
by John Arbash Meinel
Adding http transport as a valid transport protocol. |
1106 |
|
5875.3.1
by INADA Naoki
Implement command help l10n. |
1107 |
opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \ |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1108 |
opt_coverage = opt_no_l10n = opt_no_aliases = False |
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1109 |
opt_lsprof_file = None |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1110 |
|
1111 |
# --no-plugins is handled specially at a very early stage. We need
|
|
1112 |
# to load plugins before doing other command parsing so that they
|
|
1113 |
# can override commands, but this needs to happen first.
|
|
1114 |
||
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) |
1115 |
argv_copy = [] |
1116 |
i = 0 |
|
6161.1.4
by Vincent Ladeuil
Follow the lead of other 'global' options which are not declared in option.py but handled in bzrlib.commands.run_bzr instead. |
1117 |
override_config = [] |
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) |
1118 |
while i < len(argv): |
1119 |
a = argv[i] |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1120 |
if a == '--profile': |
1121 |
opt_profile = True |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1122 |
elif a == '--lsprof': |
1123 |
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) |
1124 |
elif a == '--lsprof-file': |
1706.2.6
by Robey Pointer
when giving --lsprof-file, assume --lsprof |
1125 |
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) |
1126 |
opt_lsprof_file = argv[i + 1] |
1127 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1128 |
elif a == '--no-plugins': |
1129 |
opt_no_plugins = True |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1130 |
elif a == '--no-aliases': |
1131 |
opt_no_aliases = True |
|
5875.3.22
by INADA Naoki
s/i18n/l10n/ |
1132 |
elif a == '--no-l10n': |
1133 |
opt_no_l10n = True |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1134 |
elif a == '--builtin': |
1135 |
opt_builtin = True |
|
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
1136 |
elif a == '--concurrency': |
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1137 |
os.environ['BRZ_CONCURRENCY'] = argv[i + 1] |
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
1138 |
i += 1 |
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
1139 |
elif a == '--coverage': |
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1140 |
opt_coverage = True |
5274.4.10
by Jason Spashett
Take away removal of --profile-imports from bzr script. Instead ignore this in global options bzrlib/commands.py run_bzr |
1141 |
elif a == '--profile-imports': |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1142 |
pass # already handled in startup script Bug #588277 |
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
1143 |
elif a.startswith('-D'): |
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
1144 |
debug.debug_flags.add(a[2:]) |
6161.1.4
by Vincent Ladeuil
Follow the lead of other 'global' options which are not declared in option.py but handled in bzrlib.commands.run_bzr instead. |
1145 |
elif a.startswith('-O'): |
1146 |
override_config.append(a[2:]) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1147 |
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) |
1148 |
argv_copy.append(a) |
1149 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1150 |
|
6759.4.2
by Jelmer Vernooij
Use get_global_state> |
1151 |
cmdline_overrides = breezy.get_global_state().cmdline_overrides |
6437.6.1
by Vincent Ladeuil
Support scripts that don't call bzrlib.initialize() but still call run_bzr(). |
1152 |
cmdline_overrides._from_cmdline(override_config) |
6161.1.4
by Vincent Ladeuil
Follow the lead of other 'global' options which are not declared in option.py but handled in bzrlib.commands.run_bzr instead. |
1153 |
|
4070.8.2
by Martin Pool
Initial support for debug_flags config option |
1154 |
debug.set_debug_flags_from_config() |
1155 |
||
5051.1.1
by Robert Collins
* ``bzrlib.comands.run_bzr`` is more extensible: callers can supply the |
1156 |
if not opt_no_plugins: |
1157 |
load_plugins() |
|
1158 |
else: |
|
1159 |
disable_plugins() |
|
1160 |
||
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) |
1161 |
argv = argv_copy |
1616.1.15
by Martin Pool
Handle 'bzr ?', etc. |
1162 |
if (not argv): |
5051.1.1
by Robert Collins
* ``bzrlib.comands.run_bzr`` is more extensible: callers can supply the |
1163 |
get_cmd_object('help').run_argv_aliases([]) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
1164 |
return 0 |
1165 |
||
1166 |
if argv[0] == '--version': |
|
5051.1.1
by Robert Collins
* ``bzrlib.comands.run_bzr`` is more extensible: callers can supply the |
1167 |
get_cmd_object('version').run_argv_aliases([]) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
1168 |
return 0 |
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1169 |
|
1553.6.17
by Erik Bågfors
fix for broken --no-aliases |
1170 |
alias_argv = None |
1171 |
||
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1172 |
if not opt_no_aliases: |
1553.6.8
by Erik Bågfors
support for overrides |
1173 |
alias_argv = get_alias(argv[0]) |
1174 |
if alias_argv: |
|
1175 |
argv[0] = alias_argv.pop(0) |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
1176 |
|
1948.1.1
by John Arbash Meinel
Raise a reasonable error when a command is non-ascii |
1177 |
cmd = argv.pop(0) |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
1178 |
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin) |
5875.4.6
by INADA Naoki
Call i18n.install in get_help_text. |
1179 |
if opt_no_l10n: |
6621.2.26
by Martin
Misc set of changes to get started with selftest on Python 3 |
1180 |
cmd_obj.l10n = False |
2367.2.1
by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins) |
1181 |
run = cmd_obj.run_argv_aliases |
1182 |
run_argv = [argv, alias_argv] |
|
1534.7.154
by Aaron Bentley
Removed changes from bzr.ab 1529..1536 |
1183 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1184 |
try: |
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1185 |
# We can be called recursively (tests for example), but we don't want
|
1186 |
# the verbosity level to propagate.
|
|
1187 |
saved_verbosity_level = option._verbosity_level |
|
1188 |
option._verbosity_level = 0 |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1189 |
if opt_lsprof: |
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1190 |
if opt_coverage: |
3169.3.4
by Andrew Bennetts
Warn if --coverage is used with a conflicting global option. |
1191 |
trace.warning( |
1192 |
'--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. |
1193 |
ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
1194 |
elif opt_profile: |
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1195 |
if opt_coverage: |
3169.3.4
by Andrew Bennetts
Warn if --coverage is used with a conflicting global option. |
1196 |
trace.warning( |
1197 |
'--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. |
1198 |
ret = apply_profiled(run, *run_argv) |
6954.1.7
by Jelmer Vernooij
Switch to coverage. |
1199 |
elif opt_coverage: |
1200 |
ret = apply_coveraged(run, *run_argv) |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1201 |
else: |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
1202 |
ret = run(*run_argv) |
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
1203 |
return ret or 0 |
1204 |
finally: |
|
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1205 |
# reset, in case we may do other commands later within the same
|
1206 |
# process. Commands that want to execute sub-commands must propagate
|
|
1207 |
# --verbose in their own way.
|
|
4682.1.1
by John Arbash Meinel
Put the 'debug_memory' check into the finally clause. |
1208 |
if 'memory' in debug.debug_flags: |
1209 |
trace.debug_memory('Process status after command:', short=False) |
|
3755.1.1
by Vincent Ladeuil
Fix --verbose leaking into blackbox tests. |
1210 |
option._verbosity_level = saved_verbosity_level |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1211 |
# Reset the overrides
|
6437.6.1
by Vincent Ladeuil
Support scripts that don't call bzrlib.initialize() but still call run_bzr(). |
1212 |
cmdline_overrides._reset() |
267
by Martin Pool
- better reporting of errors |
1213 |
|
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. |
1214 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1215 |
def display_command(func): |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1216 |
"""Decorator that suppresses pipe/interrupt errors.""" |
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1217 |
def ignore_pipe(*args, **kwargs): |
1218 |
try: |
|
1185.35.22
by Aaron Bentley
Handled more pipe errors for display commands. |
1219 |
result = func(*args, **kwargs) |
1220 |
sys.stdout.flush() |
|
1221 |
return result |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
1222 |
except IOError as e: |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1223 |
if getattr(e, 'errno', None) is None: |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1224 |
raise
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1225 |
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 |
1226 |
# 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 |
1227 |
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 |
1228 |
raise
|
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
1229 |
pass
|
1185.12.69
by Aaron Bentley
Ignored ^C in display commands |
1230 |
except KeyboardInterrupt: |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1231 |
pass
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1232 |
return ignore_pipe |
267
by Martin Pool
- better reporting of errors |
1233 |
|
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
1234 |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1235 |
def install_bzr_command_hooks(): |
1236 |
"""Install the hooks to supply bzr's own commands.""" |
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1237 |
if _list_bzr_commands in Command.hooks["list_commands"]: |
1238 |
return
|
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1239 |
Command.hooks.install_named_hook("list_commands", _list_bzr_commands, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1240 |
"bzr commands") |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1241 |
Command.hooks.install_named_hook("get_command", _get_bzr_command, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1242 |
"bzr commands") |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1243 |
Command.hooks.install_named_hook("get_command", _get_plugin_command, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1244 |
"bzr plugin commands") |
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1245 |
Command.hooks.install_named_hook("get_command", _get_external_command, |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1246 |
"bzr external command lookup") |
6161.1.1
by Vincent Ladeuil
Allow config options to be overridden from the command line |
1247 |
Command.hooks.install_named_hook("get_missing_command", |
1248 |
_try_plugin_provider, |
|
1249 |
"bzr plugin-provider-db check") |
|
4119.3.8
by Robert Collins
Get missing command support sorted out. |
1250 |
|
1251 |
||
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1252 |
def _specified_or_unicode_argv(argv): |
1253 |
# For internal or testing use, argv can be passed. Otherwise, get it from
|
|
1254 |
# the process arguments in a unicode-safe way.
|
|
4355.2.1
by Alexander Belchenko
Using unicode Windows API to obtain command-line arguments. |
1255 |
if argv is None: |
5274.4.8
by Jason Spashett
Reverse merge -r 5280..5279 |
1256 |
return osutils.get_unicode_argv() |
6754.2.1
by Martin
Fix _specified_or_unicode_argv for Python 3after osutils helper removal |
1257 |
new_argv = [] |
1258 |
try: |
|
1259 |
# ensure all arguments are unicode strings
|
|
1260 |
for a in argv: |
|
1261 |
if not isinstance(a, string_types): |
|
1262 |
raise ValueError('not native str or unicode: %r' % (a,)) |
|
1263 |
if isinstance(a, bytes): |
|
1264 |
# For Python 2 only allow ascii native strings
|
|
1265 |
a = a.decode('ascii') |
|
1266 |
new_argv.append(a) |
|
1267 |
except (ValueError, UnicodeDecodeError): |
|
1268 |
raise errors.BzrError("argv should be list of unicode strings.") |
|
1269 |
return new_argv |
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1270 |
|
1271 |
||
1272 |
def main(argv=None): |
|
1273 |
"""Main entry point of command-line interface. |
|
1274 |
||
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
1275 |
Typically `breezy.initialize` should be called first.
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1276 |
|
1277 |
:param argv: list of unicode command-line arguments similar to sys.argv.
|
|
1278 |
argv[0] is script name usually, it will be ignored.
|
|
1279 |
Don't pass here sys.argv because this list contains plain strings
|
|
1280 |
and not unicode; pass None instead.
|
|
1281 |
||
6622.1.1
by Jelmer Vernooij
Rename bzrlib => brzlib, bzr => brz. |
1282 |
:return: exit code of brz command.
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1283 |
"""
|
5785.1.2
by Martin
Move _specified_or_unicode_argv call inside run_bzr as it may raise an error that should be reported |
1284 |
if argv is not None: |
1285 |
argv = argv[1:] |
|
5018.1.3
by Martin Pool
Put builtin commands into a real registry |
1286 |
_register_builtin_commands() |
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
1287 |
ret = run_bzr_catch_errors(argv) |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
1288 |
trace.mutter("return code %d", ret) |
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
1289 |
return ret |
1185.3.19
by Martin Pool
- split out commandline error reporting for ease of testing |
1290 |
|
1291 |
||
1292 |
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. |
1293 |
"""Run a bzr command with parameters as described by argv. |
4084.6.3
by Robert Collins
Disagreement on trailing whitespace with the test suite. |
1294 |
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1295 |
This function assumed that that UI layer is setup, that symbol deprecations
|
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
1296 |
are already applied, and that unicode decoding has already been performed
|
1297 |
on argv.
|
|
4084.6.1
by Robert Collins
Refactor profiling exception handling to restore clear layers - command handling in commands.py, profiling in lsprof.py. |
1298 |
"""
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1299 |
# done here so that they're covered for every test run
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1300 |
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. |
1301 |
return exception_to_return_code(run_bzr, argv) |
1
by mbp at sourcefrog
import from baz patch-364 |
1302 |
|
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1303 |
|
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 |
1304 |
def run_bzr_catch_user_errors(argv): |
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
1305 |
"""Run brz and report user errors, but let internal errors propagate. |
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 |
1306 |
|
1307 |
This is used for the test suite, and might be useful for other programs
|
|
1308 |
that want to wrap the commandline interface.
|
|
1309 |
"""
|
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
1310 |
# done here so that they're covered for every test run
|
4119.3.13
by Robert Collins
Unbreak blackbox tests. |
1311 |
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 |
1312 |
try: |
1313 |
return run_bzr(argv) |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
1314 |
except Exception as e: |
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 |
1315 |
if (isinstance(e, (OSError, IOError)) |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1316 |
or not getattr(e, 'internal_error', True)): |
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 |
1317 |
trace.report_exception(sys.exc_info(), sys.stderr) |
1318 |
return 3 |
|
1319 |
else: |
|
1320 |
raise
|
|
1321 |
||
1322 |
||
2432.1.15
by Robert Collins
Rename Context (in bzrlib.help) to Index, for a clearer name. |
1323 |
class HelpCommandIndex(object): |
1324 |
"""A index for bzr help that returns commands.""" |
|
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1325 |
|
2432.1.17
by Robert Collins
Add prefixes to HelpIndexes. |
1326 |
def __init__(self): |
1327 |
self.prefix = 'commands/' |
|
1328 |
||
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
1329 |
def get_topics(self, topic): |
1330 |
"""Search for topic amongst commands. |
|
1331 |
||
1332 |
:param topic: A topic to search for.
|
|
1333 |
:return: A list which is either empty or contains a single
|
|
1334 |
Command entry.
|
|
1335 |
"""
|
|
2432.1.18
by Robert Collins
Add support for doing bzr help commands/COMMANDNAME. |
1336 |
if topic and topic.startswith(self.prefix): |
1337 |
topic = topic[len(self.prefix):] |
|
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
1338 |
try: |
5058.2.1
by Robert Collins
* ``bzr help`` will no longer trigger the get_missing_command hook when |
1339 |
cmd = _get_cmd_object(topic, check_missing=False) |
2432.1.13
by Robert Collins
HelpCommandContext now implementes get_topics. |
1340 |
except KeyError: |
1341 |
return [] |
|
1342 |
else: |
|
1343 |
return [cmd] |
|
1344 |
||
2432.1.2
by Robert Collins
Add a HelpCommandContext class for help from commands. |
1345 |
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1346 |
class Provider(object): |
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1347 |
"""Generic class to be overriden by plugins""" |
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1348 |
|
1349 |
def plugin_for_command(self, cmd_name): |
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1350 |
"""Takes a command and returns the information for that plugin |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1351 |
|
1352 |
:return: A dictionary with all the available information
|
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1353 |
for the requested plugin
|
1354 |
"""
|
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1355 |
raise NotImplementedError |
1356 |
||
1357 |
||
1358 |
class ProvidersRegistry(registry.Registry): |
|
5891.1.3
by Andrew Bennetts
Move docstring formatting fixes. |
1359 |
"""This registry exists to allow other providers to exist""" |
3246.7.3
by Martin Albisetti
Code cleanup and documentation |
1360 |
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1361 |
def __iter__(self): |
6621.2.26
by Martin
Misc set of changes to get started with selftest on Python 3 |
1362 |
for key, provider in self.items(): |
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1363 |
yield provider |
1364 |
||
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1365 |
|
3246.7.1
by Martin Albisetti
Core code for automatic plugin suggestion |
1366 |
command_providers_registry = ProvidersRegistry() |