~bzr-pqm/bzr/bzr.dev

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
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
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
109
            
110
111
def builtin_command_names():
112
    """Return list of builtin command names."""
113
    return _builtin_commands().keys()
114
    
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
641 by Martin Pool
- improved external-command patch from john
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
329 by Martin Pool
- refactor command functions into command classes
217
    """
218
    aliases = []
219
    takes_args = []
220
    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()
221
    encoding_type = 'strict'
329 by Martin Pool
- refactor command functions into command classes
222
223
    hidden = False
224
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
225
    def __init__(self):
226
        """Construct an instance of this command."""
973 by Martin Pool
- various refactorings of command interpreter
227
        if self.__doc__ == Command.__doc__:
228
            warn("No help message set for %r" % self)
329 by Martin Pool
- refactor command functions into command classes
229
1185.16.43 by Martin Pool
- clean up handling of option objects
230
    def options(self):
231
        """Return dict of valid options for this command.
232
233
        Maps from long option name to option object."""
234
        r = dict()
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
235
        r['help'] = option.Option.OPTIONS['help']
1185.16.43 by Martin Pool
- clean up handling of option objects
236
        for o in self.takes_options:
1857.1.8 by Aaron Bentley
Group enum options and add enum options to init and init-repo
237
            if isinstance(o, basestring):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
238
                o = option.Option.OPTIONS[o]
1185.16.43 by Martin Pool
- clean up handling of option objects
239
            r[o.name] = o
240
        return r
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
241
1685.1.80 by Wouter van Heyst
more code cleanup
242
    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()
243
        """Return a file linked to stdout, which has proper encoding."""
244
        assert self.encoding_type in ['strict', 'exact', 'replace']
245
246
        # Originally I was using self.stdout, but that looks
247
        # *way* too much like sys.stdout
248
        if self.encoding_type == 'exact':
249
            self.outf = sys.stdout
250
            return
251
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
252
        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()
253
254
        # use 'replace' so that we don't abort if trying to write out
255
        # in e.g. the default C locale.
256
        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.
257
        # For whatever reason codecs.getwriter() does not advertise its encoding
258
        # it just returns the encoding of the wrapped file, which is completely
259
        # bogus. So set the attribute, so we can find the correct encoding later.
260
        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()
261
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
262
    @deprecated_method(zero_eight)
263
    def run_argv(self, argv):
264
        """Parse command line and run.
265
        
266
        See run_argv_aliases for the 0.8 and beyond api.
267
        """
268
        return self.run_argv_aliases(argv)
269
270
    def run_argv_aliases(self, argv, alias_argv=None):
271
        """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
272
        if argv is None:
273
            warn("Passing None for [] is deprecated from bzrlib 0.10", 
274
                 DeprecationWarning, stacklevel=2)
275
            argv = []
1553.6.8 by Erik Bågfors
support for overrides
276
        args, opts = parse_args(self, argv, alias_argv)
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
277
        if 'help' in opts:  # e.g. bzr add --help
278
            from bzrlib.help import help_on_command
279
            help_on_command(self.name())
280
            return 0
281
        # mix arguments and options into one dictionary
282
        cmdargs = _match_argform(self.name(), self.takes_args, args)
283
        cmdopts = {}
284
        for k, v in opts.items():
285
            cmdopts[k.replace('-', '_')] = v
286
287
        all_cmd_args = cmdargs.copy()
288
        all_cmd_args.update(cmdopts)
289
1685.1.80 by Wouter van Heyst
more code cleanup
290
        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()
291
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
292
        return self.run(**all_cmd_args)
329 by Martin Pool
- refactor command functions into command classes
293
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
294
    def run(self):
295
        """Actually run the command.
329 by Martin Pool
- refactor command functions into command classes
296
297
        This is invoked with the options and arguments bound to
298
        keyword parameters.
299
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
300
        Return 0 or None if the command was successful, or a non-zero
301
        shell error code if not.  It's OK for this method to allow
302
        an exception to raise up.
329 by Martin Pool
- refactor command functions into command classes
303
        """
1610.1.3 by Martin Pool
Better error message for Command.run() not implemented
304
        raise NotImplementedError('no implementation of command %r' 
305
                                  % self.name())
329 by Martin Pool
- refactor command functions into command classes
306
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
307
    def help(self):
308
        """Return help message for this class."""
1610.1.2 by Martin Pool
Move rarely-used import into Command.help()
309
        from inspect import getdoc
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
310
        if self.__doc__ is Command.__doc__:
311
            return None
312
        return getdoc(self)
