/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.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
217
            NOTE: by default on Windows sys.stdout opened as text stream,
218
            therefore line-endings LF converted to CRLF.
219
            When command use encoding_type = 'exact' then
220
            sys.stdout forced to be binary stream and line-endings
221
            will not mangled.
329 by Martin Pool
- refactor command functions into command classes
222
    """
223
    aliases = []
224
    takes_args = []
225
    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()
226
    encoding_type = 'strict'
329 by Martin Pool
- refactor command functions into command classes
227
228
    hidden = False
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
229
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
230
    def __init__(self):
231
        """Construct an instance of this command."""
973 by Martin Pool
- various refactorings of command interpreter
232
        if self.__doc__ == Command.__doc__:
233
            warn("No help message set for %r" % self)
329 by Martin Pool
- refactor command functions into command classes
234
1185.16.43 by Martin Pool
- clean up handling of option objects
235
    def options(self):
236
        """Return dict of valid options for this command.
237
238
        Maps from long option name to option object."""
239
        r = dict()
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
240
        r['help'] = option.Option.OPTIONS['help']
1185.16.43 by Martin Pool
- clean up handling of option objects
241
        for o in self.takes_options:
1857.1.8 by Aaron Bentley
Group enum options and add enum options to init and init-repo
242
            if isinstance(o, basestring):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
243
                o = option.Option.OPTIONS[o]
1185.16.43 by Martin Pool
- clean up handling of option objects
244
            r[o.name] = o
245
        return r
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
246
1685.1.80 by Wouter van Heyst
more code cleanup
247
    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()
248
        """Return a file linked to stdout, which has proper encoding."""
249
        assert self.encoding_type in ['strict', 'exact', 'replace']
250
251
        # Originally I was using self.stdout, but that looks
252
        # *way* too much like sys.stdout
253
        if self.encoding_type == 'exact':
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
254
            # force sys.stdout to be binary stream on win32
255
            if sys.platform == 'win32':
256
                fileno = getattr(sys.stdout, 'fileno', None)
257
                if fileno:
258
                    import msvcrt
259
                    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()
260
            self.outf = sys.stdout
261
            return
262
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
263
        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()
264
265
        # use 'replace' so that we don't abort if trying to write out
266
        # in e.g. the default C locale.
267
        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.
268
        # For whatever reason codecs.getwriter() does not advertise its encoding
269
        # it just returns the encoding of the wrapped file, which is completely
270
        # bogus. So set the attribute, so we can find the correct encoding later.
271
        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()
272
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
273
    @deprecated_method(zero_eight)
274
    def run_argv(self, argv):
275
        """Parse command line and run.
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
276
        
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
277
        See run_argv_aliases for the 0.8 and beyond api.
278
        """
279
        return self.run_argv_aliases(argv)
280
281
    def run_argv_aliases(self, argv, alias_argv=None):
282
        """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
283
        if argv is None:
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
284
            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
285
                 DeprecationWarning, stacklevel=2)
286
            argv = []
1553.6.8 by Erik Bågfors
support for overrides
287
        args, opts = parse_args(self, argv, alias_argv)
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
288
        if 'help' in opts:  # e.g. bzr add --help
289
            from bzrlib.help import help_on_command
290
            help_on_command(self.name())
291
            return 0
292
        # mix arguments and options into one dictionary
293
        cmdargs = _match_argform(self.name(), self.takes_args, args)
294
        cmdopts = {}
295
        for k, v in opts.items():
296
            cmdopts[k.replace('-', '_')] = v
297
298
        all_cmd_args = cmdargs.copy()
299
        all_cmd_args.update(cmdopts)
300
1685.1.80 by Wouter van Heyst
more code cleanup
301
        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()
302
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
303
        return self.run(**all_cmd_args)
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
304
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
305
    def run(self):
