/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
329 by Martin Pool
- refactor command functions into command classes
1
# Copyright (C) 2004, 2005 by Canonical Ltd
1 by mbp at sourcefrog
import from baz patch-364
2
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.
7
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.
12
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: Help messages for options.
22
23
# TODO: Define arguments by objects, rather than just using names.
24
# Those objects can specify the expected type of the argument, which
25
# would help with validation and shell completion.
26
27
1092.1.48 by Robert Collins
really merge mpool
28
# TODO: Help messages for options.
29
30
# TODO: Define arguments by objects, rather than just using names.
31
# Those objects can specify the expected type of the argument, which
32
# would help with validation and shell completion.
33
34
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
35
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
36
import sys
37
import os
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
38
from warnings import warn
39
from inspect import getdoc
1 by mbp at sourcefrog
import from baz patch-364
40
41
import bzrlib
1112 by Martin Pool
- disable standard logging to .bzr.log and stderr while running
42
import bzrlib.trace
897 by Martin Pool
- merge john's revision-naming code
43
from bzrlib.trace import mutter, note, log_error, warning
974.1.82 by Aaron Bentley
Handled NotBranchError like a CommandError in main()
44
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
45
from bzrlib.revisionspec import RevisionSpec
800 by Martin Pool
Merge John's import-speedup branch:
46
from bzrlib import BZRDIR
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
759 by Martin Pool
- fix up register_command() names
51
def register_command(cmd):
731 by Martin Pool
- merge plugin patch from john
52
    "Utility function to help register a command"
53
    global plugin_cmds
54
    k = cmd.__name__
55
    if k.startswith("cmd_"):
56
        k_unsquished = _unsquish_command_name(k)
57
    else:
58
        k_unsquished = k
59
    if not plugin_cmds.has_key(k_unsquished):
60
        plugin_cmds[k_unsquished] = cmd
1137 by Martin Pool
- additional trace messages for plugins
61
        mutter('registered plugin command %s', k_unsquished)      
731 by Martin Pool
- merge plugin patch from john
62
    else:
63
        log_error('Two plugins defined the same command: %r' % k)
64
        log_error('Not loading the one in %r' % sys.modules[cmd.__module__])
65
66
350 by Martin Pool
- refactor command aliases into command classes
67
def _squish_command_name(cmd):
68
    return 'cmd_' + cmd.replace('-', '_')
69
70
71
def _unsquish_command_name(cmd):
72
    assert cmd.startswith("cmd_")
73
    return cmd[4:].replace('_','-')
