/brz/remove-bazaar

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