313
314
    def name(self):
315
        return _unsquish_command_name(self.__class__.__name__)
316
1733.2.5 by Michael Ellerman
Show which plugin (if any) provides a command.
317
    def plugin_name(self):
318
        """Get the name of the plugin that provides this command.
319
320
        :return: The name of the plugin or None if the command is builtin.
321
        """
322
        mod_parts = self.__module__.split('.')
323
        if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
324
            return mod_parts[2]
325
        else:
326
            return None
327
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
328
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
329
# Technically, this function hasn't been use in a *really* long time
330
# but we are only deprecating it now.
331
@deprecated_function(zero_eleven)
493 by Martin Pool
- Merge aaron's merge command
332
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
333
    """
334
    >>> parse_spec(None)
335
    [None, None]
336
    >>> parse_spec("./")
337
    ['./', None]
338
    >>> parse_spec("../@")
339
    ['..', -1]
340
    >>> parse_spec("../f/@35")
341
    ['../f', 35]
897 by Martin Pool
- merge john's revision-naming code
342
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
343
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
622 by Martin Pool
Updated merge patch from Aaron
344
    """
345
    if spec is None:
346
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
347
    if '/@' in spec:
348
        parsed = spec.split('/@')
349
        assert len(parsed) == 2
350
        if parsed[1] == "":
351
            parsed[1] = -1
352
        else:
897 by Martin Pool
- merge john's revision-naming code
353
            try:
354
                parsed[1] = int(parsed[1])
355
            except ValueError:
356
                pass # We can allow stuff like ./@revid:blahblahblah
357
            else:
358
                assert parsed[1] >=0
493 by Martin Pool
- Merge aaron's merge command
359
    else:
360
        parsed = [spec, None]
361
    return parsed
362
1553.6.11 by Erik Bågfors
small bugfixes, all tests pass now
363
def parse_args(command, argv, alias_argv=None):
1 by mbp at sourcefrog
import from baz patch-364
364
    """Parse command line.
365
    
366
    Arguments and options are parsed at this level before being passed
367
    down to specific command handlers.  This routine knows, from a
368
    lookup table, something about the available options, what optargs
369
    they take, and which commands will accept them.
370
    """
1857.1.1 by Aaron Bentley
Use optparse for parsing options
371
    # TODO: make it a method of the Command?
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
372
    parser = option.get_optparser(command.options())
1857.1.1 by Aaron Bentley
Use optparse for parsing options
373
    if alias_argv is not None:
374
        args = alias_argv + argv
375
    else:
376
        args = argv
683 by Martin Pool
- short option stacking patch from John A Meinel
377
1857.1.1 by Aaron Bentley
Use optparse for parsing options
378
    options, args = parser.parse_args(args)
379
    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
380
                 v is not option.OptionParser.DEFAULT_VALUE])
1 by mbp at sourcefrog
import from baz patch-364
381
    return args, opts
382
383
329 by Martin Pool
- refactor command functions into command classes
384
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
385
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
386
329 by Martin Pool
- refactor command functions into command classes
387
    # step through args and takes_args, allowing appropriate 0-many matches
388
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
389
        argname = ap[:-1]
390
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
391
            if args:
392
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
393
        elif ap[-1] == '*': # all remaining arguments
394
            if args:
395
                argdict[argname + '_list'] = args[:]
396
                args = []
397
            else:
398
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
399
        elif ap[-1] == '+':
400
            if not args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
401
                raise errors.BzrCommandError("command %r needs one or more %s"
402
                                             % (cmd, argname.upper()))
1 by mbp at sourcefrog
import from baz patch-364
403
            else:
404
                argdict[argname + '_list'] = args[:]
405
                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
406
        elif ap[-1] == '$': # all but one
407
            if len(args) < 2:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
