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