306
        """Actually run the command.
329 by Martin Pool
- refactor command functions into command classes
307
308
        This is invoked with the options and arguments bound to
309
        keyword parameters.
310
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
311
        Return 0 or None if the command was successful, or a non-zero
312
        shell error code if not.  It's OK for this method to allow
313
        an exception to raise up.
329 by Martin Pool
- refactor command functions into command classes
314
        """
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
315
        raise NotImplementedError('no implementation of command %r'
1610.1.3 by Martin Pool
Better error message for Command.run() not implemented
316
                                  % self.name())
329 by Martin Pool
- refactor command functions into command classes
317
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
318
    def help(self):
319
        """Return help message for this class."""
1610.1.2 by Martin Pool
Move rarely-used import into Command.help()
320
        from inspect import getdoc
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
321
        if self.__doc__ is Command.__doc__:
322
            return None
323
        return getdoc(self)
324
325
    def name(self):
326
        return _unsquish_command_name(self.__class__.__name__)
327
1733.2.5 by Michael Ellerman
Show which plugin (if any) provides a command.
328
    def plugin_name(self):
329
        """Get the name of the plugin that provides this command.
330
331
        :return: The name of the plugin or None if the command is builtin.
332
        """
333
        mod_parts = self.__module__.split('.')
334
        if len(mod_parts) >= 3 and mod_parts[1] == 'plugins':
335
            return mod_parts[2]
336
        else:
337
            return None
338
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
339
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
340
# Technically, this function hasn't been use in a *really* long time
341
# but we are only deprecating it now.
342
@deprecated_function(zero_eleven)
493 by Martin Pool
- Merge aaron's merge command
343
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
344
    """
345
    >>> parse_spec(None)
346
    [None, None]
347
    >>> parse_spec("./")
348
    ['./', None]
349
    >>> parse_spec("../@")
350
    ['..', -1]
351
    >>> parse_spec("../f/@35")
352
    ['../f', 35]
897 by Martin Pool
- merge john's revision-naming code
353
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
354
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
622 by Martin Pool
Updated merge patch from Aaron
355
    """
356
    if spec is None:
357
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
358
    if '/@' in spec:
359
        parsed = spec.split('/@')
360
        assert len(parsed) == 2
361
        if parsed[1] == "":
362
            parsed[1] = -1
363
        else:
897 by Martin Pool
- merge john's revision-naming code
364
            try:
365
                parsed[1] = int(parsed[1])
366
            except ValueError:
367
                pass # We can allow stuff like ./@revid:blahblahblah
368
            else:
369
                assert parsed[1] >=0
493 by Martin Pool
- Merge aaron's merge command
370
    else:
371
        parsed = [spec, None]
372
    return parsed
373
1553.6.11 by Erik Bågfors
small bugfixes, all tests pass now
374
def parse_args(command, argv, alias_argv=None):
1 by mbp at sourcefrog
import from baz patch-364
375
    """Parse command line.
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
376
    
1 by mbp at sourcefrog
import from baz patch-364
377
    Arguments and options are parsed at this level before being passed
378
    down to specific command handlers.  This routine knows, from a
379
    lookup table, something about the available options, what optargs
380
    they take, and which commands will accept them.
381
    """
1857.1.1 by Aaron Bentley
Use optparse for parsing options
382
    # TODO: make it a method of the Command?
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
383
    parser = option.get_optparser(command.options())
1857.1.1 by Aaron Bentley
Use optparse for parsing options
384
    if alias_argv is not None:
385
        args = alias_argv + argv
386
    else:
387
        args = argv
683 by Martin Pool
- short option stacking patch from John A Meinel
388
1857.1.1 by Aaron Bentley
Use optparse for parsing options
389
    options, args = parser.parse_args(args)
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
390
    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
391
                 v is not option.OptionParser.DEFAULT_VALUE])
1 by mbp at sourcefrog
import from baz patch-364
392
    return args, opts
393
394
329 by Martin Pool
- refactor command functions into command classes
395
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
396
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
397
329 by Martin Pool
- refactor command functions into command classes
398
    # step through args and takes_args, allowing appropriate 0-many matches