74
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
75
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
76
def _parse_revision_str(revstr):
914 by Martin Pool
- fix up breakage of 'bzr log -v' by root_id patch
77
    """This handles a revision string -> revno.
78
1185.2.5 by Lalo Martins
moving the 'revision spec' stuff out of the Branch class and into a new
79
    This always returns a list.  The list will have one element for
80
    each revision.
897 by Martin Pool
- merge john's revision-naming code
81
82
    >>> _parse_revision_str('234')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
83
    [<RevisionSpec_int 234>]
897 by Martin Pool
- merge john's revision-naming code
84
    >>> _parse_revision_str('234..567')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
85
    [<RevisionSpec_int 234>, <RevisionSpec_int 567>]
897 by Martin Pool
- merge john's revision-naming code
86
    >>> _parse_revision_str('..')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
87
    [<RevisionSpec None>, <RevisionSpec None>]
897 by Martin Pool
- merge john's revision-naming code
88
    >>> _parse_revision_str('..234')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
89
    [<RevisionSpec None>, <RevisionSpec_int 234>]
897 by Martin Pool
- merge john's revision-naming code
90
    >>> _parse_revision_str('234..')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
91
    [<RevisionSpec_int 234>, <RevisionSpec None>]
897 by Martin Pool
- merge john's revision-naming code
92
    >>> _parse_revision_str('234..456..789') # Maybe this should be an error
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
93
    [<RevisionSpec_int 234>, <RevisionSpec_int 456>, <RevisionSpec_int 789>]
897 by Martin Pool
- merge john's revision-naming code
94
    >>> _parse_revision_str('234....789') # Error?
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
95
    [<RevisionSpec_int 234>, <RevisionSpec None>, <RevisionSpec_int 789>]
897 by Martin Pool
- merge john's revision-naming code
96
    >>> _parse_revision_str('revid:test@other.com-234234')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
97
    [<RevisionSpec_revid revid:test@other.com-234234>]
897 by Martin Pool
- merge john's revision-naming code
98
    >>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
99
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
897 by Martin Pool
- merge john's revision-naming code
100
    >>> _parse_revision_str('revid:test@other.com-234234..23')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
101
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_int 23>]
897 by Martin Pool
- merge john's revision-naming code
102
    >>> _parse_revision_str('date:2005-04-12')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
103
    [<RevisionSpec_date date:2005-04-12>]
897 by Martin Pool
- merge john's revision-naming code
104
    >>> _parse_revision_str('date:2005-04-12 12:24:33')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
105
    [<RevisionSpec_date date:2005-04-12 12:24:33>]
897 by Martin Pool
- merge john's revision-naming code
106
    >>> _parse_revision_str('date:2005-04-12T12:24:33')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
107
    [<RevisionSpec_date date:2005-04-12T12:24:33>]
897 by Martin Pool
- merge john's revision-naming code
108
    >>> _parse_revision_str('date:2005-04-12,12:24:33')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
109
    [<RevisionSpec_date date:2005-04-12,12:24:33>]
897 by Martin Pool
- merge john's revision-naming code
110
    >>> _parse_revision_str('-5..23')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
111
    [<RevisionSpec_int -5>, <RevisionSpec_int 23>]
897 by Martin Pool
- merge john's revision-naming code
112
    >>> _parse_revision_str('-5')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
113
    [<RevisionSpec_int -5>]
897 by Martin Pool
- merge john's revision-naming code
114
    >>> _parse_revision_str('123a')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
115
    Traceback (most recent call last):
116
      ...
117
    BzrError: No namespace registered for string: '123a'
897 by Martin Pool
- merge john's revision-naming code
118
    >>> _parse_revision_str('abc')
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
119
    Traceback (most recent call last):
120
      ...
121
    BzrError: No namespace registered for string: 'abc'
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
122
    """
897 by Martin Pool
- merge john's revision-naming code
123
    import re
124
    old_format_re = re.compile('\d*:\d*')
125
    m = old_format_re.match(revstr)
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
126
    revs = []
897 by Martin Pool
- merge john's revision-naming code
127
    if m:
128
        warning('Colon separator for revision numbers is deprecated.'
129
                ' Use .. instead')
130
        for rev in revstr.split(':'):
131
            if rev:
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
132
                revs.append(RevisionSpec(int(rev)))
133
            else:
134
                revs.append(RevisionSpec(None))
135
    else:
136
        for x in revstr.split('..'):
137
            if not x:
138
                revs.append(RevisionSpec(None))
139
            else:
140
                revs.append(RevisionSpec(x))
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
141
    return revs
142
731 by Martin Pool
- merge plugin patch from john
143
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
144
def _builtin_commands():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
145
    import bzrlib.builtins
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
146
    r = {}
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
147
    builtins = bzrlib.builtins.__dict__
148
    for name in builtins:
149
        if name.startswith("cmd_"):
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
150
            real_name = _unsquish_command_name(name)        
151
            r[real_name] = builtins[name]
152
    return r
153
154
            
155
156
def builtin_command_names():
157
    """Return list of builtin command names."""
158
    return _builtin_commands().keys()
159
    
160
161
def plugin_command_names():
162
    return plugin_cmds.keys()
163
164
165
def _get_cmd_dict(plugins_override=True):
166
    """Return name->class mapping for all commands."""
167
    d = _builtin_commands()
