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