399
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
400
        argname = ap[:-1]
401
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
402
            if args:
403
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
404
        elif ap[-1] == '*': # all remaining arguments
405
            if args:
406
                argdict[argname + '_list'] = args[:]
407
                args = []
408
            else:
409
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
410
        elif ap[-1] == '+':
411
            if not args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
412
                raise errors.BzrCommandError("command %r needs one or more %s"
413
                                             % (cmd, argname.upper()))
1 by mbp at sourcefrog
import from baz patch-364
414
            else:
415
                argdict[argname + '_list'] = args[:]
416
                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
417
        elif ap[-1] == '$': # all but one
418
            if len(args) < 2:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
419
                raise errors.BzrCommandError("command %r needs one or more %s"
420
                                             % (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
421
            argdict[argname + '_list'] = args[:-1]
1740.5.6 by Martin Pool
Clean up many exception classes.
422
            args[:-1] = []
1 by mbp at sourcefrog
import from baz patch-364
423
        else:
424
            # just a plain arg
425
            argname = ap
426
            if not args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
427
                raise errors.BzrCommandError("command %r requires argument %s"
428
                               % (cmd, argname.upper()))
1 by mbp at sourcefrog
import from baz patch-364
429
            else:
430
                argdict[argname] = args.pop(0)
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
431
            
1 by mbp at sourcefrog
import from baz patch-364
432
    if args:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
433
        raise errors.BzrCommandError("extra argument to command %s: %s"
434
                                     % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
435
436
    return argdict
437
438
439
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
440
def apply_profiled(the_callable, *args, **kwargs):
441
    import hotshot
442
    import tempfile
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
443
    import hotshot.stats
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
444
    pffileno, pfname = tempfile.mkstemp()
445
    try:
446
        prof = hotshot.Profile(pfname)
447
        try:
448
            ret = prof.runcall(the_callable, *args, **kwargs) or 0
449
        finally:
450
            prof.close()
451
        stats = hotshot.stats.load(pfname)
1393.1.27 by Martin Pool
- clean up profile code and change default sort order
452
        stats.strip_dirs()
453
        stats.sort_stats('cum')   # 'time'
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
454
        ## XXX: Might like to write to stderr or the trace file instead but
455
        ## print_stats seems hardcoded to stdout
456
        stats.print_stats(20)
457
        return ret
458
    finally:
459
        os.close(pffileno)
460
        os.remove(pfname)
461
462
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)
463
def apply_lsprofiled(filename, the_callable, *args, **kwargs):
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
464
    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)
465
    import cPickle
466
    ret, stats = profile(the_callable, *args, **kwargs)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
467
    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)
468
    if filename is None:
469
        stats.pprint()
470
    else:
471
        stats.freeze()
472
        cPickle.dump(stats, open(filename, 'w'), 2)
473
        print 'Profile data written to %r.' % filename
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
474
    return ret
475
1553.6.9 by Erik Bågfors
PEP8-ify
476
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
477
def get_alias(cmd, config=None):
478
    """Return an expanded alias, or None if no alias exists.
479
480
    cmd
481
        Command to be checked for an alias.
482
    config
483
        Used to specify an alternative config to use,
2155.2.3 by Marius Kruger
* commands.py
484
        which is especially useful for testing.
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
485
        If it is unspecified, the global config will be used.
486
    """
487
    if config is None:
488
        import bzrlib.config
489
        config = bzrlib.config.GlobalConfig()
490
    alias = config.get_alias(cmd)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
491
    if (alias):
2155.2.1 by Marius Kruger
* Get command aliases to respect quoted arguments.
492
        import shlex
493
        return [a.decode('utf-8') for a in shlex.split(alias.encode('utf-8'))]