731 by Martin Pool
- merge plugin patch from john
168
    if plugins_override:
169
        d.update(plugin_cmds)
641 by Martin Pool
- improved external-command patch from john
170
    return d
731 by Martin Pool
- merge plugin patch from john
171
641 by Martin Pool
- improved external-command patch from john
172
    
731 by Martin Pool
- merge plugin patch from john
173
def get_all_cmds(plugins_override=True):
641 by Martin Pool
- improved external-command patch from john
174
    """Return canonical name and class for all registered commands."""
731 by Martin Pool
- merge plugin patch from john
175
    for k, v in _get_cmd_dict(plugins_override=plugins_override).iteritems():
641 by Martin Pool
- improved external-command patch from john
176
        yield k,v
177
178
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
179
def get_cmd_object(cmd_name, plugins_override=True):
350 by Martin Pool
- refactor command aliases into command classes
180
    """Return the canonical name and command class for a command.
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
181
182
    plugins_override
183
        If true, plugin commands can override builtins.
350 by Martin Pool
- refactor command aliases into command classes
184
    """
1163 by Martin Pool
- split ExternalCommand class into its own file
185
    from bzrlib.externalcommand import ExternalCommand
186
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
187
    cmd_name = str(cmd_name)            # not unicode
350 by Martin Pool
- refactor command aliases into command classes
188
189
    # first look up this command under the specified name
731 by Martin Pool
- merge plugin patch from john
190
    cmds = _get_cmd_dict(plugins_override=plugins_override)
272 by Martin Pool
- Add command aliases
191
    try:
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
192
        return cmds[cmd_name]()
272 by Martin Pool
- Add command aliases
193
    except KeyError:
350 by Martin Pool
- refactor command aliases into command classes
194
        pass
195
196
    # look for any command which claims this as an alias
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
197
    for real_cmd_name, cmd_class in cmds.iteritems():
198
        if cmd_name in cmd_class.aliases:
199
            return cmd_class()
200
201
    cmd_obj = ExternalCommand.find_command(cmd_name)
202
    if cmd_obj:
203
        return cmd_obj
204
205
    raise BzrCommandError("unknown command %r" % cmd_name)
272 by Martin Pool
- Add command aliases
206
329 by Martin Pool
- refactor command functions into command classes
207
558 by Martin Pool
- All top-level classes inherit from object
208
class Command(object):
329 by Martin Pool
- refactor command functions into command classes
209
    """Base class for commands.
210
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
211
    Commands are the heart of the command-line bzr interface.
212
213
    The command object mostly handles the mapping of command-line
214
    parameters into one or more bzrlib operations, and of the results
215
    into textual output.
216
217
    Commands normally don't have any state.  All their arguments are
218
    passed in to the run method.  (Subclasses may take a different
219
    policy if the behaviour of the instance needs to depend on e.g. a
220
    shell plugin and not just its Python class.)
221
329 by Martin Pool
- refactor command functions into command classes
222
    The docstring for an actual command should give a single-line
223
    summary, then a complete description of the command.  A grammar
224
    description will be inserted.
225
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
226
    aliases
227
        Other accepted names for this command.
228
329 by Martin Pool
- refactor command functions into command classes
229
    takes_args
230
        List of argument forms, marked with whether they are optional,
231
        repeated, etc.
232
233
    takes_options
234
        List of options that may be given for this command.
235
236
    hidden
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
237
        If true, this command isn't advertised.  This is typically
238
        for commands intended for expert users.
329 by Martin Pool
- refactor command functions into command classes
239
    """
240
    aliases = []
241
    
242
    takes_args = []
243
    takes_options = []
244
245
    hidden = False
246
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
247
    def __init__(self):
248
        """Construct an instance of this command."""
973 by Martin Pool
- various refactorings of command interpreter
249
        if self.__doc__ == Command.__doc__:
250
            warn("No help message set for %r" % self)
329 by Martin Pool
- refactor command functions into command classes
251
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
252
253
    def run_argv(self, argv):
