~bzr-pqm/bzr/bzr.dev

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