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