1553.6.8 by Erik Bågfors
support for overrides
494
    return None
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
495
1553.6.9 by Erik Bågfors
PEP8-ify
496
1 by mbp at sourcefrog
import from baz patch-364
497
def run_bzr(argv):
498
    """Execute a command.
499
500
    This is similar to main(), but without all the trappings for
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
501
    logging and error handling.  
502
    
973 by Martin Pool
- various refactorings of command interpreter
503
    argv
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
504
       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.
505
       These should already be decoded. All library/test code calling
506
       run_bzr should be passing valid strings (don't need decoding).
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
507
    
973 by Martin Pool
- various refactorings of command interpreter
508
    Returns a command status or raises an exception.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
509
510
    Special master options: these must come before the command because
511
    they control how the command is interpreted.
512
513
    --no-plugins
514
        Do not load plugin modules at all
515
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
516
    --no-aliases
517
        Do not allow aliases
518
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
519
    --builtin
520
        Only use builtin commands.  (Plugins are still allowed to change
521
        other behaviour.)
522
523
    --profile
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
524
        Run under the Python hotshot profiler.
525
526
    --lsprof
527
        Run under the Python lsprof profiler.
1 by mbp at sourcefrog
import from baz patch-364
528
    """
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
529
    argv = list(argv)
2127.5.1 by mbp at sourcefrog
record command-line arguments in .bzr.log, drop some mutter statements
530
    trace.mutter("bzr arguments: %r", argv)
907.1.21 by John Arbash Meinel
Adding http transport as a valid transport protocol.
531
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
532
    opt_lsprof = opt_profile = opt_no_plugins = opt_builtin =  \
533
                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)
534
    opt_lsprof_file = None
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
535
536
    # --no-plugins is handled specially at a very early stage. We need
537
    # to load plugins before doing other command parsing so that they
538
    # can override commands, but this needs to happen first.
539
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)
540
    argv_copy = []
541
    i = 0
542
    while i < len(argv):
543
        a = argv[i]
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
544
        if a == '--profile':
545
            opt_profile = True
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
546
        elif a == '--lsprof':
547
            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)
548
        elif a == '--lsprof-file':
1706.2.6 by Robey Pointer
when giving --lsprof-file, assume --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
            opt_lsprof_file = argv[i + 1]
551
            i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
552
        elif a == '--no-plugins':
553
            opt_no_plugins = True
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
554
        elif a == '--no-aliases':
555
            opt_no_aliases = True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
556
        elif a == '--builtin':
557
            opt_builtin = True
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
558
        elif a in ('--quiet', '-q'):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
559
            trace.be_quiet()
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
560
        elif a.startswith('-D'):
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
561
            debug.debug_flags.add(a[2:])
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
562
        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)
563
            argv_copy.append(a)
564
        i += 1
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
565
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)
566
    argv = argv_copy
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
567
    if (not argv):
568
        from bzrlib.builtins import cmd_help
1558.14.2 by Aaron Bentley
Removed deprecation warning when bzr invoked with no arguments
569
        cmd_help().run_argv_aliases([])
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
570
        return 0
571
572
    if argv[0] == '--version':
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
573
        from bzrlib.version import show_version
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
574
        show_version()
575
        return 0
2172.1.1 by Aaron Bentley
Merge shell-like quote handling for aliases
576
        
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
577
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
578
        from bzrlib.plugin import load_plugins
579
        load_plugins()
1551.3.11 by Aaron Bentley
Merge from Robert
580
    else:
581
        from bzrlib.plugin import disable_plugins
582
        disable_plugins()
973 by Martin Pool
- various refactorings of command interpreter
583
1553.6.17 by Erik Bågfors
fix for broken --no-aliases
584
    alias_argv = None
585
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
586
    if not opt_no_aliases:
1553.6.8 by Erik Bågfors
support for overrides
587
        alias_argv = get_alias(argv[0])
588
        if alias_argv:
589
            alias_argv = [a.decode(bzrlib.user_encoding) for a in alias_argv]
590
            argv[0] = alias_argv.pop(0)
