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