~bzr-pqm/bzr/bzr.dev

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,
571 by Martin Pool
- new --diff-options to pass options through to external
341
    'diff-options':           str,
1 by mbp at sourcefrog
import from baz patch-364
342
    'help':                   None,
389 by Martin Pool
- new commit --file option!
343
    'file':                   unicode,
628 by Martin Pool
- merge aaron's updated merge/pull code
344
    'force':                  None,
678 by Martin Pool
- export to tarballs
345
    'format':                 unicode,
545 by Martin Pool
- --forward option for log
346
    'forward':                None,
1 by mbp at sourcefrog
import from baz patch-364
347
    'message':                unicode,
594 by Martin Pool
- add --no-recurse option for add command
348
    'no-recurse':             None,
137 by mbp at sourcefrog
new --profile option
349
    'profile':                None,
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
350
    'revision':               _parse_revision_str,
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
351
    'short':                  None,
1 by mbp at sourcefrog
import from baz patch-364
352
    'show-ids':               None,
12 by mbp at sourcefrog
new --timezone option for bzr log
353
    'timezone':               str,
1 by mbp at sourcefrog
import from baz patch-364
354
    'verbose':                None,
355
    'version':                None,
286 by Martin Pool
- New bzr whoami --email option
356
    'email':                  None,
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
357
    'unchanged':              None,
674 by Martin Pool
- check command now also checks new inventory_sha1 and
358
    'update':                 None,
807 by Martin Pool
- New log --long option
359
    'long':                   None,
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
360
    'root':                   str,
974.1.8 by Aaron Bentley
Added default backups for merge-revert
361
    'no-backup':              None,
1092.1.20 by Robert Collins
import and use TestUtil to do regex based partial test runs
362
    'pattern':                str,
1 by mbp at sourcefrog
import from baz patch-364
363
    }
364
365
SHORT_OPTIONS = {
583 by Martin Pool
- add -h as short name for --help
366
    'F':                      'file', 
367
    'h':                      'help',
1 by mbp at sourcefrog
import from baz patch-364
368
    'm':                      'message',
369
    'r':                      'revision',
370
    'v':                      'verbose',
807 by Martin Pool
- New log --long option
371
    'l':                      'long',
1 by mbp at sourcefrog
import from baz patch-364
372
}
373
374
375
def parse_args(argv):
376
    """Parse command line.
377
    
378
    Arguments and options are parsed at this level before being passed
379
    down to specific command handlers.  This routine knows, from a
380
    lookup table, something about the available options, what optargs
381
    they take, and which commands will accept them.
382
31 by Martin Pool
fix up parse_args doctest
383
    >>> parse_args('--help'.split())
1 by mbp at sourcefrog
import from baz patch-364
384
    ([], {'help': True})
1144 by Martin Pool
- accept -- to terminate options
385
    >>> parse_args('help -- --invalidcmd'.split())
386
    (['help', '--invalidcmd'], {})
31 by Martin Pool
fix up parse_args doctest
387
    >>> parse_args('--version'.split())
1 by mbp at sourcefrog
import from baz patch-364
388
    ([], {'version': True})
31 by Martin Pool
fix up parse_args doctest
389
    >>> parse_args('status --all'.split())
1 by mbp at sourcefrog
import from baz patch-364
390
    (['status'], {'all': True})
31 by Martin Pool
fix up parse_args doctest
391
    >>> parse_args('commit --message=biter'.split())
17 by mbp at sourcefrog
allow --option=ARG syntax
392
    (['commit'], {'message': u'biter'})
683 by Martin Pool
- short option stacking patch from John A Meinel
393
    >>> parse_args('log -r 500'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
394
    (['log'], {'revision': [<RevisionSpec_int 500>]})
897 by Martin Pool
- merge john's revision-naming code
395
    >>> parse_args('log -r500..600'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
396
    (['log'], {'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
897 by Martin Pool
- merge john's revision-naming code
397
    >>> parse_args('log -vr500..600'.split())
1185.2.14 by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py
398
    (['log'], {'verbose': True, 'revision': [<RevisionSpec_int 500>, <RevisionSpec_int 600>]})
399
    >>> parse_args('log -rrevno:500..600'.split()) #the r takes an argument
400
    (['log'], {'revision': [<RevisionSpec_revno revno:500>, <RevisionSpec_int 600>]})
1 by mbp at sourcefrog
import from baz patch-364
401
    """