408
                raise errors.BzrCommandError("command %r needs one or more %s"
409
                                             % (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
410
            argdict[argname + '_list'] = args[:-1]
1740.5.6 by Martin Pool
Clean up many exception classes.
411
            args[:-1] = []
1 by mbp at sourcefrog
import from baz patch-364
412
        else:
413
            # just a plain arg
414
            argname = ap
415
            if not args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
416
                raise errors.BzrCommandError("command %r requires argument %s"
417
                               % (cmd, argname.upper()))
1 by mbp at sourcefrog
import from baz patch-364
418
            else:
419
                argdict[argname] = args.pop(0)
420
            
421
    if args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
422
        raise errors.BzrCommandError("extra argument to command %s: %s"
423
                                     % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
424
425
    return argdict
426
427
428
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
429
def apply_profiled(the_callable, *args, **kwargs):
430
    import hotshot
431
    import tempfile
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
432
    import hotshot.stats
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
433
    pffileno, pfname = tempfile.mkstemp()
434
    try:
435
        prof = hotshot.Profile(pfname)
436
        try:
437
            ret = prof.runcall(the_callable, *args, **kwargs) or 0
438
        finally:
439
            prof.close()
440
        stats = hotshot.stats.load(pfname)
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
441
        stats.strip_dirs()
442
        stats.sort_stats('cum')   # 'time'
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
443
        ## XXX: Might like to write to stderr or the trace file instead but
444
        ## print_stats seems hardcoded to stdout
445
        stats.print_stats(20)
446
        return ret
447
    finally:
448
        os.close(pffileno)
449
        os.remove(pfname)
450
451
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)
452
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
453
    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)
454
    import cPickle
455
    ret, stats = profile(the_callable, *args, **kwargs)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
456
    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)
457
    if filename is None:
458
        stats.pprint()
459
    else:
460
        stats.freeze()
461
        cPickle.dump(stats, open(filename, 'w'), 2)
462
        print 'Profile data written to %r.' % filename
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
463
    return ret
464
1553.6.9 by Erik Bågfors
PEP8-ify
465
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
466
def get_alias(cmd):
1553.6.14 by Erik Bågfors
change get_alias summary to be shorter
467
    """Return an expanded alias, or None if no alias exists"""
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
468
    import bzrlib.config
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
469
    alias = bzrlib.config.GlobalConfig().get_alias(cmd)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
470
    if (alias):
471
        return alias.split(' ')
1553.6.8 by Erik Bågfors
support for overrides
472
    return None
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
473
1553.6.9 by Erik Bågfors
PEP8-ify
474
1 by mbp at sourcefrog
import from baz patch-364
475
def run_bzr(argv):
476
    """Execute a command.
477
478
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
479
    logging and error handling.  
973 by Martin Pool
- various refactorings of command interpreter
480
    
481
    argv
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
482
       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.
483
       These should already be decoded. All library/test code calling
484
       run_bzr should be passing valid strings (don't need decoding).
973 by Martin Pool
- various refactorings of command interpreter
485
    
486
    Returns a command status or raises an exception.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
487
488
    Special master options: these must come before the command because
489
    they control how the command is interpreted.
490
491
    --no-plugins
492
        Do not load plugin modules at all
493
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
494
    --no-aliases
495
        Do not allow aliases
496
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
497
    --builtin
498
        Only use builtin commands.  (Plugins are still allowed to change
499
        other behaviour.)
500
501
    --profile
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
502
        Run under the Python hotshot profiler.
503
504
    --lsprof
505
        Run under the Python lsprof profiler.
1 by mbp at sourcefrog
import from baz patch-364
506
    """
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
507
    argv = list(argv)
907.1.21 by John Arbash Meinel
Adding http transport as a valid transport protocol.
508
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
509
    opt_lsprof = opt_profile = opt_no_plugins = opt_builtin =  \
510
                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)
511
    opt_lsprof_file = None
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
512
513
    # --no-plugins is handled specially at a very early stage. We need
514
    # to load plugins before doing other command parsing so that they
515
    # can override commands, but this needs to happen first.
516
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)
517
    argv_copy = []
518
    i = 0
519
    while i < len(argv):
520
        a = argv[i]
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
521
        if a == '--profile':
522
            opt_profile = True
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
523
        elif a == '--lsprof':
524
            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)
525
        elif a == '--lsprof-file':
1706.2.6 by Robey Pointer
when giving --lsprof-file, assume --lsprof
526
            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)
527
            opt_lsprof_file = argv[i + 1]
528
            i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
529
        elif a == '--no-plugins':
530
            opt_no_plugins = True
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
531
        elif a == '--no-aliases':
532
            opt_no_aliases = True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
533
        elif a == '--builtin':
534
            opt_builtin = True
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
535
        elif a in ('--quiet', '-q'):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
536
            trace.be_quiet()
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
537
        elif a.startswith('-D'):
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
538
            debug.debug_flags.add(a[2:])
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
539
        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)
540
            argv_copy.append(a)
541
        i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
542
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)
543
    argv = argv_copy
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
544
    if (not argv):
545
        from bzrlib.builtins import cmd_help
1558.14.2 by Aaron Bentley
Removed deprecation warning when bzr invoked with no arguments
546
        cmd_help().run_argv_aliases([])
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
547
        return 0
