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