402
    args = []
403
    opts = {}
404
1144 by Martin Pool
- accept -- to terminate options
405
    argsover = False
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
406
    while argv:
407
        a = argv.pop(0)
1144 by Martin Pool
- accept -- to terminate options
408
        if not argsover and a[0] == '-':
264 by Martin Pool
parse_args: option names must be ascii
409
            # option names must not be unicode
410
            a = str(a)
17 by mbp at sourcefrog
allow --option=ARG syntax
411
            optarg = None
1 by mbp at sourcefrog
import from baz patch-364
412
            if a[1] == '-':
1144 by Martin Pool
- accept -- to terminate options
413
                if a == '--':
414
                    # We've received a standalone -- No more flags
415
                    argsover = True
416
                    continue
1 by mbp at sourcefrog
import from baz patch-364
417
                mutter("  got option %r" % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
418
                if '=' in a:
419
                    optname, optarg = a[2:].split('=', 1)
420
                else:
421
                    optname = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
422
                if optname not in OPTIONS:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
423
                    raise BzrError('unknown long option %r' % a)
1 by mbp at sourcefrog
import from baz patch-364
424
            else:
425
                shortopt = a[1:]
683 by Martin Pool
- short option stacking patch from John A Meinel
426
                if shortopt in SHORT_OPTIONS:
427
                    # Multi-character options must have a space to delimit
428
                    # their value
429
                    optname = SHORT_OPTIONS[shortopt]
430
                else:
431
                    # Single character short options, can be chained,
432
                    # and have their value appended to their name
433
                    shortopt = a[1:2]
434
                    if shortopt not in SHORT_OPTIONS:
435
                        # We didn't find the multi-character name, and we
436
                        # didn't find the single char name
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
437
                        raise BzrError('unknown short option %r' % a)
683 by Martin Pool
- short option stacking patch from John A Meinel
438
                    optname = SHORT_OPTIONS[shortopt]
439
440
                    if a[2:]:
441
                        # There are extra things on this option
442
                        # see if it is the value, or if it is another
443
                        # short option
444
                        optargfn = OPTIONS[optname]
445
                        if optargfn is None:
446
                            # This option does not take an argument, so the
447
                            # next entry is another short option, pack it back
448
                            # into the list
449
                            argv.insert(0, '-' + a[2:])
450
                        else:
451
                            # This option takes an argument, so pack it
452
                            # into the array
453
                            optarg = a[2:]
1 by mbp at sourcefrog
import from baz patch-364
454
            
455
            if optname in opts:
456
                # 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
457
                raise BzrError('repeated option %r' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
458
                
1 by mbp at sourcefrog
import from baz patch-364
459
            optargfn = OPTIONS[optname]
460
            if optargfn:
17 by mbp at sourcefrog
allow --option=ARG syntax
461
                if optarg == None:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
462
                    if not argv:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
463
                        raise BzrError('option %r needs an argument' % a)
17 by mbp at sourcefrog
allow --option=ARG syntax
464
                    else:
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
465
                        optarg = argv.pop(0)
17 by mbp at sourcefrog
allow --option=ARG syntax
466
                opts[optname] = optargfn(optarg)
1 by mbp at sourcefrog
import from baz patch-364
467
            else:
17 by mbp at sourcefrog
allow --option=ARG syntax
468
                if optarg != None:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
469
                    raise BzrError('option %r takes no argument' % optname)
1 by mbp at sourcefrog
import from baz patch-364
470
                opts[optname] = True
471
        else:
472
            args.append(a)
473
474
    return args, opts
475
476
477
478
329 by Martin Pool
- refactor command functions into command classes
479
def _match_argform(cmd, takes_args, args):
1 by mbp at sourcefrog
import from baz patch-364
480
    argdict = {}
26 by mbp at sourcefrog
fix StopIteration error on python2.3(?)
481
329 by Martin Pool
- refactor command functions into command classes
482
    # step through args and takes_args, allowing appropriate 0-many matches
483
    for ap in takes_args:
1 by mbp at sourcefrog
import from baz patch-364
484
        argname = ap[:-1]
485
        if ap[-1] == '?':
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
486
            if args:
487
                argdict[argname] = args.pop(0)
196 by mbp at sourcefrog
selected-file diff
488
        elif ap[-1] == '*': # all remaining arguments
489
            if args:
490
                argdict[argname + '_list'] = args[:]
491
                args = []
492
            else:
493
                argdict[argname + '_list'] = None
1 by mbp at sourcefrog
import from baz patch-364
494
        elif ap[-1] == '+':
495
            if not args:
329 by Martin Pool
- refactor command functions into command classes
496
                raise BzrCommandError("command %r needs one or more %s"
1 by mbp at sourcefrog
import from baz patch-364
497
                        % (cmd, argname.upper()))
498
            else:
499
                argdict[argname + '_list'] = args[:]
500
                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
501
        elif ap[-1] == '$': # all but one
502
            if len(args) < 2:
329 by Martin Pool
- refactor command functions into command classes
503
                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
504
                        % (cmd, argname.upper()))
505
            argdict[argname + '_list'] = args[:-1]
506
            args[:-1] = []                
1 by mbp at sourcefrog
import from baz patch-364
507
        else:
508
            # just a plain arg
509
            argname = ap
510
            if not args:
329 by Martin Pool
- refactor command functions into command classes
511
                raise BzrCommandError("command %r requires argument %s"
1 by mbp at sourcefrog
import from baz patch-364
512
                        % (cmd, argname.upper()))
513
            else:
514
                argdict[argname] = args.pop(0)
515
            
516
    if args:
329 by Martin Pool
- refactor command functions into command classes
517
        raise BzrCommandError("extra argument to command %s: %s"
518
                              % (cmd, args[0]))
1 by mbp at sourcefrog
import from baz patch-364
519
520
    return argdict
521
522
523
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
524
def apply_profiled(the_callable, *args, **kwargs):
525
    import hotshot
526
    import tempfile
527
    pffileno, pfname = tempfile.mkstemp()
528
    try:
529
        prof = hotshot.Profile(pfname)
530
        try:
531
            ret = prof.runcall(the_callable, *args, **kwargs) or 0
532
        finally:
533
            prof.close()
534
535
        import hotshot.stats
536
        stats = hotshot.stats.load(pfname)
537
        #stats.strip_dirs()
538
        stats.sort_stats('time')
539
        ## XXX: Might like to write to stderr or the trace file instead but
540
        ## print_stats seems hardcoded to stdout
541
        stats.print_stats(20)
542
543
        return ret
544
    finally:
545
        os.close(pffileno)
546
        os.remove(pfname)
547
548
1 by mbp at sourcefrog
import from baz patch-364
549
def run_bzr(argv):
550
    """Execute a command.
551
552
    This is similar to main(), but without all the trappings for
245 by mbp at sourcefrog
- control files always in utf-8-unix format
553
    logging and error handling.  
973 by Martin Pool
- various refactorings of command interpreter
554
    
555
    argv
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
556
       The command-line arguments, without the program name from argv[0]
973 by Martin Pool
- various refactorings of command interpreter
557
    
558
    Returns a command status or raises an exception.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
559
560
    Special master options: these must come before the command because
561
    they control how the command is interpreted.
562
563
    --no-plugins
564
        Do not load plugin modules at all
565
566
    --builtin
567
        Only use builtin commands.  (Plugins are still allowed to change
568
        other behaviour.)
569
570
    --profile
571
        Run under the Python profiler.
1 by mbp at sourcefrog
import from baz patch-364
572
    """
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
573
    
251 by mbp at sourcefrog
- factor out locale.getpreferredencoding()
574
    argv = [a.decode(bzrlib.user_encoding) for a in argv]
973 by Martin Pool
- various refactorings of command interpreter
575
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
576
    opt_profile = opt_no_plugins = opt_builtin = False
577
578
    # --no-plugins is handled specially at a very early stage. We need
579
    # to load plugins before doing other command parsing so that they
580
    # can override commands, but this needs to happen first.
581
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
582
    for a in argv:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
583
        if a == '--profile':
584
            opt_profile = True
585
        elif a == '--no-plugins':
586
            opt_no_plugins = True
587
        elif a == '--builtin':
588
            opt_builtin = True
589
        else:
590
            break
591
        argv.remove(a)
592
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
593
    if (not argv) or (argv[0] == '--help'):
594
        from bzrlib.help import help
595
        if len(argv) > 1:
596
            help(argv[1])
597
        else:
598
            help()
599
        return 0
600
601
    if argv[0] == '--version':
602
        from bzrlib.builtins import show_version
603
        show_version()
604
        return 0
605
        
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
606
    if not opt_no_plugins:
973 by Martin Pool
- various refactorings of command interpreter
607
        from bzrlib.plugin import load_plugins
608
        load_plugins()
609
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
610
    cmd = str(argv.pop(0))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
611
1162 by Martin Pool
- change Command infrastructure to use (mostly stateless) objects to
612
    cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
1 by mbp at sourcefrog
import from baz patch-364
613
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
614
    if opt_profile:
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
615
        ret = apply_profiled(cmd_obj.run_argv, argv)
137 by mbp at sourcefrog
new --profile option
616
    else:
1165 by Martin Pool
- move parsing of argv into arguments and options into Command.run_argv
617
        ret = cmd_obj.run_argv(argv)
618
    return ret or 0
1 by mbp at sourcefrog
import from baz patch-364
619
620
621
def main(argv):
1104 by Martin Pool
- Add a simple UIFactory
622
    import bzrlib.ui
1111 by Martin Pool
- add functions to enable and disable default logging, so that we can
623
    bzrlib.trace.log_startup(argv)
1104 by Martin Pool
- Add a simple UIFactory
624
    bzrlib.ui.ui_factory = bzrlib.ui.TextUIFactory()
625
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
626
    return run_bzr_catch_errors(argv[1:])
1185.3.19 by Martin Pool
- split out commandline error reporting for ease of testing
627
628
629
def run_bzr_catch_errors(argv):
1 by mbp at sourcefrog
import from baz patch-364
630
    try:
260 by Martin Pool
- remove atexit() dependency for writing out execution times
631
        try:
974.1.82 by Aaron Bentley
Handled NotBranchError like a CommandError in main()
632
            try:
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
633
                return run_bzr(argv)
974.1.82 by Aaron Bentley
Handled NotBranchError like a CommandError in main()
634
            finally:
635
                # do this here inside the exception wrappers to catch EPIPE
636
                sys.stdout.flush()
637
        #wrap common errors as CommandErrors.
638
        except (NotBranchError,), e:
639
            raise BzrCommandError(str(e))
1097 by Martin Pool
- send trace messages out through python logging module
640
    except BzrCommandError, e:
641
        # command line syntax error, etc
642
        log_error(str(e))
643
        return 1
644
    except BzrError, e:
645
        bzrlib.trace.log_exception()
646
        return 1
647
    except AssertionError, e:
648
        bzrlib.trace.log_exception('assertion failed: ' + str(e))
649
        return 3
650
    except KeyboardInterrupt, e:
1360 by Martin Pool
- give possible traceback when interrupted
651
        bzrlib.trace.log_exception('interrupted')
1097 by Martin Pool
- send trace messages out through python logging module
652
        return 2
653
    except Exception, e:
654
        import errno
655
        if (isinstance(e, IOError) 
656
            and hasattr(e, 'errno')
657
            and e.errno == errno.EPIPE):
658
            bzrlib.trace.note('broken pipe')
659
            return 2
660
        else:
1108 by Martin Pool
- more cleanups of error reporting
661
            bzrlib.trace.log_exception()
1097 by Martin Pool
- send trace messages out through python logging module
662
            return 2
1 by mbp at sourcefrog
import from baz patch-364
663
664
665
if __name__ == '__main__':
666
    sys.exit(main(sys.argv))