/brz/remove-bazaar

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