254
        """Parse command line and run."""
255
        args, opts = parse_args(argv)
256
257
        if 'help' in opts:  # e.g. bzr add --help
258
            from bzrlib.help import help_on_command
259
            help_on_command(self.name())
260
            return 0
261
262
        # check options are reasonable
263
        allowed = self.takes_options
264
        for oname in opts:
265
            if oname not in allowed:
266
                raise BzrCommandError("option '--%s' is not allowed for command %r"
267
                                      % (oname, self.name()))
268
269
        # mix arguments and options into one dictionary
270
        cmdargs = _match_argform(self.name(), self.takes_args, args)
271
        cmdopts = {}
272
        for k, v in opts.items():
273
            cmdopts[k.replace('-', '_')] = v
274
275
        all_cmd_args = cmdargs.copy()
276
        all_cmd_args.update(cmdopts)
277
278
        return self.run(**all_cmd_args)
279
329 by Martin Pool
- refactor command functions into command classes
280
    
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
281
    def run(self):
282
        """Actually run the command.
329 by Martin Pool
- refactor command functions into command classes
283
284
        This is invoked with the options and arguments bound to
285
        keyword parameters.
286
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
287
        Return 0 or None if the command was successful, or a non-zero
288
        shell error code if not.  It's OK for this method to allow
289
        an exception to raise up.
329 by Martin Pool
- refactor command functions into command classes
290
        """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
291
        raise NotImplementedError()
329 by Martin Pool
- refactor command functions into command classes
292
293
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
294
    def help(self):
295
        """Return help message for this class."""
296
        if self.__doc__ is Command.__doc__:
297
            return None
298
        return getdoc(self)
299
300
    def name(self):
301
        return _unsquish_command_name(self.__class__.__name__)
302
303
493 by Martin Pool
- Merge aaron's merge command
304
def parse_spec(spec):
622 by Martin Pool
Updated merge patch from Aaron
305
    """
306
    >>> parse_spec(None)
307
    [None, None]
308
    >>> parse_spec("./")
309
    ['./', None]
310
    >>> parse_spec("../@")
311
    ['..', -1]
312
    >>> parse_spec("../f/@35")
313
    ['../f', 35]
897 by Martin Pool
- merge john's revision-naming code
314
    >>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')
315
    ['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']
622 by Martin Pool
Updated merge patch from Aaron
316
    """
317
    if spec is None:
318
        return [None, None]
493 by Martin Pool
- Merge aaron's merge command
319
    if '/@' in spec:
320
        parsed = spec.split('/@')
321
        assert len(parsed) == 2
322
        if parsed[1] == "":
323
            parsed[1] = -1
324
        else:
897 by Martin Pool
- merge john's revision-naming code
325
            try:
326
                parsed[1] = int(parsed[1])
327
            except ValueError:
328
                pass # We can allow stuff like ./@revid:blahblahblah
329
            else:
330
                assert parsed[1] >=0
493 by Martin Pool
- Merge aaron's merge command
331
    else:
332
        parsed = [spec, None]
333
    return parsed
334
628 by Martin Pool
- merge aaron's updated merge/pull code
335
1 by mbp at sourcefrog
import from baz patch-364
336
# list of all available options; the rhs can be either None for an
337
# option that takes no argument, or a constructor function that checks
338
# the type.
339
OPTIONS = {
340
    'all':                    None,
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
341
    'basis':                  str,
571 by Martin Pool
- new --diff-options to pass options through to external
342
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
343
    'help':                   None,
389 by Martin Pool
- new commit --file option!
344
    'file':                   unicode,
628 by Martin Pool
- merge aaron's updated merge/pull code
345
    'force':                  None,
678 by Martin Pool
- export to tarballs
346
    'format':                 unicode,
545 by Martin Pool
- --forward option for log
347
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
348
    'message':                unicode,
594 by Martin Pool
- add --no-recurse option for add command
349
    'no-recurse':             None,
137 by mbp at sourcefrog
new --profile option
350
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
351
    'revision':               _parse_revision_str,
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
352
    'short':                  None,
1 by mbp at sourcefrog
import from baz patch-364
353
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
354
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
355
    'verbose':                None,
356
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
357
    'email':                  None,
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
358
    'unchanged':              None,
674 by Martin Pool
- check command now also checks new inventory_sha1 and
359
    'update':                 None,
807 by Martin Pool
- New log --long option
360
    'long':                   None,
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
361
    'root':                   str,
974.1.8 by Aaron Bentley
Added default backups for merge-revert
362
    'no-backup':              None,
1092.1.20 by Robert Collins
import and use TestUtil to do regex based partial test runs
363
    'pattern':                str,
1 by mbp at sourcefrog
import from baz patch-364
364
    }
