/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1610.1.4 by Martin Pool
Doc
1
# Copyright (C) 2006 by Canonical Ltd
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1610.1.4 by Martin Pool
Doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1610.1.4 by Martin Pool
Doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
18
# TODO: probably should say which arguments are candidates for glob
19
# expansion on windows and do that at the command level.
20
1095 by Martin Pool
todo
21
# TODO: Define arguments by objects, rather than just using names.
22
# Those objects can specify the expected type of the argument, which
1610.1.4 by Martin Pool
Doc
23
# would help with validation and shell completion.  They could also provide
24
# help/explanation for that argument in a structured way.
25
26
# TODO: Specific "examples" property on commands for consistent formatting.
1095 by Martin Pool
todo
27
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
28
# TODO: "--profile=cum", to change sort order.  Is there any value in leaving
29
# the profile output behind so it can be interactively examined?
30
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
1733.2.5 by Michael Ellerman
Show which plugin (if any) provides a command.
315
    def plugin_name(self):
316
        """Get the name of the plugin that provides this command.
317
318
        :return: The name of the plugin or None if the command is builtin.
319
        """
320
        mod_parts = self.__module__.split('.')
321
        if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
322
            return mod_parts[2]
323
        else:
324
            return None
325
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
326
493 by Martin Pool
- Merge aaron's merge command
327
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
328
    """
329
    >>> parse_spec(None)
330
    [None, None]
331
    >>> parse_spec("./")
332
    ['./', None]
333
    >>> parse_spec("../@")
334
    ['..', -1]
335
    >>> parse_spec("../f/@35")
336
    ['../f', 35]
897 by Martin Pool
- merge john's revision-naming code
337
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
338
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
622 by Martin Pool
Updated merge patch from Aaron
339
    """
340
    if spec is None:
341
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
342
    if '/@' in spec:
343
        parsed = spec.split('/@')
344
        assert len(parsed) == 2
345
        if parsed[1] == "":
346
            parsed[1] = -1
347
        else:
897 by Martin Pool
- merge john's revision-naming code
348
            try:
349
                parsed[1] = int(parsed[1])
350
            except ValueError:
351
                pass # We can allow stuff like ./@revid:blahblahblah
352
            else:
353
                assert parsed[1] >=0
493 by Martin Pool
- Merge aaron's merge command
354
    else:
355
        parsed = [spec, None]
356
    return parsed
357
1553.6.11 by Erik Bågfors
small bugfixes, all tests pass now
358
def parse_args(command, argv, alias_argv=None):
1 by mbp at sourcefrog
import from baz patch-364
359
    """Parse command line.
360
    
361
    Arguments and options are parsed at this level before being passed
362
    down to specific command handlers.  This routine knows, from a
363
    lookup table, something about the available options, what optargs
364
    they take, and which commands will accept them.
365
    """
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
366
    # TODO: chop up this beast; make it a method of the Command
1 by mbp at sourcefrog
import from baz patch-364
367
    args = []
368
    opts = {}
1553.6.8 by Erik Bågfors
support for overrides
369
    alias_opts = {}
1 by mbp at sourcefrog
import from baz patch-364
370
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
371
    cmd_options = command.options()
1144 by Martin Pool
- accept -- to terminate options
372
    argsover = False
1553.6.8 by Erik Bågfors
support for overrides
373
    proc_aliasarg = True # Are we processing alias_argv now?
374
    for proc_argv in alias_argv, argv:
375
        while proc_argv:
376
            a = proc_argv.pop(0)
377
            if argsover:
378
                args.append(a)
379
                continue
380
            elif a == '--':
381
                # We've received a standalone -- No more flags
382
                argsover = True
383
                continue
384
            if a[0] == '-':
385
                # option names must not be unicode
386
                a = str(a)
387
                optarg = None
388
                if a[1] == '-':
389
                    mutter("  got option %r", a)
390
                    if '=' in a:
391
                        optname, optarg = a[2:].split('=', 1)
392
                    else:
393
                        optname = a[2:]
394
                    if optname not in cmd_options:
1558.1.10 by Aaron Bentley
Cleaned up some long lines
395
                        raise BzrOptionError('unknown long option %r for'
396
                                             ' command %s' % 
397
                                             (a, command.name()))
1553.6.8 by Erik Bågfors
support for overrides
398
                else:
399
                    shortopt = a[1:]
400
                    if shortopt in Option.SHORT_OPTIONS:
401
                        # Multi-character options must have a space to delimit
402
                        # their value
403
                        # ^^^ what does this mean? mbp 20051014
404
                        optname = Option.SHORT_OPTIONS[shortopt].name
405
                    else:
406
                        # Single character short options, can be chained,
