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