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