407
                        # and have their value appended to their name
408
                        shortopt = a[1:2]
409
                        if shortopt not in Option.SHORT_OPTIONS:
410
                            # We didn't find the multi-character name, and we
411
                            # didn't find the single char name
412
                            raise BzrError('unknown short option %r' % a)
413
                        optname = Option.SHORT_OPTIONS[shortopt].name
683 by Martin Pool
- short option stacking patch from John A Meinel
414
1553.6.8 by Erik Bågfors
support for overrides
415
                        if a[2:]:
416
                            # There are extra things on this option
417
                            # see if it is the value, or if it is another
418
                            # short option
419
                            optargfn = Option.OPTIONS[optname].type
420
                            if optargfn is None:
421
                                # This option does not take an argument, so the
1558.1.10 by Aaron Bentley
Cleaned up some long lines
422
                                # next entry is another short option, pack it
423
                                # back into the list
1553.6.8 by Erik Bågfors
support for overrides
424
                                proc_argv.insert(0, '-' + a[2:])
425
                            else:
426
                                # This option takes an argument, so pack it
427
                                # into the array
428
                                optarg = a[2:]
429
                
430
                    if optname not in cmd_options:
1558.1.10 by Aaron Bentley
Cleaned up some long lines
431
                        raise BzrOptionError('unknown short option %r for'
432
                                             ' command %s' % 
433
                                             (shortopt, command.name()))
1553.6.8 by Erik Bågfors
support for overrides
434
                if optname in opts:
435
                    # XXX: Do we ever want to support this, e.g. for -r?
436
                    if proc_aliasarg:
437
                        raise BzrError('repeated option %r' % a)
438
                    elif optname in alias_opts:
1558.1.10 by Aaron Bentley
Cleaned up some long lines
439
                        # Replace what's in the alias with what's in the real
440
                        # argument
1553.6.8 by Erik Bågfors
support for overrides
441
                        del alias_opts[optname]
442
                        del opts[optname]
443
                        proc_argv.insert(0, a)
444
                        continue
445
                    else:
446
                        raise BzrError('repeated option %r' % a)
447
                    
448
                option_obj = cmd_options[optname]
449
                optargfn = option_obj.type
450
                if optargfn:
451
                    if optarg == None:
452
                        if not proc_argv:
453
                            raise BzrError('option %r needs an argument' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
454
                        else:
1553.6.8 by Erik Bågfors
support for overrides
455
                            optarg = proc_argv.pop(0)
456
                    opts[optname] = optargfn(optarg)
457
                    if proc_aliasarg:
458
                        alias_opts[optname] = optargfn(optarg)
459
                else:
460
                    if optarg != None:
461
                        raise BzrError('option %r takes no argument' % optname)
462
                    opts[optname] = True
463
                    if proc_aliasarg:
464
                        alias_opts[optname] = True
1 by mbp at sourcefrog
import from baz patch-364
465
            else:
1553.6.8 by Erik Bågfors
support for overrides
466
                args.append(a)
467
        proc_aliasarg = False # Done with alias argv
1 by mbp at sourcefrog
import from baz patch-364
468
    return args, opts
469
470
329 by Martin Pool
- refactor command functions into command classes
471
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
472
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
473
329 by Martin Pool
- refactor command functions into command classes
474
    # step through args and takes_args, allowing appropriate 0-many matches
475
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
476
        argname = ap[:-1]
477
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
478
            if args:
479
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
480
        elif ap[-1] == '*': # all remaining arguments
481
            if args:
482
                argdict[argname + '_list'] = args[:]
483
                args = []
484
            else:
485
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
486
        elif ap[-1] == '+':
487
            if not args:
329 by Martin Pool
- refactor command functions into command classes
488
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
489
                        % (cmd, argname.upper()))
490
            else:
491
                argdict[argname + '_list'] = args[:]
492
                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
493
        elif ap[-1] == '$': # all but one
494
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
495
                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
496
                        % (cmd, argname.upper()))
497
            argdict[argname + '_list'] = args[:-1]
498
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
499
        else:
500
            # just a plain arg
501
            argname = ap
502
            if not args:
329 by Martin Pool
- refactor command functions into command classes
503
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
504
                        % (cmd, argname.upper()))
505
            else:
506
                argdict[argname] = args.pop(0)
507
            
508
    if args:
329 by Martin Pool
- refactor command functions into command classes
509
        raise BzrCommandError("extra argument to command %s: %s"
510
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
511
512
    return argdict
513
514
515
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
516
def apply_profiled(the_callable, *args, **kwargs):
517
    import hotshot
518
    import tempfile
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
519
    import hotshot.stats
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
520
    pffileno, pfname = tempfile.mkstemp()
521
    try:
522
        prof = hotshot.Profile(pfname)
523
        try:
524
            ret = prof.runcall(the_callable, *args, **kwargs) or 0
525
        finally:
526
            prof.close()
527
        stats = hotshot.stats.load(pfname)
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
528
        stats.strip_dirs()
529
        stats.sort_stats('cum')   # 'time'
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
530
        ## XXX: Might like to write to stderr or the trace file instead but
531
        ## print_stats seems hardcoded to stdout
532
        stats.print_stats(20)
533
        return ret
534
    finally:
535
        os.close(pffileno)
536
        os.remove(pfname)
537
538
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)
539
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
540
    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)
541
    import cPickle
542
    ret, stats = profile(the_callable, *args, **kwargs)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
543
    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)
544
    if filename is None:
545
        stats.pprint()
546
    else:
547
        stats.freeze()
548
        cPickle.dump(stats, open(filename, 'w'), 2)
549
        print 'Profile data written to %r.' % filename
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
550
    return ret
551
1553.6.9 by Erik Bågfors
PEP8-ify
552
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
553
def get_alias(cmd):
1553.6.14 by Erik Bågfors
change get_alias summary to be shorter
554
    """Return an expanded alias, or None if no alias exists"""
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
555
    import bzrlib.config
1553.6.12 by Erik Bågfors
remove AliasConfig, based on input from abentley
556
    alias = bzrlib.config.GlobalConfig().get_alias(cmd)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
557
    if (alias):
558
        return alias.split(' ')
1553.6.8 by Erik Bågfors
support for overrides
559
    return None
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
560
1553.6.9 by Erik Bågfors
PEP8-ify
561
1 by mbp at sourcefrog
import from baz patch-364
562
def run_bzr(argv):
563
    """Execute a command.
564
565
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
566
    logging and error handling.  
973 by Martin Pool
- various refactorings of command interpreter
567
    
568
    argv
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
569
       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.
570
       These should already be decoded. All library/test code calling
571
       run_bzr should be passing valid strings (don't need decoding).
973 by Martin Pool
- various refactorings of command interpreter
572
    
573
    Returns a command status or raises an exception.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
574
575
    Special master options: these must come before the command because
576
    they control how the command is interpreted.
577
578
    --no-plugins
579
        Do not load plugin modules at all
580
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
581
    --no-aliases
582
        Do not allow aliases
583
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
584
    --builtin
585
        Only use builtin commands.  (Plugins are still allowed to change
586
        other behaviour.)
587
588
    --profile
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
589
        Run under the Python hotshot profiler.
590
591
    --lsprof
592
        Run under the Python lsprof profiler.
1 by mbp at sourcefrog
import from baz patch-364
593
    """
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
594
    argv = list(argv)
907.1.21 by John Arbash Meinel
Adding http transport as a valid transport protocol.
595
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
596
    opt_lsprof = opt_profile = opt_no_plugins = opt_builtin =  \
597
                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)
598
    opt_lsprof_file = None
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
599
600
    # --no-plugins is handled specially at a very early stage. We need
601
    # to load plugins before doing other command parsing so that they
602
    # can override commands, but this needs to happen first.
603
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)
604
    argv_copy = []
605
    i = 0
606
    while i < len(argv):
607
        a = argv[i]
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
608
        if a == '--profile':
609
            opt_profile = True
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
610
        elif a == '--lsprof':
611
            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)
612
        elif a == '--lsprof-file':
613
            opt_lsprof_file = argv[i + 1]
614
            i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
615
        elif a == '--no-plugins':
616
            opt_no_plugins = True
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
617
        elif a == '--no-aliases':
618
            opt_no_aliases = True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
619
        elif a == '--builtin':
620
            opt_builtin = True
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
621
        elif a in ('--quiet', '-q'):
622
            be_quiet()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
623
        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)
624
            argv_copy.append(a)
625
        i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
626
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)
627
    argv = argv_copy
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
628
    if (not argv):
629
        from bzrlib.builtins import cmd_help
1558.14.2 by Aaron Bentley
Removed deprecation warning when bzr invoked with no arguments
630
        cmd_help().run_argv_aliases([])
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
631
        return 0
632
633
    if argv[0] == '--version':
634
        from bzrlib.builtins import show_version
635
        show_version()
636
        return 0
637
        
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
638
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
639
        from bzrlib.plugin import load_plugins
640
        load_plugins()
1551.3.11 by Aaron Bentley
Merge from Robert
641
    else:
642
        from bzrlib.plugin import disable_plugins
643
        disable_plugins()
973 by Martin Pool
- various refactorings of command interpreter
644
1553.6.17 by Erik Bågfors
fix for broken --no-aliases
645
    alias_argv = None
