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