329
by Martin Pool
- refactor command functions into command classes |
1 |
# Copyright (C) 2004, 2005 by Canonical Ltd
|
1
by mbp at sourcefrog
import from baz patch-364 |
2 |
|
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.
|
|
7 |
||
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.
|
|
12 |
||
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: Help messages for options.
|
22 |
||
23 |
# TODO: Define arguments by objects, rather than just using names.
|
|
24 |
# Those objects can specify the expected type of the argument, which
|
|
25 |
# would help with validation and shell completion.
|
|
26 |
||
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
27 |
# TODO: "--profile=cum", to change sort order. Is there any value in leaving
|
28 |
# the profile output behind so it can be interactively examined?
|
|
29 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
30 |
import sys |
31 |
import os |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
32 |
from warnings import warn |
33 |
from inspect import getdoc |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
34 |
import errno |
1
by mbp at sourcefrog
import from baz patch-364 |
35 |
|
36 |
import bzrlib |
|
1112
by Martin Pool
- disable standard logging to .bzr.log and stderr while running |
37 |
import bzrlib.trace |
897
by Martin Pool
- merge john's revision-naming code |
38 |
from bzrlib.trace import mutter, note, log_error, warning |
974.1.82
by Aaron Bentley
Handled NotBranchError like a CommandError in main() |
39 |
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
40 |
from bzrlib.revisionspec import RevisionSpec |
800
by Martin Pool
Merge John's import-speedup branch: |
41 |
from bzrlib import BZRDIR |
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
42 |
from bzrlib.option import Option |
1
by mbp at sourcefrog
import from baz patch-364 |
43 |
|
731
by Martin Pool
- merge plugin patch from john |
44 |
plugin_cmds = {} |
45 |
||
46 |
||
759
by Martin Pool
- fix up register_command() names |
47 |
def register_command(cmd): |
731
by Martin Pool
- merge plugin patch from john |
48 |
"Utility function to help register a command"
|
49 |
global plugin_cmds |
|
50 |
k = cmd.__name__ |
|
51 |
if k.startswith("cmd_"): |
|
52 |
k_unsquished = _unsquish_command_name(k) |
|
53 |
else: |
|
54 |
k_unsquished = k |
|
55 |
if not plugin_cmds.has_key(k_unsquished): |
|
56 |
plugin_cmds[k_unsquished] = cmd |
|
1137
by Martin Pool
- additional trace messages for plugins |
57 |
mutter('registered plugin command %s', k_unsquished) |
731
by Martin Pool
- merge plugin patch from john |
58 |
else: |
59 |
log_error('Two plugins defined the same command: %r' % k) |
|
60 |
log_error('Not loading the one in %r' % sys.modules[cmd.__module__]) |
|
61 |
||
62 |
||
350
by Martin Pool
- refactor command aliases into command classes |
63 |
def _squish_command_name(cmd): |
64 |
return 'cmd_' + cmd.replace('-', '_') |
|
65 |
||
66 |
||
67 |
def _unsquish_command_name(cmd): |
|
68 |
assert cmd.startswith("cmd_") |
|
69 |
return cmd[4:].replace('_','-') |
|
70 |
||
914
by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch |
71 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
72 |
def _builtin_commands(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
73 |
import bzrlib.builtins |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
74 |
r = {} |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
75 |
builtins = bzrlib.builtins.__dict__ |
76 |
for name in builtins: |
|
77 |
if name.startswith("cmd_"): |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
78 |
real_name = _unsquish_command_name(name) |
79 |
r[real_name] = builtins[name] |
|
80 |
return r |
|
81 |
||
82 |
||
83 |
||
84 |
def builtin_command_names(): |
|
85 |
"""Return list of builtin command names."""
|
|
86 |
return _builtin_commands().keys() |
|
87 |
||
88 |
||
89 |
def plugin_command_names(): |
|
90 |
return plugin_cmds.keys() |
|
91 |
||
92 |
||
93 |
def _get_cmd_dict(plugins_override=True): |
|
94 |
"""Return name->class mapping for all commands."""
|
|
95 |
d = _builtin_commands() |
|
731
by Martin Pool
- merge plugin patch from john |
96 |
if plugins_override: |
97 |
d.update(plugin_cmds) |
|
641
by Martin Pool
- improved external-command patch from john |
98 |
return d |
731
by Martin Pool
- merge plugin patch from john |
99 |
|
641
by Martin Pool
- improved external-command patch from john |
100 |
|
731
by Martin Pool
- merge plugin patch from john |
101 |
def get_all_cmds(plugins_override=True): |
641
by Martin Pool
- improved external-command patch from john |
102 |
"""Return canonical name and class for all registered commands."""
|
731
by Martin Pool
- merge plugin patch from john |
103 |
for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems(): |
641
by Martin Pool
- improved external-command patch from john |
104 |
yield k,v |
105 |
||
106 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
107 |
def get_cmd_object(cmd_name, plugins_override=True): |
350
by Martin Pool
- refactor command aliases into command classes |
108 |
"""Return the canonical name and command class for a command.
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
109 |
|
110 |
plugins_override
|
|
111 |
If true, plugin commands can override builtins.
|
|
350
by Martin Pool
- refactor command aliases into command classes |
112 |
"""
|
1163
by Martin Pool
- split ExternalCommand class into its own file |
113 |
from bzrlib.externalcommand import ExternalCommand |
114 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
115 |
cmd_name = str(cmd_name) # not unicode |
350
by Martin Pool
- refactor command aliases into command classes |
116 |
|
117 |
# first look up this command under the specified name
|
|
731
by Martin Pool
- merge plugin patch from john |
118 |
cmds = _get_cmd_dict(plugins_override=plugins_override) |
272
by Martin Pool
- Add command aliases |
119 |
try: |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
120 |
return cmds[cmd_name]() |
272
by Martin Pool
- Add command aliases |
121 |
except KeyError: |
350
by Martin Pool
- refactor command aliases into command classes |
122 |
pass
|
123 |
||
124 |
# look for any command which claims this as an alias
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
125 |
for real_cmd_name, cmd_class in cmds.iteritems(): |
126 |
if cmd_name in cmd_class.aliases: |
|
127 |
return cmd_class() |
|
128 |
||
129 |
cmd_obj = ExternalCommand.find_command(cmd_name) |
|
130 |
if cmd_obj: |
|
131 |
return cmd_obj |
|
132 |
||
133 |
raise BzrCommandError("unknown command %r" % cmd_name) |
|
272
by Martin Pool
- Add command aliases |
134 |
|
329
by Martin Pool
- refactor command functions into command classes |
135 |
|
558
by Martin Pool
- All top-level classes inherit from object |
136 |
class Command(object): |
329
by Martin Pool
- refactor command functions into command classes |
137 |
"""Base class for commands.
|
138 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
139 |
Commands are the heart of the command-line bzr interface.
|
140 |
||
141 |
The command object mostly handles the mapping of command-line
|
|
142 |
parameters into one or more bzrlib operations, and of the results
|
|
143 |
into textual output.
|
|
144 |
||
145 |
Commands normally don't have any state. All their arguments are
|
|
146 |
passed in to the run method. (Subclasses may take a different
|
|
147 |
policy if the behaviour of the instance needs to depend on e.g. a
|
|
148 |
shell plugin and not just its Python class.)
|
|
149 |
||
329
by Martin Pool
- refactor command functions into command classes |
150 |
The docstring for an actual command should give a single-line
|
151 |
summary, then a complete description of the command. A grammar
|
|
152 |
description will be inserted.
|
|
153 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
154 |
aliases
|
155 |
Other accepted names for this command.
|
|
156 |
||
329
by Martin Pool
- refactor command functions into command classes |
157 |
takes_args
|
158 |
List of argument forms, marked with whether they are optional,
|
|
159 |
repeated, etc.
|
|
160 |
||
161 |
takes_options
|
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
162 |
List of options that may be given for this command. These can
|
163 |
be either strings, referring to globally-defined options,
|
|
164 |
or option objects. Retrieve through options().
|
|
329
by Martin Pool
- refactor command functions into command classes |
165 |
|
166 |
hidden
|
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
167 |
If true, this command isn't advertised. This is typically
|
168 |
for commands intended for expert users.
|
|
329
by Martin Pool
- refactor command functions into command classes |
169 |
"""
|
170 |
aliases = [] |
|
171 |
takes_args = [] |
|
172 |
takes_options = [] |
|
173 |
||
174 |
hidden = False |
|
175 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
176 |
def __init__(self): |
177 |
"""Construct an instance of this command."""
|
|
973
by Martin Pool
- various refactorings of command interpreter |
178 |
if self.__doc__ == Command.__doc__: |
179 |
warn("No help message set for %r" % self) |
|
329
by Martin Pool
- refactor command functions into command classes |
180 |
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
181 |
def options(self): |
182 |
"""Return dict of valid options for this command.
|
|
183 |
||
184 |
Maps from long option name to option object."""
|
|
185 |
r = dict() |
|
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
186 |
r['help'] = Option.OPTIONS['help'] |
1185.16.43
by Martin Pool
- clean up handling of option objects |
187 |
for o in self.takes_options: |
188 |
if not isinstance(o, Option): |
|
189 |
o = Option.OPTIONS[o] |
|
190 |
r[o.name] = o |
|
191 |
return r |
|
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
192 |
|
193 |
def run_argv(self, argv): |
|
194 |
"""Parse command line and run."""
|
|
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
195 |
args, opts = parse_args(self, argv) |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
196 |
if 'help' in opts: # e.g. bzr add --help |
197 |
from bzrlib.help import help_on_command |
|
198 |
help_on_command(self.name()) |
|
199 |
return 0 |
|
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
200 |
# XXX: This should be handled by the parser
|
1185.16.43
by Martin Pool
- clean up handling of option objects |
201 |
allowed_names = self.options().keys() |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
202 |
for oname in opts: |
1185.16.43
by Martin Pool
- clean up handling of option objects |
203 |
if oname not in allowed_names: |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
204 |
raise BzrCommandError("option '--%s' is not allowed for command %r" |
205 |
% (oname, self.name())) |
|
206 |
# mix arguments and options into one dictionary
|
|
207 |
cmdargs = _match_argform(self.name(), self.takes_args, args) |
|
208 |
cmdopts = {} |
|
209 |
for k, v in opts.items(): |
|
210 |
cmdopts[k.replace('-', '_')] = v |
|
211 |
||
212 |
all_cmd_args = cmdargs.copy() |
|
213 |
all_cmd_args.update(cmdopts) |
|
214 |
||
215 |
return self.run(**all_cmd_args) |
|
216 |
||
329
by Martin Pool
- refactor command functions into command classes |
217 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
218 |
def run(self): |
219 |
"""Actually run the command.
|
|
329
by Martin Pool
- refactor command functions into command classes |
220 |
|
221 |
This is invoked with the options and arguments bound to
|
|
222 |
keyword parameters.
|
|
223 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
224 |
Return 0 or None if the command was successful, or a non-zero
|
225 |
shell error code if not. It's OK for this method to allow
|
|
226 |
an exception to raise up.
|
|
329
by Martin Pool
- refactor command functions into command classes |
227 |
"""
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
228 |
raise NotImplementedError() |
329
by Martin Pool
- refactor command functions into command classes |
229 |
|
230 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
231 |
def help(self): |
232 |
"""Return help message for this class."""
|
|
233 |
if self.__doc__ is Command.__doc__: |
|
234 |
return None |
|
235 |
return getdoc(self) |
|
236 |
||
237 |
def name(self): |
|
238 |
return _unsquish_command_name(self.__class__.__name__) |
|
239 |
||
240 |
||
493
by Martin Pool
- Merge aaron's merge command |
241 |
def parse_spec(spec): |
622
by Martin Pool
Updated merge patch from Aaron |
242 |
"""
|
243 |
>>> parse_spec(None)
|
|
244 |
[None, None]
|
|
245 |
>>> parse_spec("./")
|
|
246 |
['./', None]
|
|
247 |
>>> parse_spec("../@")
|
|
248 |
['..', -1]
|
|
249 |
>>> parse_spec("../f/@35")
|
|
250 |
['../f', 35]
|
|
897
by Martin Pool
- merge john's revision-naming code |
251 |
>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
|
252 |
['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
|
|
622
by Martin Pool
Updated merge patch from Aaron |
253 |
"""
|
254 |
if spec is None: |
|
255 |
return [None, None] |
|
493
by Martin Pool
- Merge aaron's merge command |
256 |
if '/@' in spec: |
257 |
parsed = spec.split('/@') |
|
258 |
assert len(parsed) == 2 |
|
259 |
if parsed[1] == "": |
|
260 |
parsed[1] = -1 |
|
261 |
else: |
|
897
by Martin Pool
- merge john's revision-naming code |
262 |
try: |
263 |
parsed[1] = int(parsed[1]) |
|
264 |
except ValueError: |
|
265 |
pass # We can allow stuff like ./@revid:blahblahblah |
|
266 |
else: |
|
267 |
assert parsed[1] >=0 |
|
493
by Martin Pool
- Merge aaron's merge command |
268 |
else: |
269 |
parsed = [spec, None] |
|
270 |
return parsed |
|
271 |
||
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
272 |
def parse_args(command, argv): |
1
by mbp at sourcefrog
import from baz patch-364 |
273 |
"""Parse command line.
|
274 |
|
|
275 |
Arguments and options are parsed at this level before being passed
|
|
276 |
down to specific command handlers. This routine knows, from a
|
|
277 |
lookup table, something about the available options, what optargs
|
|
278 |
they take, and which commands will accept them.
|
|
279 |
"""
|
|
1185.16.49
by mbp at sourcefrog
- more refactoring and tests of commandline |
280 |
# TODO: chop up this beast; make it a method of the Command
|
1
by mbp at sourcefrog
import from baz patch-364 |
281 |
args = [] |
282 |
opts = {} |
|
283 |
||
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
284 |
cmd_options = command.options() |
1144
by Martin Pool
- accept -- to terminate options |
285 |
argsover = False |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
286 |
while argv: |
287 |
a = argv.pop(0) |
|
1185.16.49
by mbp at sourcefrog
- more refactoring and tests of commandline |
288 |
if argsover: |
289 |
args.append(a) |
|
290 |
continue
|
|
291 |
elif a == '--': |
|
292 |
# We've received a standalone -- No more flags
|
|
293 |
argsover = True |
|
294 |
continue
|
|
295 |
if a[0] == '-': |
|
264
by Martin Pool
parse_args: option names must be ascii |
296 |
# option names must not be unicode
|
297 |
a = str(a) |
|
17
by mbp at sourcefrog
allow --option=ARG syntax |
298 |
optarg = None |
1
by mbp at sourcefrog
import from baz patch-364 |
299 |
if a[1] == '-': |
300 |
mutter(" got option %r" % a) |
|
17
by mbp at sourcefrog
allow --option=ARG syntax |
301 |
if '=' in a: |
302 |
optname, optarg = a[2:].split('=', 1) |
|
303 |
else: |
|
304 |
optname = a[2:] |
|
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
305 |
if optname not in cmd_options: |
306 |
raise BzrCommandError('unknown long option %r for command %s' |
|
1185.12.54
by Aaron Bentley
Fixed wrong-long-option errors |
307 |
% (a, command.name())) |
1
by mbp at sourcefrog
import from baz patch-364 |
308 |
else: |
309 |
shortopt = a[1:] |
|
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
310 |
if shortopt in Option.SHORT_OPTIONS: |
683
by Martin Pool
- short option stacking patch from John A Meinel |
311 |
# Multi-character options must have a space to delimit
|
312 |
# their value
|
|
1185.16.44
by Martin Pool
doc |
313 |
# ^^^ what does this mean? mbp 20051014
|
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
314 |
optname = Option.SHORT_OPTIONS[shortopt].name |
683
by Martin Pool
- short option stacking patch from John A Meinel |
315 |
else: |
316 |
# Single character short options, can be chained,
|
|
317 |
# and have their value appended to their name
|
|
318 |
shortopt = a[1:2] |
|
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
319 |
if shortopt not in Option.SHORT_OPTIONS: |
683
by Martin Pool
- short option stacking patch from John A Meinel |
320 |
# We didn't find the multi-character name, and we
|
321 |
# didn't find the single char name
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
322 |
raise BzrError('unknown short option %r' % a) |
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
323 |
optname = Option.SHORT_OPTIONS[shortopt].name |
683
by Martin Pool
- short option stacking patch from John A Meinel |
324 |
|
325 |
if a[2:]: |
|
326 |
# There are extra things on this option
|
|
327 |
# see if it is the value, or if it is another
|
|
328 |
# short option
|
|
1185.16.41
by Martin Pool
[patch] define cli options as objects, not strings |
329 |
optargfn = Option.OPTIONS[optname].type |
683
by Martin Pool
- short option stacking patch from John A Meinel |
330 |
if optargfn is None: |
331 |
# This option does not take an argument, so the
|
|
332 |
# next entry is another short option, pack it back
|
|
333 |
# into the list
|
|
334 |
argv.insert(0, '-' + a[2:]) |
|
335 |
else: |
|
336 |
# This option takes an argument, so pack it
|
|
337 |
# into the array
|
|
338 |
optarg = a[2:] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
339 |
|
340 |
if optname in opts: |
|
341 |
# XXX: Do we ever want to support this, e.g. for -r?
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
342 |
raise BzrError('repeated option %r' % a) |
17
by mbp at sourcefrog
allow --option=ARG syntax |
343 |
|
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
344 |
option_obj = cmd_options[optname] |
345 |
optargfn = option_obj.type |
|
1
by mbp at sourcefrog
import from baz patch-364 |
346 |
if optargfn: |
17
by mbp at sourcefrog
allow --option=ARG syntax |
347 |
if optarg == None: |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
348 |
if not argv: |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
349 |
raise BzrError('option %r needs an argument' % a) |
17
by mbp at sourcefrog
allow --option=ARG syntax |
350 |
else: |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
351 |
optarg = argv.pop(0) |
17
by mbp at sourcefrog
allow --option=ARG syntax |
352 |
opts[optname] = optargfn(optarg) |
1
by mbp at sourcefrog
import from baz patch-364 |
353 |
else: |
17
by mbp at sourcefrog
allow --option=ARG syntax |
354 |
if optarg != None: |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
355 |
raise BzrError('option %r takes no argument' % optname) |
1
by mbp at sourcefrog
import from baz patch-364 |
356 |
opts[optname] = True |
357 |
else: |
|
358 |
args.append(a) |
|
359 |
return args, opts |
|
360 |
||
361 |
||
329
by Martin Pool
- refactor command functions into command classes |
362 |
def _match_argform(cmd, takes_args, args): |
1
by mbp at sourcefrog
import from baz patch-364 |
363 |
argdict = {} |
26
by mbp at sourcefrog
fix StopIteration error on python2.3(?) |
364 |
|
329
by Martin Pool
- refactor command functions into command classes |
365 |
# step through args and takes_args, allowing appropriate 0-many matches
|
366 |
for ap in takes_args: |
|
1
by mbp at sourcefrog
import from baz patch-364 |
367 |
argname = ap[:-1] |
368 |
if ap[-1] == '?': |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
369 |
if args: |
370 |
argdict[argname] = args.pop(0) |
|
196
by mbp at sourcefrog
selected-file diff |
371 |
elif ap[-1] == '*': # all remaining arguments |
372 |
if args: |
|
373 |
argdict[argname + '_list'] = args[:] |
|
374 |
args = [] |
|
375 |
else: |
|
376 |
argdict[argname + '_list'] = None |
|
1
by mbp at sourcefrog
import from baz patch-364 |
377 |
elif ap[-1] == '+': |
378 |
if not args: |
|
329
by Martin Pool
- refactor command functions into command classes |
379 |
raise BzrCommandError("command %r needs one or more %s" |
1
by mbp at sourcefrog
import from baz patch-364 |
380 |
% (cmd, argname.upper())) |
381 |
else: |
|
382 |
argdict[argname + '_list'] = args[:] |
|
383 |
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 |
384 |
elif ap[-1] == '$': # all but one |
385 |
if len(args) < 2: |
|
329
by Martin Pool
- refactor command functions into command classes |
386 |
raise BzrCommandError("command %r needs one or more %s" |
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 |
387 |
% (cmd, argname.upper())) |
388 |
argdict[argname + '_list'] = args[:-1] |
|
389 |
args[:-1] = [] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
390 |
else: |
391 |
# just a plain arg
|
|
392 |
argname = ap |
|
393 |
if not args: |
|
329
by Martin Pool
- refactor command functions into command classes |
394 |
raise BzrCommandError("command %r requires argument %s" |
1
by mbp at sourcefrog
import from baz patch-364 |
395 |
% (cmd, argname.upper())) |
396 |
else: |
|
397 |
argdict[argname] = args.pop(0) |
|
398 |
||
399 |
if args: |
|
329
by Martin Pool
- refactor command functions into command classes |
400 |
raise BzrCommandError("extra argument to command %s: %s" |
401 |
% (cmd, args[0])) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
402 |
|
403 |
return argdict |
|
404 |
||
405 |
||
406 |
||
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
407 |
def apply_profiled(the_callable, *args, **kwargs): |
408 |
import hotshot |
|
409 |
import tempfile |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
410 |
import hotshot.stats |
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
411 |
pffileno, pfname = tempfile.mkstemp() |
412 |
try: |
|
413 |
prof = hotshot.Profile(pfname) |
|
414 |
try: |
|
415 |
ret = prof.runcall(the_callable, *args, **kwargs) or 0 |
|
416 |
finally: |
|
417 |
prof.close() |
|
418 |
stats = hotshot.stats.load(pfname) |
|
1393.1.27
by Martin Pool
- clean up profile code and change default sort order |
419 |
stats.strip_dirs() |
420 |
stats.sort_stats('cum') # 'time' |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
421 |
## XXX: Might like to write to stderr or the trace file instead but
|
422 |
## print_stats seems hardcoded to stdout
|
|
423 |
stats.print_stats(20) |
|
424 |
return ret |
|
425 |
finally: |
|
426 |
os.close(pffileno) |
|
427 |
os.remove(pfname) |
|
428 |
||
429 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
430 |
def run_bzr(argv): |
431 |
"""Execute a command.
|
|
432 |
||
433 |
This is similar to main(), but without all the trappings for
|
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
434 |
logging and error handling.
|
973
by Martin Pool
- various refactorings of command interpreter |
435 |
|
436 |
argv
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
437 |
The command-line arguments, without the program name from argv[0]
|
973
by Martin Pool
- various refactorings of command interpreter |
438 |
|
439 |
Returns a command status or raises an exception.
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
440 |
|
441 |
Special master options: these must come before the command because
|
|
442 |
they control how the command is interpreted.
|
|
443 |
||
444 |
--no-plugins
|
|
445 |
Do not load plugin modules at all
|
|
446 |
||
447 |
--builtin
|
|
448 |
Only use builtin commands. (Plugins are still allowed to change
|
|
449 |
other behaviour.)
|
|
450 |
||
451 |
--profile
|
|
452 |
Run under the Python profiler.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
453 |
"""
|
1185.11.1
by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet. |
454 |
# Load all of the transport methods
|
455 |
import bzrlib.transport.local, bzrlib.transport.http |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
456 |
|
251
by mbp at sourcefrog
- factor out locale.getpreferredencoding() |
457 |
argv = [a.decode(bzrlib.user_encoding) for a in argv] |
907.1.21
by John Arbash Meinel
Adding http transport as a valid transport protocol. |
458 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
459 |
opt_profile = opt_no_plugins = opt_builtin = False |
460 |
||
461 |
# --no-plugins is handled specially at a very early stage. We need
|
|
462 |
# to load plugins before doing other command parsing so that they
|
|
463 |
# can override commands, but this needs to happen first.
|
|
464 |
||
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
465 |
for a in argv: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
466 |
if a == '--profile': |
467 |
opt_profile = True |
|
468 |
elif a == '--no-plugins': |
|
469 |
opt_no_plugins = True |
|
470 |
elif a == '--builtin': |
|
471 |
opt_builtin = True |
|
472 |
else: |
|
473 |
break
|
|
474 |
argv.remove(a) |
|
475 |
||
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
476 |
if (not argv) or (argv[0] == '--help'): |
477 |
from bzrlib.help import help |
|
478 |
if len(argv) > 1: |
|
479 |
help(argv[1]) |
|
480 |
else: |
|
481 |
help() |
|
482 |
return 0 |
|
483 |
||
484 |
if argv[0] == '--version': |
|
485 |
from bzrlib.builtins import show_version |
|
486 |
show_version() |
|
487 |
return 0 |
|
488 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
489 |
if not opt_no_plugins: |
973
by Martin Pool
- various refactorings of command interpreter |
490 |
from bzrlib.plugin import load_plugins |
491 |
load_plugins() |
|
492 |
||
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
493 |
cmd = str(argv.pop(0)) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
494 |
|
1162
by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to |
495 |
cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin) |
1
by mbp at sourcefrog
import from baz patch-364 |
496 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
497 |
if opt_profile: |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
498 |
ret = apply_profiled(cmd_obj.run_argv, argv) |
137
by mbp at sourcefrog
new --profile option |
499 |
else: |
1165
by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv |
500 |
ret = cmd_obj.run_argv(argv) |
501 |
return ret or 0 |
|
267
by Martin Pool
- better reporting of errors |
502 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
503 |
def display_command(func): |
504 |
def ignore_pipe(*args, **kwargs): |
|
505 |
try: |
|
506 |
func(*args, **kwargs) |
|
507 |
except IOError, e: |
|
508 |
if e.errno != errno.EPIPE: |
|
509 |
raise
|
|
510 |
return ignore_pipe |
|
267
by Martin Pool
- better reporting of errors |
511 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
512 |
def main(argv): |
1104
by Martin Pool
- Add a simple UIFactory |
513 |
import bzrlib.ui |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
514 |
bzrlib.trace.log_startup(argv) |
1104
by Martin Pool
- Add a simple UIFactory |
515 |
bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory() |
516 |
||
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
517 |
return run_bzr_catch_errors(argv[1:]) |
1185.3.19
by Martin Pool
- split out commandline error reporting for ease of testing |
518 |
|
519 |
||
520 |
def run_bzr_catch_errors(argv): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
521 |
try: |
260
by Martin Pool
- remove atexit() dependency for writing out execution times |
522 |
try: |
1393.1.64
by Martin Pool
- improved display of some errors, including NotBranchError |
523 |
return run_bzr(argv) |
524 |
finally: |
|
525 |
# do this here inside the exception wrappers to catch EPIPE
|
|
526 |
sys.stdout.flush() |
|
1097
by Martin Pool
- send trace messages out through python logging module |
527 |
except BzrCommandError, e: |
528 |
# command line syntax error, etc
|
|
529 |
log_error(str(e)) |
|
530 |
return 1 |
|
531 |
except BzrError, e: |
|
532 |
bzrlib.trace.log_exception() |
|
533 |
return 1 |
|
534 |
except AssertionError, e: |
|
535 |
bzrlib.trace.log_exception('assertion failed: ' + str(e)) |
|
536 |
return 3 |
|
537 |
except KeyboardInterrupt, e: |
|
1360
by Martin Pool
- give possible traceback when interrupted |
538 |
bzrlib.trace.log_exception('interrupted') |
1097
by Martin Pool
- send trace messages out through python logging module |
539 |
return 2 |
540 |
except Exception, e: |
|
541 |
import errno |
|
542 |
if (isinstance(e, IOError) |
|
543 |
and hasattr(e, 'errno') |
|
544 |
and e.errno == errno.EPIPE): |
|
545 |
bzrlib.trace.note('broken pipe') |
|
546 |
return 2 |
|
547 |
else: |
|
1393.1.65
by Martin Pool
- remove accidental pdb invocation |
548 |
## import pdb
|
549 |
## pdb.pm()
|
|
1108
by Martin Pool
- more cleanups of error reporting |
550 |
bzrlib.trace.log_exception() |
1097
by Martin Pool
- send trace messages out through python logging module |
551 |
return 2 |
1
by mbp at sourcefrog
import from baz patch-364 |
552 |
|
553 |
if __name__ == '__main__': |
|
554 |
sys.exit(main(sys.argv)) |