365
366
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
367
    'F':                      'file', 
368
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
369
    'm':                      'message',
370
    'r':                      'revision',
371
    'v':                      'verbose',
807 by Martin Pool
- New log --long option
372
    'l':                      'long',
1 by mbp at sourcefrog
import from baz patch-364
373
}
374
375
376
def parse_args(argv):
377
    """Parse command line.
378
    
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
31 by Martin Pool
fix up parse_args doctest
384
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
385
    ([], {'help': True})
1144 by Martin Pool
- accept -- to terminate options
386
    >>> parse_args('help -- --invalidcmd'.split())
387
    (['help', '--invalidcmd'], {})
31 by Martin Pool
fix up parse_args doctest
388
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
389
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
390
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
391
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
392
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
393
    (['commit'], {'message': u'biter'})
683 by Martin Pool
- short option stacking patch from John A Meinel
394
    >>> parse_args('log -r 500'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
395
    (['log'], {'revision': [<RevisionSpec_int 500>]})
897 by Martin Pool
- merge john's revision-naming code
396
    >>> parse_args('log -r500..600'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
397
    (['log'], {'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
897 by Martin Pool
- merge john's revision-naming code
398
    >>> parse_args('log -vr500..600'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
399
    (['log'], {'verbose': True, 'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
400
    >>> parse_args('log -rrevno:500..600'.split()) #the r takes an argument
401
    (['log'], {'revision': [<RevisionSpec_revno revno:500>, <RevisionSpec_int 600>]})
1 by mbp at sourcefrog
import from baz patch-364
402
    """
403
    args = []
404
    opts = {}
405
1144 by Martin Pool
- accept -- to terminate options
406
    argsover = False
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
407
    while argv:
408
        a = argv.pop(0)
1144 by Martin Pool
- accept -- to terminate options
409
        if not argsover and a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
410
            # option names must not be unicode
411
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
412
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
413
            if a[1] == '-':
1144 by Martin Pool
- accept -- to terminate options
414
                if a == '--':
415
                    # We've received a standalone -- No more flags
416
                    argsover = True
417
                    continue
1 by mbp at sourcefrog
import from baz patch-364
418
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
419
                if '=' in a:
420
                    optname, optarg = a[2:].split('=', 1)
421
                else:
422
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
423
                if optname not in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
424
                    raise BzrError('unknown long option %r' % a)
1 by mbp at sourcefrog
import from baz patch-364
425
            else:
426
                shortopt = a[1:]
683 by Martin Pool
- short option stacking patch from John A Meinel
427
                if shortopt in SHORT_OPTIONS:
428
                    # Multi-character options must have a space to delimit
429
                    # their value
430
                    optname = SHORT_OPTIONS[shortopt]
431
                else:
432
                    # Single character short options, can be chained,
433
                    # and have their value appended to their name
434
                    shortopt = a[1:2]
435
                    if shortopt not in SHORT_OPTIONS:
436
                        # We didn't find the multi-character name, and we