548
549
    if argv[0] == '--version':
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
550
        from bzrlib.version import show_version
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
551
        show_version()
552
        return 0
553
        
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
554
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
555
        from bzrlib.plugin import load_plugins
556
        load_plugins()
1551.3.11 by Aaron Bentley
Merge from Robert
557
    else:
558
        from bzrlib.plugin import disable_plugins
559
        disable_plugins()
973 by Martin Pool
- various refactorings of command interpreter
560
1553.6.17 by Erik Bågfors
fix for broken --no-aliases
561
    alias_argv = None
562
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
563
    if not opt_no_aliases:
1553.6.8 by Erik Bågfors
support for overrides
564
        alias_argv = get_alias(argv[0])
565
        if alias_argv:
566
            alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv]
567
            argv[0] = alias_argv.pop(0)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
568
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
569
    cmd = argv.pop(0)
1948.1.10 by John Arbash Meinel
Simplify changes to command.py
570
    # We want only 'ascii' command names, but the user may have typed
571
    # in a Unicode name. In that case, they should just get a
572
    # 'command not found' error later.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
573
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
574
    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.
575
    if not getattr(cmd_obj.run_argv, 'is_deprecated', False):
576
        run = cmd_obj.run_argv
577
        run_argv = [argv]
578
    else:
579
        run = cmd_obj.run_argv_aliases
580
        run_argv = [argv, alias_argv]
1534.7.154 by Aaron Bentley
Removed changes from bzr.ab 1529..1536
581
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
582
    try:
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
583
        if opt_lsprof:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
584
            ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
585
        elif opt_profile:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
586
            ret = apply_profiled(run, *run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
587
        else:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
588
            ret = run(*run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
589
        return ret or 0
590
    finally:
591
        # 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
592
        trace.be_quiet(False)
267 by Martin Pool
- better reporting of errors
593
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
594
def display_command(func):
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
595
    """Decorator that suppresses pipe/interrupt errors."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
596
    def ignore_pipe(*args, **kwargs):
597
        try:
1185.35.22 by Aaron Bentley
Handled more pipe errors for display commands.
598
            result = func(*args, **kwargs)
599
            sys.stdout.flush()
600
            return result
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
601
        except IOError, e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
602
            if getattr(e, 'errno', None) is None:
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
603
                raise
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
604
            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
605
                # Win32 raises IOError with errno=0 on a broken pipe
606
                if sys.platform != 'win32' or e.errno != 0:
607
                    raise
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
608
            pass
1185.12.69 by Aaron Bentley
Ignored ^C in display commands
609
        except KeyboardInterrupt:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
610
            pass
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
611
    return ignore_pipe
267 by Martin Pool
- better reporting of errors
612
1185.43.6 by Martin Pool
Enable logging early enough to save argv
613
1 by mbp at sourcefrog
import from baz patch-364
614
def main(argv):
1104 by Martin Pool
- Add a simple UIFactory
615
    import bzrlib.ui
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
616
    from bzrlib.ui.text import TextUIFactory
617
    bzrlib.ui.ui_factory = TextUIFactory()
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
618
    argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
619
    ret = run_bzr_catch_errors(argv)
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
620
    trace.mutter("return code %d", ret)
1185.43.6 by Martin Pool
Enable logging early enough to save argv
621
    return ret
1185.3.19 by Martin Pool
- split out commandline error reporting for ease of testing
622
623
624
def run_bzr_catch_errors(argv):
1 by mbp at sourcefrog
import from baz patch-364
625
    try:
1711.4.31 by John Arbash Meinel
Catch proper error instead of EPIPE on win32, also don't double flush
626
        return run_bzr(argv)
627
        # do this here inside the exception wrappers to catch EPIPE
628
        sys.stdout.flush()
2027.2.3 by Marien Zwart
Fix another python 2.5 issue.
629
    except (KeyboardInterrupt, Exception), e:
1185.33.19 by Martin Pool
Run postmortem debugger if BZR_PDB is set
630
        # used to handle AssertionError and KeyboardInterrupt
631
        # 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
632
        trace.report_exception(sys.exc_info(), sys.stderr)
1740.5.3 by Martin Pool
Cleanup more exception-formatting code
633
        if os.environ.get('BZR_PDB'):
634
            print '**** entering debugger'
635
            import pdb
636
            pdb.post_mortem(sys.exc_traceback)
637
        return 3
1 by mbp at sourcefrog
import from baz patch-364
638
639
if __name__ == '__main__':
640
    sys.exit(main(sys.argv))