~bzr-pqm/bzr/bzr.dev

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