646
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
647
    if not opt_no_aliases:
1553.6.8 by Erik Bågfors
support for overrides
648
        alias_argv = get_alias(argv[0])
649
        if alias_argv:
650
            alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv]
651
            argv[0] = alias_argv.pop(0)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
652
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
653
    cmd = str(argv.pop(0))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
654
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
655
    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.
656
    if not getattr(cmd_obj.run_argv, 'is_deprecated', False):
657
        run = cmd_obj.run_argv
658
        run_argv = [argv]
659
    else:
660
        run = cmd_obj.run_argv_aliases
661
        run_argv = [argv, alias_argv]
1534.7.154 by Aaron Bentley
Removed changes from bzr.ab 1529..1536
662
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
663
    try:
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
664
        if opt_lsprof:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
665
            ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
666
        elif opt_profile:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
667
            ret = apply_profiled(run, *run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
668
        else:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
669
            ret = run(*run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
670
        return ret or 0
671
    finally:
672
        # reset, in case we may do other commands later within the same process
673
        be_quiet(False)
267 by Martin Pool
- better reporting of errors
674
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
675
def display_command(func):
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
676
    """Decorator that suppresses pipe/interrupt errors."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
677
    def ignore_pipe(*args, **kwargs):
678
        try:
1185.35.22 by Aaron Bentley
Handled more pipe errors for display commands.
679
            result = func(*args, **kwargs)
680
            sys.stdout.flush()
681
            return result
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
682
        except IOError, e:
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
683
            if not hasattr(e, 'errno'):
684
                raise
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
685
            if e.errno != errno.EPIPE:
686
                raise
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
687
            pass
1185.12.69 by Aaron Bentley
Ignored ^C in display commands
688
        except KeyboardInterrupt:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
689
            pass
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
690
    return ignore_pipe
267 by Martin Pool
- better reporting of errors
691
1185.43.6 by Martin Pool
Enable logging early enough to save argv
692
1 by mbp at sourcefrog
import from baz patch-364
693
def main(argv):
1104 by Martin Pool
- Add a simple UIFactory
694
    import bzrlib.ui
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
695
    from bzrlib.ui.text import TextUIFactory
1185.43.8 by Martin Pool
Don't enable default logging twice
696
    ## bzrlib.trace.enable_default_logging()
1111 by Martin Pool
- add functions to enable and disable default logging, so that we can
697
    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.
698
    bzrlib.ui.ui_factory = TextUIFactory()
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
699
700
    argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
701
    ret = run_bzr_catch_errors(argv)
1185.43.6 by Martin Pool
Enable logging early enough to save argv
702
    mutter("return code %d", ret)
703
    return ret
1185.3.19 by Martin Pool
- split out commandline error reporting for ease of testing
704
705
706
def run_bzr_catch_errors(argv):
1 by mbp at sourcefrog
import from baz patch-364
707
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
708
        try:
1393.1.64 by Martin Pool
- improved display of some errors, including NotBranchError
709
            return run_bzr(argv)
710
        finally:
711
            # do this here inside the exception wrappers to catch EPIPE
712
            sys.stdout.flush()
1097 by Martin Pool
- send trace messages out through python logging module
713
    except Exception, e:
1185.33.19 by Martin Pool
Run postmortem debugger if BZR_PDB is set
714
        # used to handle AssertionError and KeyboardInterrupt
715
        # specially here, but hopefully they're handled ok by the logger now
1097 by Martin Pool
- send trace messages out through python logging module
716
        import errno
717
        if (isinstance(e, IOError) 
718
            and hasattr(e, 'errno')
719
            and e.errno == errno.EPIPE):
720
            bzrlib.trace.note('broken pipe')
1185.35.21 by Aaron Bentley
Changed error status to 3
721
            return 3
1097 by Martin Pool
- send trace messages out through python logging module
722
        else:
1185.33.20 by Martin Pool
Really enter the debugger on failure
723
            bzrlib.trace.log_exception()
1185.33.19 by Martin Pool
Run postmortem debugger if BZR_PDB is set
724
            if os.environ.get('BZR_PDB'):
1185.33.20 by Martin Pool
Really enter the debugger on failure
725
                print '**** entering debugger'
1185.33.19 by Martin Pool
Run postmortem debugger if BZR_PDB is set
726
                import pdb
1185.33.20 by Martin Pool
Really enter the debugger on failure
727
                pdb.post_mortem(sys.exc_traceback)
1185.35.21 by Aaron Bentley
Changed error status to 3
728
            return 3
1 by mbp at sourcefrog
import from baz patch-364
729
730
if __name__ == '__main__':
731
    sys.exit(main(sys.argv))