2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2006 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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
18 |
# TODO: probably should say which arguments are candidates for glob
|
19 |
# expansion on windows and do that at the command level.
|
|
20 |
||
1095
by Martin Pool
todo |
21 |
# TODO: Define arguments by objects, rather than just using names.
|
22 |
# Those objects can specify the expected type of the argument, which
|
|
1610.1.4
by Martin Pool
Doc |
23 |
# would help with validation and shell completion. They could also provide
|
24 |
# help/explanation for that argument in a structured way.
|
|
25 |
||
26 |
# TODO: Specific "examples" property on commands for consistent formatting.
|
|
1095
by Martin Pool
todo |
27 |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
28 |
# TODO: "--profile=cum", to change sort order. Is there any value in leaving
|
29 |
# the profile output behind so it can be interactively examined?
|
|
30 |
||
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
31 |
import os |
32 |
import sys |
|
33 |
||
34 |
from bzrlib.lazy_import import lazy_import |
|
35 |
lazy_import(globals(), """ |
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
36 |
import codecs
|
37 |
import errno
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
38 |
from warnings import warn
|
1
by mbp at sourcefrog
import from baz patch-364 |
39 |
|
40 |
import bzrlib
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
41 |
from bzrlib import (
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
42 |
debug,
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
43 |
errors,
|
44 |
option,
|
|
45 |
osutils,
|
|
46 |
trace,
|
|
47 |
)
|
|
48 |
""") |
|
49 |
||
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
50 |
from bzrlib.symbol_versioning import ( |
51 |
deprecated_function, |
|
52 |
deprecated_method, |
|
53 |
zero_eight, |
|
54 |
zero_eleven, |
|
55 |
)
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
56 |
# Compatibility
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
57 |
from bzrlib.option import Option |
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 |
|
731
by Martin Pool
- merge plugin patch from john |
60 |
plugin_cmds = {} |
61 |
||
62 |
||
1492
by Robert Collins
Support decoration of commands. |
63 |
def register_command(cmd, decorate=False): |
1616.1.6
by Martin Pool
doc |
64 |
"""Utility function to help register a command
|
65 |
||
66 |
:param cmd: Command subclass to register
|
|
67 |
:param decorate: If true, allow overriding an existing command
|
|
68 |
of the same name; the old command is returned by this function.
|
|
69 |
Otherwise it is an error to try to override an existing command.
|
|
70 |
"""
|
|
731
by Martin Pool
- merge plugin patch from john |
71 |
global plugin_cmds |
72 |
k = cmd.__name__ |
|
73 |
if k.startswith("cmd_"): |
|
74 |
k_unsquished = _unsquish_command_name(k) |
|
75 |
else: |
|
76 |
k_unsquished = k |
|
1963.2.1
by Robey Pointer
remove usage of has_key() |
77 |
if k_unsquished not in plugin_cmds: |
731
by Martin Pool
- merge plugin patch from john |
78 |
plugin_cmds[k_unsquished] = cmd |
2127.5.1
by mbp at sourcefrog
record command-line arguments in .bzr.log, drop some mutter statements |
79 |
## trace.mutter('registered plugin command %s', k_unsquished)
|
1492
by Robert Collins
Support decoration of commands. |
80 |
if decorate and k_unsquished in builtin_command_names(): |
81 |
return _builtin_commands()[k_unsquished] |
|
82 |
elif decorate: |
|
83 |
result = plugin_cmds[k_unsquished] |
|
84 |
plugin_cmds[k_unsquished] = cmd |
|
85 |
return result |
|
731
by Martin Pool
- merge plugin patch from john |
86 |
else: |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
87 |
trace.log_error('Two plugins defined the same command: %r' % k) |
88 |
trace.log_error('Not loading the one in %r' % sys.modules[cmd.__module__]) |
|
731
by Martin Pool
- merge plugin patch from john |
89 |
|
90 |
||
350
by Martin Pool
- refactor command aliases into command classes |
91 |
def _squish_command_name(cmd): |
92 |
return 'cmd_' + cmd.replace('-', '_') |
|
93 |
||
94 |
||
95 |
def _unsquish_command_name(cmd): |
|
96 |
assert cmd.startswith("cmd_") |
|
97 |
return cmd[4:].replace('_','-') |
|
98 |
||
914
by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch |
99 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
100 |
def _builtin_commands(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
101 |
import bzrlib.builtins |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
102 |
r = {} |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
103 |
builtins = bzrlib.builtins.__dict__ |
104 |
for name in builtins: |
|
105 |
if name.startswith("cmd_"): |
|
1616.1.6
by Martin Pool
doc |
106 |
real_name = _unsquish_command_name(name) |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
107 |
r[real_name] = builtins[name] |
108 |
return r |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
109 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
110 |
|
111 |
def builtin_command_names(): |
|
112 |
"""Return list of builtin command names."""
|
|
113 |
return _builtin_commands().keys() |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
114 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
115 |
|
116 |
def plugin_command_names(): |
|
117 |
return plugin_cmds.keys() |
|
118 |
||
119 |
||
120 |
def _get_cmd_dict(plugins_override=True): |
|
121 |
"""Return name->class mapping for all commands."""
|
|
122 |
d = _builtin_commands() |
|
731
by Martin Pool
- merge plugin patch from john |
123 |
if plugins_override: |
124 |
d.update(plugin_cmds) |
|
641
by Martin Pool
- improved external-command patch from john |
125 |
return d |
731
by Martin Pool
- merge plugin patch from john |
126 |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
127 |
|
731
by Martin Pool
- merge plugin patch from john |
128 |
def get_all_cmds(plugins_override=True): |
641
by Martin Pool
- improved external-command patch from john |
129 |
"""Return canonical name and class for all registered commands."""
|
731
by Martin Pool
- merge plugin patch from john |
130 |
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems(): |
641
by Martin Pool
- improved external-command patch from john |
131 |
yield k,v |
132 |
||
133 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
134 |
def get_cmd_object(cmd_name, plugins_override=True): |
350
by Martin Pool
- refactor command aliases into command classes |
135 |
"""Return the canonical name and command class for a command.
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
136 |
|
137 |
plugins_override
|
|
138 |
If true, plugin commands can override builtins.
|
|
350
by Martin Pool
- refactor command aliases into command classes |
139 |
"""
|
1163
by Martin Pool
- split ExternalCommand class into its own file |
140 |
from bzrlib.externalcommand import ExternalCommand |
141 |
||
1948.1.10
by John Arbash Meinel
Simplify changes to command.py |
142 |
# We want only 'ascii' command names, but the user may have typed
|
143 |
# in a Unicode name. In that case, they should just get a
|
|
144 |
# 'command not found' error later.
|
|
145 |
# In the future, we may actually support Unicode command names.
|
|
350
by Martin Pool
- refactor command aliases into command classes |
146 |
|
147 |
# first look up this command under the specified name
|
|
731
by Martin Pool
- merge plugin patch from john |
148 |
cmds = _get_cmd_dict(plugins_override=plugins_override) |
272
by Martin Pool
- Add command aliases |
149 |
try: |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
150 |
return cmds[cmd_name]() |
272
by Martin Pool
- Add command aliases |
151 |
except KeyError: |
350
by Martin Pool
- refactor command aliases into command classes |
152 |
pass
|
153 |
||
154 |
# look for any command which claims this as an alias
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
155 |
for real_cmd_name, cmd_class in cmds.iteritems(): |
156 |
if cmd_name in cmd_class.aliases: |
|
157 |
return cmd_class() |
|
158 |
||
159 |
cmd_obj = ExternalCommand.find_command(cmd_name) |
|
160 |
if cmd_obj: |
|
161 |
return cmd_obj |
|
162 |
||
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
163 |
raise errors.BzrCommandError('unknown command "%s"' % cmd_name) |
272
by Martin Pool
- Add command aliases |
164 |
|
329
by Martin Pool
- refactor command functions into command classes |
165 |
|
558
by Martin Pool
- All top-level classes inherit from object |
166 |
class Command(object): |
329
by Martin Pool
- refactor command functions into command classes |
167 |
"""Base class for commands.
|
168 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
169 |
Commands are the heart of the command-line bzr interface.
|
170 |
||
171 |
The command object mostly handles the mapping of command-line
|
|
172 |
parameters into one or more bzrlib operations, and of the results
|
|
173 |
into textual output.
|
|
174 |
||
175 |
Commands normally don't have any state. All their arguments are
|
|
176 |
passed in to the run method. (Subclasses may take a different
|
|
177 |
policy if the behaviour of the instance needs to depend on e.g. a
|
|
178 |
shell plugin and not just its Python class.)
|
|
179 |
||
329
by Martin Pool
- refactor command functions into command classes |
180 |
The docstring for an actual command should give a single-line
|
181 |
summary, then a complete description of the command. A grammar
|
|
182 |
description will be inserted.
|
|
183 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
184 |
aliases
|
185 |
Other accepted names for this command.
|
|
186 |
||
329
by Martin Pool
- refactor command functions into command classes |
187 |
takes_args
|
188 |
List of argument forms, marked with whether they are optional,
|
|
189 |
repeated, etc.
|
|
190 |
||
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
191 |
Examples:
|
192 |
||
193 |
['to_location', 'from_branch?', 'file*']
|
|
194 |
||
195 |
'to_location' is required
|
|
196 |
'from_branch' is optional
|
|
197 |
'file' can be specified 0 or more times
|
|
1185.37.4
by Jamie Wilkinson
add some examples to the documentation for Command.takes_args |
198 |
|
329
by Martin Pool
- refactor command functions into command classes |
199 |
takes_options
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
200 |
List of options that may be given for this command. These can
|
201 |
be either strings, referring to globally-defined options,
|
|
202 |
or option objects. Retrieve through options().
|
|
329
by Martin Pool
- refactor command functions into command classes |
203 |
|
204 |
hidden
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
205 |
If true, this command isn't advertised. This is typically
|
206 |
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() |
207 |
|
208 |
encoding_type
|
|
209 |
Command objects will get a 'outf' attribute, which has been
|
|
210 |
setup to properly handle encoding of unicode strings.
|
|
211 |
encoding_type determines what will happen when characters cannot
|
|
212 |
be encoded
|
|
213 |
strict - abort if we cannot decode
|
|
214 |
replace - put in a bogus character (typically '?')
|
|
215 |
exact - do not encode sys.stdout
|
|
216 |
||
2178.4.5
by Alexander Belchenko
Spell-checking (thanks to Aaron) |
217 |
NOTE: by default on Windows, sys.stdout is opened as a text
|
218 |
stream, therefore LF line-endings are converted to CRLF.
|
|
219 |
When a command uses encoding_type = 'exact', then
|
|
220 |
sys.stdout is forced to be a binary stream, and line-endings
|
|
2178.4.4
by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32 |
221 |
will not mangled.
|
2178.4.5
by Alexander Belchenko
Spell-checking (thanks to Aaron) |
222 |
|
329
by Martin Pool
- refactor command functions into command classes |
223 |
"""
|
224 |
aliases = [] |
|
225 |
takes_args = [] |
|
226 |
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() |
227 |
encoding_type = 'strict' |
329
by Martin Pool
- refactor command functions into command classes |
228 |
|
229 |
hidden = False |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
230 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
231 |
def __init__(self): |
232 |
"""Construct an instance of this command."""
|
|
973
by Martin Pool
- various refactorings of command interpreter |
233 |
if self.__doc__ == Command.__doc__: |
234 |
warn("No help message set for %r" % self) |
|
329
by Martin Pool
- refactor command functions into command classes |
235 |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
236 |
def options(self): |
237 |
"""Return dict of valid options for this command.
|
|
238 |
||
239 |
Maps from long option name to option object."""
|
|
240 |
r = dict() |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
241 |
r['help'] = option.Option.OPTIONS['help'] |
1185.16.43
by Martin Pool
- clean up handling of option objects |
242 |
for o in self.takes_options: |
1857.1.8
by Aaron Bentley
Group enum options and add enum options to init and init-repo |
243 |
if isinstance(o, basestring): |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
244 |
o = option.Option.OPTIONS[o] |
1185.16.43
by Martin Pool
- clean up handling of option objects |
245 |
r[o.name] = o |
246 |
return r |
|
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
247 |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
248 |
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() |
249 |
"""Return a file linked to stdout, which has proper encoding."""
|
250 |
assert self.encoding_type in ['strict', 'exact', 'replace'] |
|
251 |
||
252 |
# Originally I was using self.stdout, but that looks
|
|
253 |
# *way* too much like sys.stdout
|
|
254 |
if self.encoding_type == 'exact': |
|
2178.4.4
by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32 |
255 |
# force sys.stdout to be binary stream on win32
|
256 |
if sys.platform == 'win32': |
|
257 |
fileno = getattr(sys.stdout, 'fileno', None) |
|
258 |
if fileno: |
|
259 |
import msvcrt |
|
260 |
msvcrt.setmode(fileno(), os.O_BINARY) |
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
261 |
self.outf = sys.stdout |
262 |
return
|
|
263 |
||
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
264 |
output_encoding = osutils.get_terminal_encoding() |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
265 |
|
266 |
# use 'replace' so that we don't abort if trying to write out
|
|
267 |
# in e.g. the default C locale.
|
|
268 |
self.outf = codecs.getwriter(output_encoding)(sys.stdout, errors=self.encoding_type) |
|
1711.2.40
by John Arbash Meinel
codecs.getwriter() doesn't set '.encoding' properly, so do the work for it. |
269 |
# For whatever reason codecs.getwriter() does not advertise its encoding
|
270 |
# it just returns the encoding of the wrapped file, which is completely
|
|
271 |
# bogus. So set the attribute, so we can find the correct encoding later.
|
|
272 |
self.outf.encoding = output_encoding |
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
273 |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
274 |
@deprecated_method(zero_eight) |
275 |
def run_argv(self, argv): |
|
276 |
"""Parse command line and run.
|
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
277 |
|
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
278 |
See run_argv_aliases for the 0.8 and beyond api.
|
279 |
"""
|
|
280 |
return self.run_argv_aliases(argv) |
|
281 |
||
282 |
def run_argv_aliases(self, argv, alias_argv=None): |
|
283 |
"""Parse the command line and run with extra aliases in alias_argv."""
|
|
1857.1.21
by Aaron Bentley
Fix bug from cmd_shelf passing Non to run_argv_aliases |
284 |
if argv is None: |
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
285 |
warn("Passing None for [] is deprecated from bzrlib 0.10", |
1857.1.21
by Aaron Bentley
Fix bug from cmd_shelf passing Non to run_argv_aliases |
286 |
DeprecationWarning, stacklevel=2) |
287 |
argv = [] |
|
1553.6.8
by Erik Bågfors
support for overrides |
288 |
args, opts = parse_args(self, argv, alias_argv) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
289 |
if 'help' in opts: # e.g. bzr add --help |
290 |
from bzrlib.help import help_on_command |
|
291 |
help_on_command(self.name()) |
|
292 |
return 0 |
|
293 |
# mix arguments and options into one dictionary
|
|
294 |
cmdargs = _match_argform(self.name(), self.takes_args, args) |
|
295 |
cmdopts = {} |
|
296 |
for k, v in opts.items(): |
|
297 |
cmdopts[k.replace('-', '_')] = v |
|
298 |
||
299 |
all_cmd_args = cmdargs.copy() |
|
300 |
all_cmd_args.update(cmdopts) |
|
301 |
||
1685.1.80
by Wouter van Heyst
more code cleanup |
302 |
self._setup_outf() |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
303 |
|
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
304 |
return self.run(**all_cmd_args) |
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
305 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
306 |
def run(self): |
307 |
"""Actually run the command.
|
|
329
by Martin Pool
- refactor command functions into command classes |
308 |
|
309 |
This is invoked with the options and arguments bound to
|
|
310 |
keyword parameters.
|
|
311 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
312 |
Return 0 or None if the command was successful, or a non-zero
|
313 |
shell error code if not. It's OK for this method to allow
|
|
314 |
an exception to raise up.
|
|
329
by Martin Pool
- refactor command functions into command classes |
315 |
"""
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
316 |
raise NotImplementedError('no implementation of command %r' |
1610.1.3
by Martin Pool
Better error message for Command.run() not implemented |
317 |
% self.name()) |
329
by Martin Pool
- refactor command functions into command classes |
318 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
319 |
def help(self): |
320 |
"""Return help message for this class."""
|
|
1610.1.2
by Martin Pool
Move rarely-used import into Command.help() |
321 |
from inspect import getdoc |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
322 |
if self.__doc__ is Command.__doc__: |
323 |
return None |
|
324 |
return getdoc(self) |
|
325 |
||
326 |
def name(self): |
|
327 |
return _unsquish_command_name(self.__class__.__name__) |
|
328 |
||
1733.2.5
by Michael Ellerman
Show which plugin (if any) provides a command. |
329 |
def plugin_name(self): |
330 |
"""Get the name of the plugin that provides this command.
|
|
331 |
||
332 |
:return: The name of the plugin or None if the command is builtin.
|
|
333 |
"""
|
|
334 |
mod_parts = self.__module__.split('.') |
|
335 |
if len(mod_parts) >= 3 and mod_parts[1] == 'plugins': |
|
336 |
return mod_parts[2] |
|
337 |
else: |
|
338 |
return None |
|
339 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
340 |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
341 |
# Technically, this function hasn't been use in a *really* long time
|
342 |
# but we are only deprecating it now.
|
|
343 |
@deprecated_function(zero_eleven) |
|
493
by Martin Pool
- Merge aaron's merge command |
344 |
def parse_spec(spec): |
622
by Martin Pool
Updated merge patch from Aaron |
345 |
"""
|
346 |
>>> parse_spec(None)
|
|
347 |
[None, None]
|
|
348 |
>>> parse_spec("./")
|
|
349 |
['./', None]
|
|
350 |
>>> parse_spec("../@")
|
|
351 |
['..', -1]
|
|
352 |
>>> parse_spec("../f/@35")
|
|
353 |
['../f', 35]
|
|
897
by Martin Pool
- merge john's revision-naming code |
354 |
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
|
355 |
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
|
|
622
by Martin Pool
Updated merge patch from Aaron |
356 |
"""
|
357 |
if spec is None: |
|
358 |
return [None, None] |
|
493
by Martin Pool
- Merge aaron's merge command |
359 |
if '/@' in spec: |
360 |
parsed = spec.split('/@') |
|
361 |
assert len(parsed) == 2 |
|
362 |
if parsed[1] == "": |
|
363 |
parsed[1] = -1 |
|
364 |
else: |
|
897
by Martin Pool
- merge john's revision-naming code |
365 |
try: |
366 |
parsed[1] = int(parsed[1]) |
|
367 |
except ValueError: |
|
368 |
pass # We can allow stuff like ./@revid:blahblahblah |
|
369 |
else: |
|
370 |
assert parsed[1] >=0 |
|
493
by Martin Pool
- Merge aaron's merge command |
371 |
else: |
372 |
parsed = [spec, None] |
|
373 |
return parsed |
|
374 |
||
1553.6.11
by Erik Bågfors
small bugfixes, all tests pass now |
375 |
def parse_args(command, argv, alias_argv=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
376 |
"""Parse command line.
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
377 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
378 |
Arguments and options are parsed at this level before being passed
|
379 |
down to specific command handlers. This routine knows, from a
|
|
380 |
lookup table, something about the available options, what optargs
|
|
381 |
they take, and which commands will accept them.
|
|
382 |
"""
|
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
383 |
# TODO: make it a method of the Command?
|
1857.1.3
by Aaron Bentley
Make option adding depend on Option type |
384 |
parser = option.get_optparser(command.options()) |
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
385 |
if alias_argv is not None: |
386 |
args = alias_argv + argv |
|
387 |
else: |
|
388 |
args = argv |
|
683
by Martin Pool
- short option stacking patch from John A Meinel |
389 |
|
1857.1.1
by Aaron Bentley
Use optparse for parsing options |
390 |
options, args = parser.parse_args(args) |
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
391 |
opts = dict([(k, v) for k, v in options.__dict__.iteritems() if |
1857.1.3
by Aaron Bentley
Make option adding depend on Option type |
392 |
v is not option.OptionParser.DEFAULT_VALUE]) |
1
by mbp at sourcefrog
import from baz patch-364 |
393 |
return args, opts |
394 |
||
395 |
||
329
by Martin Pool
- refactor command functions into command classes |
396 |
def _match_argform(cmd, takes_args, args): |
1
by mbp at sourcefrog
import from baz patch-364 |
397 |
argdict = {} |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
398 |
|
329
by Martin Pool
- refactor command functions into command classes |
399 |
# step through args and takes_args, allowing appropriate 0-many matches
|
400 |
for ap in takes_args: |
|
1
by mbp at sourcefrog
import from baz patch-364 |
401 |
argname = ap[:-1] |
402 |
if ap[-1] == '?': |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
403 |
if args: |
404 |
argdict[argname] = args.pop(0) |
|
196
by mbp at sourcefrog
selected-file diff |
405 |
elif ap[-1] == '*': # all remaining arguments |
406 |
if args: |
|
407 |
argdict[argname + '_list'] = args[:] |
|
408 |
args = [] |
|
409 |
else: |
|
410 |
argdict[argname + '_list'] = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
411 |
elif ap[-1] == '+': |
412 |
if not args: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
413 |
raise errors.BzrCommandError("command %r needs one or more %s" |
414 |
% (cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
415 |
else: |
416 |
argdict[argname + '_list'] = args[:] |
|
417 |
args = [] |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
418 |
elif ap[-1] == '$': # all but one |
419 |
if len(args) < 2: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
420 |
raise errors.BzrCommandError("command %r needs one or more %s" |
421 |
% (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 |
422 |
argdict[argname + '_list'] = args[:-1] |
1740.5.6
by Martin Pool
Clean up many exception classes. |
423 |
args[:-1] = [] |
1
by mbp at sourcefrog
import from baz patch-364 |
424 |
else: |
425 |
# just a plain arg
|
|
426 |
argname = ap |
|
427 |
if not args: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
428 |
raise errors.BzrCommandError("command %r requires argument %s" |
429 |
% (cmd, argname.upper())) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
430 |
else: |
431 |
argdict[argname] = args.pop(0) |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
432 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
433 |
if args: |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
434 |
raise errors.BzrCommandError("extra argument to command %s: %s" |
435 |
% (cmd, args[0])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
436 |
|
437 |
return argdict |
|
438 |
||
439 |
||
440 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
441 |
def apply_profiled(the_callable, *args, **kwargs): |
442 |
import hotshot |
|
443 |
import tempfile |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
444 |
import hotshot.stats |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
445 |
pffileno, pfname = tempfile.mkstemp() |
446 |
try: |
|
447 |
prof = hotshot.Profile(pfname) |
|
448 |
try: |
|
449 |
ret = prof.runcall(the_callable, *args, **kwargs) or 0 |
|
450 |
finally: |
|
451 |
prof.close() |
|
452 |
stats = hotshot.stats.load(pfname) |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
453 |
stats.strip_dirs() |
454 |
stats.sort_stats('cum') # 'time' |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
455 |
## XXX: Might like to write to stderr or the trace file instead but
|
456 |
## print_stats seems hardcoded to stdout
|
|
457 |
stats.print_stats(20) |
|
458 |
return ret |
|
459 |
finally: |
|
460 |
os.close(pffileno) |
|
461 |
os.remove(pfname) |
|
462 |
||
463 |
||
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) |
464 |
def apply_lsprofiled(filename, the_callable, *args, **kwargs): |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
465 |
from bzrlib.lsprof import profile |
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) |
466 |
import cPickle |
467 |
ret, stats = profile(the_callable, *args, **kwargs) |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
468 |
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) |
469 |
if filename is None: |
470 |
stats.pprint() |
|
471 |
else: |
|
472 |
stats.freeze() |
|
473 |
cPickle.dump(stats, open(filename, 'w'), 2) |
|
474 |
print 'Profile data written to %r.' % filename |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
475 |
return ret |
476 |
||
1553.6.9
by Erik Bågfors
PEP8-ify |
477 |
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
478 |
def get_alias(cmd, config=None): |
479 |
"""Return an expanded alias, or None if no alias exists.
|
|
480 |
||
481 |
cmd
|
|
482 |
Command to be checked for an alias.
|
|
483 |
config
|
|
484 |
Used to specify an alternative config to use,
|
|
2155.2.3
by Marius Kruger
* commands.py |
485 |
which is especially useful for testing.
|
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
486 |
If it is unspecified, the global config will be used.
|
487 |
"""
|
|
488 |
if config is None: |
|
489 |
import bzrlib.config |
|
490 |
config = bzrlib.config.GlobalConfig() |
|
491 |
alias = config.get_alias(cmd) |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
492 |
if (alias): |
2155.2.1
by Marius Kruger
* Get command aliases to respect quoted arguments. |
493 |
import shlex |
494 |
return [a.decode('utf-8') for a in shlex.split(alias.encode('utf-8'))] |
|
1553.6.8
by Erik Bågfors
support for overrides |
495 |
return None |
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
496 |
|
1553.6.9
by Erik Bågfors
PEP8-ify |
497 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
498 |
def run_bzr(argv): |
499 |
"""Execute a command.
|
|
500 |
||
501 |
This is similar to main(), but without all the trappings for
|
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
502 |
logging and error handling.
|
503 |
|
|
973
by Martin Pool
- various refactorings of command interpreter |
504 |
argv
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
505 |
The command-line arguments, without the program name from argv[0]
|
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
506 |
These should already be decoded. All library/test code calling
|
507 |
run_bzr should be passing valid strings (don't need decoding).
|
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
508 |
|
973
by Martin Pool
- various refactorings of command interpreter |
509 |
Returns a command status or raises an exception.
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
510 |
|
511 |
Special master options: these must come before the command because
|
|
512 |
they control how the command is interpreted.
|
|
513 |
||
514 |
--no-plugins
|
|
515 |
Do not load plugin modules at all
|
|
516 |
||
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
517 |
--no-aliases
|
518 |
Do not allow aliases
|
|
519 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
520 |
--builtin
|
521 |
Only use builtin commands. (Plugins are still allowed to change
|
|
522 |
other behaviour.)
|
|
523 |
||
524 |
--profile
|
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
525 |
Run under the Python hotshot profiler.
|
526 |
||
527 |
--lsprof
|
|
528 |
Run under the Python lsprof profiler.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
529 |
"""
|
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
530 |
argv = list(argv) |
2127.5.1
by mbp at sourcefrog
record command-line arguments in .bzr.log, drop some mutter statements |
531 |
trace.mutter("bzr arguments: %r", argv) |
907.1.21
by John Arbash Meinel
Adding http transport as a valid transport protocol. |
532 |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
533 |
opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \ |
534 |
opt_no_aliases = False |
|
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) |
535 |
opt_lsprof_file = None |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
536 |
|
537 |
# --no-plugins is handled specially at a very early stage. We need
|
|
538 |
# to load plugins before doing other command parsing so that they
|
|
539 |
# can override commands, but this needs to happen first.
|
|
540 |
||
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) |
541 |
argv_copy = [] |
542 |
i = 0 |
|
543 |
while i < len(argv): |
|
544 |
a = argv[i] |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
545 |
if a == '--profile': |
546 |
opt_profile = True |
|
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
547 |
elif a == '--lsprof': |
548 |
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) |
549 |
elif a == '--lsprof-file': |
1706.2.6
by Robey Pointer
when giving --lsprof-file, assume --lsprof |
550 |
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) |
551 |
opt_lsprof_file = argv[i + 1] |
552 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
553 |
elif a == '--no-plugins': |
554 |
opt_no_plugins = True |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
555 |
elif a == '--no-aliases': |
556 |
opt_no_aliases = True |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
557 |
elif a == '--builtin': |
558 |
opt_builtin = True |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
559 |
elif a in ('--quiet', '-q'): |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
560 |
trace.be_quiet() |
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
561 |
elif a.startswith('-D'): |
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
562 |
debug.debug_flags.add(a[2:]) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
563 |
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) |
564 |
argv_copy.append(a) |
565 |
i += 1 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
566 |
|
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) |
567 |
argv = argv_copy |
1616.1.15
by Martin Pool
Handle 'bzr ?', etc. |
568 |
if (not argv): |
569 |
from bzrlib.builtins import cmd_help |
|
1558.14.2
by Aaron Bentley
Removed deprecation warning when bzr invoked with no arguments |
570 |
cmd_help().run_argv_aliases([]) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
571 |
return 0 |
572 |
||
573 |
if argv[0] == '--version': |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
574 |
from bzrlib.version import show_version |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
575 |
show_version() |
576 |
return 0 |
|
2172.1.1
by Aaron Bentley
Merge shell-like quote handling for aliases |
577 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
578 |
if not opt_no_plugins: |
973
by Martin Pool
- various refactorings of command interpreter |
579 |
from bzrlib.plugin import load_plugins |
580 |
load_plugins() |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
581 |
else: |
582 |
from bzrlib.plugin import disable_plugins |
|
583 |
disable_plugins() |
|
973
by Martin Pool
- various refactorings of command interpreter |
584 |
|
1553.6.17
by Erik Bågfors
fix for broken --no-aliases |
585 |
alias_argv = None |
586 |
||
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
587 |
if not opt_no_aliases: |
1553.6.8
by Erik Bågfors
support for overrides |
588 |
alias_argv = get_alias(argv[0]) |
589 |
if alias_argv: |
|
590 |
alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv] |
|
591 |
argv[0] = alias_argv.pop(0) |
|
1553.6.1
by Erik Bågfors
support for aliases in bazaar.conf |
592 |
|
1948.1.1
by John Arbash Meinel
Raise a reasonable error when a command is non-ascii |
593 |
cmd = argv.pop(0) |
1948.1.10
by John Arbash Meinel
Simplify changes to command.py |
594 |
# We want only 'ascii' command names, but the user may have typed
|
595 |
# in a Unicode name. In that case, they should just get a
|
|
596 |
# 'command not found' error later.
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
597 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
598 |
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin) |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
599 |
if not getattr(cmd_obj.run_argv, 'is_deprecated', False): |
600 |
run = cmd_obj.run_argv |
|
601 |
run_argv = [argv] |
|
602 |
else: |
|
603 |
run = cmd_obj.run_argv_aliases |
|
604 |
run_argv = [argv, alias_argv] |
|
1534.7.154
by Aaron Bentley
Removed changes from bzr.ab 1529..1536 |
605 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
606 |
try: |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
607 |
if opt_lsprof: |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
608 |
ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv) |
1185.33.85
by Martin Pool
New --lsprof option from Denys Duchier |
609 |
elif opt_profile: |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
610 |
ret = apply_profiled(run, *run_argv) |
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
611 |
else: |
1581.1.1
by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv. |
612 |
ret = run(*run_argv) |
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
613 |
return ret or 0 |
614 |
finally: |
|
615 |
# reset, in case we may do other commands later within the same process
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
616 |
trace.be_quiet(False) |
267
by Martin Pool
- better reporting of errors |
617 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
618 |
def display_command(func): |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
619 |
"""Decorator that suppresses pipe/interrupt errors."""
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
620 |
def ignore_pipe(*args, **kwargs): |
621 |
try: |
|
1185.35.22
by Aaron Bentley
Handled more pipe errors for display commands. |
622 |
result = func(*args, **kwargs) |
623 |
sys.stdout.flush() |
|
624 |
return result |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
625 |
except IOError, e: |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
626 |
if getattr(e, 'errno', None) is None: |
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
627 |
raise
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
628 |
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 |
629 |
# 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 |
630 |
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 |
631 |
raise
|
1185.33.18
by Martin Pool
[patch] handle bad IOError subclass raised by urlopen |
632 |
pass
|
1185.12.69
by Aaron Bentley
Ignored ^C in display commands |
633 |
except KeyboardInterrupt: |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
634 |
pass
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
635 |
return ignore_pipe |
267
by Martin Pool
- better reporting of errors |
636 |
|
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
637 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
638 |
def main(argv): |
1104
by Martin Pool
- Add a simple UIFactory |
639 |
import bzrlib.ui |
1185.49.21
by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms. |
640 |
from bzrlib.ui.text import TextUIFactory |
641 |
bzrlib.ui.ui_factory = TextUIFactory() |
|
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
642 |
argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]] |
643 |
ret = run_bzr_catch_errors(argv) |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
644 |
trace.mutter("return code %d", ret) |
1185.43.6
by Martin Pool
Enable logging early enough to save argv |
645 |
return ret |
1185.3.19
by Martin Pool
- split out commandline error reporting for ease of testing |
646 |
|
647 |
||
648 |
def run_bzr_catch_errors(argv): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
649 |
try: |
1711.4.31
by John Arbash Meinel
Catch proper error instead of EPIPE on win32, also don't double flush |
650 |
return run_bzr(argv) |
651 |
# do this here inside the exception wrappers to catch EPIPE
|
|
652 |
sys.stdout.flush() |
|
2027.2.3
by Marien Zwart
Fix another python 2.5 issue. |
653 |
except (KeyboardInterrupt, Exception), e: |
1185.33.19
by Martin Pool
Run postmortem debugger if BZR_PDB is set |
654 |
# used to handle AssertionError and KeyboardInterrupt
|
655 |
# specially here, but hopefully they're handled ok by the logger now
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
656 |
trace.report_exception(sys.exc_info(), sys.stderr) |
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
657 |
if os.environ.get('BZR_PDB'): |
658 |
print '**** entering debugger' |
|
659 |
import pdb |
|
660 |
pdb.post_mortem(sys.exc_traceback) |
|
661 |
return 3 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
662 |
|
663 |
if __name__ == '__main__': |
|
664 |
sys.exit(main(sys.argv)) |