1553.6.1 by Erik Bågfors
support for aliases in bazaar.conf
591
1948.1.1 by John Arbash Meinel
Raise a reasonable error when a command is non-ascii
592
    cmd = argv.pop(0)
1948.1.10 by John Arbash Meinel
Simplify changes to command.py
593
    # We want only 'ascii' command names, but the user may have typed
594
    # in a Unicode name. In that case, they should just get a
595
    # 'command not found' error later.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
596
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
597
    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.
598
    if not getattr(cmd_obj.run_argv, 'is_deprecated', False):
599
        run = cmd_obj.run_argv
600
        run_argv = [argv]
601
    else:
602
        run = cmd_obj.run_argv_aliases
603
        run_argv = [argv, alias_argv]
1534.7.154 by Aaron Bentley
Removed changes from bzr.ab 1529..1536
604
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
605
    try:
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
606
        if opt_lsprof:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
607
            ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
608
        elif opt_profile:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
609
            ret = apply_profiled(run, *run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
610
        else:
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
611
            ret = run(*run_argv)
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
612
        return ret or 0
613
    finally:
614
        # 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
615
        trace.be_quiet(False)
267 by Martin Pool
- better reporting of errors
616
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
617
def display_command(func):
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
618
    """Decorator that suppresses pipe/interrupt errors."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
619
    def ignore_pipe(*args, **kwargs):
620
        try:
1185.35.22 by Aaron Bentley
Handled more pipe errors for display commands.
621
            result = func(*args, **kwargs)
622
            sys.stdout.flush()
623
            return result
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
624
        except IOError, e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
625
            if getattr(e, 'errno', None) is None:
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
626
                raise
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
627
            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
628
                # Win32 raises IOError with errno=0 on a broken pipe
629
                if sys.platform != 'win32' or e.errno != 0:
630
                    raise
1185.33.18 by Martin Pool
[patch] handle bad IOError subclass raised by urlopen
631
            pass
1185.12.69 by Aaron Bentley
Ignored ^C in display commands
632
        except KeyboardInterrupt:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
633
            pass
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
634
    return ignore_pipe
267 by Martin Pool
- better reporting of errors
635
1185.43.6 by Martin Pool
Enable logging early enough to save argv
636
1 by mbp at sourcefrog
import from baz patch-364
637
def main(argv):
1104 by Martin Pool
- Add a simple UIFactory
638
    import bzrlib.ui
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
639
    from bzrlib.ui.text import TextUIFactory
640
    bzrlib.ui.ui_factory = TextUIFactory()
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
641
    argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
642
    ret = run_bzr_catch_errors(argv)
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
643
    trace.mutter("return code %d", ret)
1185.43.6 by Martin Pool
Enable logging early enough to save argv
644
    return ret
1185.3.19 by Martin Pool
- split out commandline error reporting for ease of testing
645
646
647
def run_bzr_catch_errors(argv):
1 by mbp at sourcefrog
import from baz patch-364
648
    try:
1711.4.31 by John Arbash Meinel
Catch proper error instead of EPIPE on win32, also don't double flush
649
        return run_bzr(argv)
650
        # do this here inside the exception wrappers to catch EPIPE
651
        sys.stdout.flush()
2027.2.3 by Marien Zwart
Fix another python 2.5 issue.
652
    except (KeyboardInterrupt, Exception), e:
1185.33.19 by Martin Pool
Run postmortem debugger if BZR_PDB is set
653
        # used to handle AssertionError and KeyboardInterrupt
654
        # 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
655
        trace.report_exception(sys.exc_info(), sys.stderr)
1740.5.3 by Martin Pool
Cleanup more exception-formatting code
656
        if os.environ.get('BZR_PDB'):
657
            print '**** entering debugger'
658
            import pdb
659
            pdb.post_mortem(sys.exc_traceback)
660
        return 3
1 by mbp at sourcefrog
import from baz patch-364
661
662
if __name__ == '__main__':
663
    sys.exit(main(sys.argv))