437
                        # didn't find the single char name
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
438
                        raise BzrError('unknown short option %r' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
439
                    optname = SHORT_OPTIONS[shortopt]
440
441
                    if a[2:]:
442
                        # There are extra things on this option
443
                        # see if it is the value, or if it is another
444
                        # short option
445
                        optargfn = OPTIONS[optname]
446
                        if optargfn is None:
447
                            # This option does not take an argument, so the
448
                            # next entry is another short option, pack it back
449
                            # into the list
450
                            argv.insert(0, '-' + a[2:])
451
                        else:
452
                            # This option takes an argument, so pack it
453
                            # into the array
454
                            optarg = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
455
            
456
            if optname in opts:
457
                # XXX: Do we ever want to support this, e.g. for -r?
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
458
                raise BzrError('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
459
                
1 by mbp at sourcefrog
import from baz patch-364
460
            optargfn = OPTIONS[optname]
461
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
462
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
463
                    if not argv:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
464
                        raise BzrError('option %r needs an argument' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
465
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
466
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
467
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
468
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
469
                if optarg != None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
470
                    raise BzrError('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
471
                opts[optname] = True
472
        else:
473
            args.append(a)
474
475
    return args, opts
476
477
478
479
329 by Martin Pool
- refactor command functions into command classes
480
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
481
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
482
329 by Martin Pool
- refactor command functions into command classes
483
    # step through args and takes_args, allowing appropriate 0-many matches
484
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
485
        argname = ap[:-1]
486
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
487
            if args:
488
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
489
        elif ap[-1] == '*': # all remaining arguments
490
            if args:
491
                argdict[argname + '_list'] = args[:]
492
                args = []
493
            else:
494
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
495
        elif ap[-1] == '+':
496
            if not args:
329 by Martin Pool
- refactor command functions into command classes
497
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
498
                        % (cmd, argname.upper()))
499
            else:
500
                argdict[argname + '_list'] = args[:]
501
                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
502
        elif ap[-1] == '$': # all but one
503
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
504
                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
505
                        % (cmd, argname.upper()))
506
            argdict[argname + '_list'] = args[:-1]
507
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
508
        else:
509
            # just a plain arg
510
            argname = ap
511
            if not args:
329 by Martin Pool
- refactor command functions into command classes
512
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
513
                        % (cmd, argname.upper()))
514
            else:
515
                argdict[argname] = args.pop(0)
516
            
517
    if args:
329 by Martin Pool
- refactor command functions into command classes
518
        raise BzrCommandError("extra argument to command %s: %s"
519
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
520
521
    return argdict
522
523
524
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
525
def apply_profiled(the_callable, *args, **kwargs):
526
    import hotshot
527
    import tempfile
528
    pffileno, pfname = tempfile.mkstemp()
529
    try:
530
        prof = hotshot.Profile(pfname)
531
        try:
532
            ret = prof.runcall(the_callable, *args, **kwargs) or 0
533
        finally:
534
            prof.close()
535
536
        import hotshot.stats
537
        stats = hotshot.stats.load(pfname)
538
        #stats.strip_dirs()
539
        stats.sort_stats('time')
540
        ## XXX: Might like to write to stderr or the trace file instead but
541
        ## print_stats seems hardcoded to stdout
542
        stats.print_stats(20)
543
544
        return ret
545
    finally:
546
        os.close(pffileno)
547
        os.remove(pfname)
548
549
1 by mbp at sourcefrog
import from baz patch-364
550
def run_bzr(argv):
551
    """Execute a command.
552
553
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
554
    logging and error handling.  
973 by Martin Pool
- various refactorings of command interpreter
555
    
556
    argv
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
557
       The command-line arguments, without the program name from argv[0]
973 by Martin Pool
- various refactorings of command interpreter
558
    
559
    Returns a command status or raises an exception.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
560
561
    Special master options: these must come before the command because
562
    they control how the command is interpreted.
563
564
    --no-plugins
565
        Do not load plugin modules at all
566
567
    --builtin
568
        Only use builtin commands.  (Plugins are still allowed to change
569
        other behaviour.)
570
571
    --profile
572
        Run under the Python profiler.
1 by mbp at sourcefrog
import from baz patch-364
573
    """
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
574
    
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
575
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
973 by Martin Pool
- various refactorings of command interpreter
576
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
577
    opt_profile = opt_no_plugins = opt_builtin = False
578
579
    # --no-plugins is handled specially at a very early stage. We need
580
    # to load plugins before doing other command parsing so that they
581
    # can override commands, but this needs to happen first.
582
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
583
    for a in argv:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
584
        if a == '--profile':
585
            opt_profile = True
586
        elif a == '--no-plugins':
587
            opt_no_plugins = True
588
        elif a == '--builtin':
589
            opt_builtin = True
590
        else:
591
            break
592
        argv.remove(a)
593
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
594
    if (not argv) or (argv[0] == '--help'):
595
        from bzrlib.help import help
596
        if len(argv) > 1:
597
            help(argv[1])
598
        else:
599
            help()
600
        return 0
601
602
    if argv[0] == '--version':
603
        from bzrlib.builtins import show_version
604
        show_version()
605
        return 0
606
        
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
607
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
608
        from bzrlib.plugin import load_plugins
609
        load_plugins()
610
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
611
    cmd = str(argv.pop(0))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
612
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
613
    cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
1 by mbp at sourcefrog
import from baz patch-364
614
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
615
    if opt_profile:
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
616
        ret = apply_profiled(cmd_obj.run_argv, argv)
137 by mbp at sourcefrog
new --profile option
617
    else:
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
618
        ret = cmd_obj.run_argv(argv)
619
    return ret or 0
1 by mbp at sourcefrog
import from baz patch-364
620
621
622
def main(argv):
1104 by Martin Pool
- Add a simple UIFactory
623
    import bzrlib.ui
1111 by Martin Pool
- add functions to enable and disable default logging, so that we can
624
    bzrlib.trace.log_startup(argv)
1104 by Martin Pool
- Add a simple UIFactory
625
    bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
626
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
627
    return run_bzr_catch_errors(argv[1:])
1185.3.19 by Martin Pool
- split out commandline error reporting for ease of testing
628
629
630
def run_bzr_catch_errors(argv):
1 by mbp at sourcefrog
import from baz patch-364
631
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
632
        try:
974.1.82 by Aaron Bentley
Handled NotBranchError like a CommandError in main()
633
            try:
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
634
                return run_bzr(argv)
974.1.82 by Aaron Bentley
Handled NotBranchError like a CommandError in main()
635
            finally:
636
                # do this here inside the exception wrappers to catch EPIPE
637
                sys.stdout.flush()
638
        #wrap common errors as CommandErrors.
639
        except (NotBranchError,), e:
640
            raise BzrCommandError(str(e))
1097 by Martin Pool
- send trace messages out through python logging module
641
    except BzrCommandError, e:
642
        # command line syntax error, etc
643
        log_error(str(e))
644
        return 1
645
    except BzrError, e:
646
        bzrlib.trace.log_exception()
647
        return 1
648
    except AssertionError, e:
649
        bzrlib.trace.log_exception('assertion failed: ' + str(e))
650
        return 3
651
    except KeyboardInterrupt, e:
1360 by Martin Pool
- give possible traceback when interrupted
652
        bzrlib.trace.log_exception('interrupted')
1097 by Martin Pool
- send trace messages out through python logging module
653
        return 2
654
    except Exception, e:
655
        import errno
656
        if (isinstance(e, IOError) 
657
            and hasattr(e, 'errno')
658
            and e.errno == errno.EPIPE):
659
            bzrlib.trace.note('broken pipe')
660
            return 2
661
        else:
1108 by Martin Pool
- more cleanups of error reporting
662
            bzrlib.trace.log_exception()
1097 by Martin Pool
- send trace messages out through python logging module
663
            return 2
1 by mbp at sourcefrog
import from baz patch-364
664
665
666
if __name__ == '__main__':
667
    sys.exit(main(sys.argv))