43
32
each revision specifier supplied.
45
34
>>> _parse_revision_str('234')
46
[<RevisionSpec_dwim 234>]
35
[<RevisionSpec_int 234>]
47
36
>>> _parse_revision_str('234..567')
48
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 567>]
37
[<RevisionSpec_int 234>, <RevisionSpec_int 567>]
49
38
>>> _parse_revision_str('..')
50
39
[<RevisionSpec None>, <RevisionSpec None>]
51
40
>>> _parse_revision_str('..234')
52
[<RevisionSpec None>, <RevisionSpec_dwim 234>]
41
[<RevisionSpec None>, <RevisionSpec_int 234>]
53
42
>>> _parse_revision_str('234..')
54
[<RevisionSpec_dwim 234>, <RevisionSpec None>]
43
[<RevisionSpec_int 234>, <RevisionSpec None>]
55
44
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
56
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 456>, <RevisionSpec_dwim 789>]
45
[<RevisionSpec_int 234>, <RevisionSpec_int 456>, <RevisionSpec_int 789>]
57
46
>>> _parse_revision_str('234....789') #Error ?
58
[<RevisionSpec_dwim 234>, <RevisionSpec None>, <RevisionSpec_dwim 789>]
47
[<RevisionSpec_int 234>, <RevisionSpec None>, <RevisionSpec_int 789>]
59
48
>>> _parse_revision_str('revid:test@other.com-234234')
60
49
[<RevisionSpec_revid revid:test@other.com-234234>]
61
50
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
62
51
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
63
52
>>> _parse_revision_str('revid:test@other.com-234234..23')
64
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_dwim 23>]
53
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_int 23>]
65
54
>>> _parse_revision_str('date:2005-04-12')
66
55
[<RevisionSpec_date date:2005-04-12>]
67
56
>>> _parse_revision_str('date:2005-04-12 12:24:33')
71
60
>>> _parse_revision_str('date:2005-04-12,12:24:33')
72
61
[<RevisionSpec_date date:2005-04-12,12:24:33>]
73
62
>>> _parse_revision_str('-5..23')
74
[<RevisionSpec_dwim -5>, <RevisionSpec_dwim 23>]
63
[<RevisionSpec_int -5>, <RevisionSpec_int 23>]
75
64
>>> _parse_revision_str('-5')
76
[<RevisionSpec_dwim -5>]
65
[<RevisionSpec_int -5>]
77
66
>>> _parse_revision_str('123a')
78
[<RevisionSpec_dwim 123a>]
67
Traceback (most recent call last):
69
BzrError: No namespace registered for string: '123a'
79
70
>>> _parse_revision_str('abc')
80
[<RevisionSpec_dwim abc>]
71
Traceback (most recent call last):
73
BzrError: No namespace registered for string: 'abc'
81
74
>>> _parse_revision_str('branch:../branch2')
82
75
[<RevisionSpec_branch branch:../branch2>]
83
76
>>> _parse_revision_str('branch:../../branch2')
84
77
[<RevisionSpec_branch branch:../../branch2>]
85
78
>>> _parse_revision_str('branch:../../branch2..23')
86
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_dwim 23>]
87
>>> _parse_revision_str('branch:..\\\\branch2')
88
[<RevisionSpec_branch branch:..\\branch2>]
89
>>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
90
[<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_dwim 23>]
79
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_int 23>]
92
81
# TODO: Maybe move this into revisionspec.py
82
old_format_re = re.compile('\d*:\d*')
83
m = old_format_re.match(revstr)
94
# split on .. that is not followed by a / or \
95
sep = re.compile(r'\.\.(?![\\/])')
96
for x in sep.split(revstr):
97
revs.append(revisionspec.RevisionSpec.from_string(x or None))
86
warning('Colon separator for revision numbers is deprecated.'
88
for rev in revstr.split(':'):
90
revs.append(RevisionSpec(int(rev)))
92
revs.append(RevisionSpec(None))
94
sep = re.compile("\\.\\.(?!/)")
95
for x in sep.split(revstr):
96
revs.append(RevisionSpec(x or None))
101
def _parse_change_str(revstr):
102
"""Parse the revision string and return a tuple with left-most
103
parent of the revision.
105
>>> _parse_change_str('123')
106
(<RevisionSpec_before before:123>, <RevisionSpec_dwim 123>)
107
>>> _parse_change_str('123..124')
108
Traceback (most recent call last):
110
RangeInChangeOption: Option --change does not accept revision ranges
112
revs = _parse_revision_str(revstr)
114
raise errors.RangeInChangeOption()
115
return (revisionspec.RevisionSpec.from_string('before:' + revstr),
119
100
def _parse_merge_type(typestring):
120
101
return get_merge_type(typestring)
130
111
type_list = '\n'.join(lines)
131
112
msg = "No known merge type %s. Supported types are:\n%s" %\
132
113
(typestring, type_list)
133
raise errors.BzrCommandError(msg)
114
raise BzrCommandError(msg)
136
116
class Option(object):
137
"""Description of a command line option
139
:ivar _short_name: If this option has a single-letter name, this is it.
143
# The dictionary of standard options. These are always legal.
146
# The dictionary of commonly used options. these are only legal
147
# if a command explicitly references them by name in the list
148
# of supported options.
117
"""Description of a command line option"""
118
# TODO: Some way to show in help a description of the option argument
151
def __init__(self, name, help='', type=None, argname=None,
152
short_name=None, param_name=None, custom_callback=None,
123
def __init__(self, name, help='', type=None, argname=None):
154
124
"""Make a new command option.
156
:param name: regular name of the command, used in the double-dash
157
form and also as the parameter to the command's run()
158
method (unless param_name is specified).
160
:param help: help message displayed in command help
162
:param type: function called to parse the option argument, or
126
name -- regular name of the command, used in the double-dash
127
form and also as the parameter to the command's run()
130
help -- help message displayed in command help
132
type -- function called to parse the option argument, or
163
133
None (default) if this option doesn't take an argument.
165
:param argname: name of option argument, if any
167
:param short_name: short option code for use with a single -, e.g.
168
short_name="v" to enable parsing of -v.
170
:param param_name: name of the parameter which will be passed to
171
the command's run() method.
173
:param custom_callback: a callback routine to be called after normal
174
processing. The signature of the callback routine is
175
(option, name, new_value, parser).
176
:param hidden: If True, the option should be hidden in help and
135
argname -- name of option argument, if any
137
# TODO: perhaps a subclass that automatically does
138
# --option, --no-option for reversible booleans
182
self._short_name = short_name
185
raise ValueError('argname not valid for booleans')
143
assert argname is None
186
144
elif argname is None:
188
146
self.argname = argname
189
if param_name is None:
190
self._param_name = self.name.replace('-', '_')
192
self._param_name = param_name
193
self.custom_callback = custom_callback
196
148
def short_name(self):
198
return self._short_name
149
"""Return the single character option for this command, if any.
200
def set_short_name(self, short_name):
201
self._short_name = short_name
151
Short options are globally registered.
153
for short, option in Option.SHORT_OPTIONS.iteritems():
203
157
def get_negation_name(self):
204
158
if self.name.startswith('no-'):
211
165
option_strings = ['--%s' % self.name]
212
166
if short_name is not None:
213
167
option_strings.append('-%s' % short_name)
215
help = optparse.SUPPRESS_HELP
218
168
optargfn = self.type
219
169
if optargfn is None:
220
parser.add_option(action='callback',
221
callback=self._optparse_bool_callback,
222
callback_args=(True,),
170
parser.add_option(action='store_true', dest=self.name,
172
default=OptionParser.DEFAULT_VALUE,
225
174
negation_strings = ['--%s' % self.get_negation_name()]
226
parser.add_option(action='callback',
227
callback=self._optparse_bool_callback,
228
callback_args=(False,),
175
parser.add_option(action='store_false', dest=self.name,
229
176
help=optparse.SUPPRESS_HELP, *negation_strings)
231
parser.add_option(action='callback',
232
callback=self._optparse_callback,
178
parser.add_option(action='callback',
179
callback=self._optparse_callback,
233
180
type='string', metavar=self.argname.upper(),
235
default=OptionParser.DEFAULT_VALUE,
182
default=OptionParser.DEFAULT_VALUE,
238
def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
239
setattr(parser.values, self._param_name, bool_v)
240
if self.custom_callback is not None:
241
self.custom_callback(option, self._param_name, bool_v, parser)
243
185
def _optparse_callback(self, option, opt, value, parser):
245
setattr(parser.values, self._param_name, v)
246
if self.custom_callback is not None:
247
self.custom_callback(option, self.name, v, parser)
186
setattr(parser.values, self.name, self.type(value))
249
188
def iter_switches(self):
250
189
"""Iterate through the list of switches provided by the option
252
191
:return: an iterator of (name, short_name, argname, help)
254
193
argname = self.argname
256
195
argname = argname.upper()
257
196
yield self.name, self.short_name(), argname, self.help
259
def is_hidden(self, name):
263
class ListOption(Option):
264
"""Option used to provide a list of values.
266
On the command line, arguments are specified by a repeated use of the
267
option. '-' is a special argument that resets the list. For example,
269
sets the value of the 'foo' option to ['a', 'b'], and
270
--foo=a --foo=b --foo=- --foo=c
271
sets the value of the 'foo' option to ['c'].
274
def add_option(self, parser, short_name):
275
"""Add this option to an Optparse parser."""
276
option_strings = ['--%s' % self.name]
277
if short_name is not None:
278
option_strings.append('-%s' % short_name)
279
parser.add_option(action='callback',
280
callback=self._optparse_callback,
281
type='string', metavar=self.argname.upper(),
282
help=self.help, dest=self._param_name, default=[],
285
def _optparse_callback(self, option, opt, value, parser):
286
values = getattr(parser.values, self._param_name)
290
values.append(self.type(value))
291
if self.custom_callback is not None:
292
self.custom_callback(option, self._param_name, values, parser)
295
class RegistryOption(Option):
296
"""Option based on a registry
298
The values for the options correspond to entries in the registry. Input
299
must be a registry key. After validation, it is converted into an object
300
using Registry.get or a caller-provided converter.
303
def validate_value(self, value):
304
"""Validate a value name"""
305
if value not in self.registry:
306
raise errors.BadOptionValue(self.name, value)
308
def convert(self, value):
309
"""Convert a value name into an output type"""
310
self.validate_value(value)
311
if self.converter is None:
312
return self.registry.get(value)
314
return self.converter(value)
316
def __init__(self, name, help, registry=None, converter=None,
317
value_switches=False, title=None, enum_switch=True,
318
lazy_registry=None, short_name=None, short_value_switches=None):
322
:param name: The option name.
323
:param help: Help for the option.
324
:param registry: A Registry containing the values
325
:param converter: Callable to invoke with the value name to produce
326
the value. If not supplied, self.registry.get is used.
327
:param value_switches: If true, each possible value is assigned its
328
own switch. For example, instead of '--format knit',
329
'--knit' can be used interchangeably.
330
:param enum_switch: If true, a switch is provided with the option name,
332
:param lazy_registry: A tuple of (module name, attribute name) for a
333
registry to be lazily loaded.
334
:param short_name: The short name for the enum switch, if any
335
:param short_value_switches: A dict mapping values to short names
337
Option.__init__(self, name, help, type=self.convert,
338
short_name=short_name)
339
self._registry = registry
341
if lazy_registry is None:
342
raise AssertionError(
343
'One of registry or lazy_registry must be given.')
344
self._lazy_registry = _mod_registry._LazyObjectGetter(
346
if registry is not None and lazy_registry is not None:
347
raise AssertionError(
348
'registry and lazy_registry are mutually exclusive')
350
self.converter = converter
351
self.value_switches = value_switches
352
self.enum_switch = enum_switch
353
self.short_value_switches = short_value_switches
355
if self.title is None:
360
if self._registry is None:
361
self._registry = self._lazy_registry.get_obj()
362
return self._registry
365
def from_kwargs(name_, help=None, title=None, value_switches=False,
366
enum_switch=True, **kwargs):
367
"""Convenience method to generate string-map registry options
369
name, help, value_switches and enum_switch are passed to the
370
RegistryOption constructor. Any other keyword arguments are treated
371
as values for the option, and their value is treated as the help.
373
reg = _mod_registry.Registry()
374
for name, switch_help in sorted(kwargs.items()):
375
name = name.replace('_', '-')
376
reg.register(name, name, help=switch_help)
377
if not value_switches:
378
help = help + ' "' + name + '": ' + switch_help
379
if not help.endswith("."):
381
return RegistryOption(name_, help, reg, title=title,
382
value_switches=value_switches, enum_switch=enum_switch)
384
def add_option(self, parser, short_name):
385
"""Add this option to an Optparse parser"""
386
if self.value_switches:
387
parser = parser.add_option_group(self.title)
389
Option.add_option(self, parser, short_name)
390
if self.value_switches:
391
for key in self.registry.keys():
392
option_strings = ['--%s' % key]
393
if self.is_hidden(key):
394
help = optparse.SUPPRESS_HELP
396
help = self.registry.get_help(key)
397
if (self.short_value_switches and
398
key in self.short_value_switches):
399
option_strings.append('-%s' %
400
self.short_value_switches[key])
401
parser.add_option(action='callback',
402
callback=self._optparse_value_callback(key),
406
def _optparse_value_callback(self, cb_value):
407
def cb(option, opt, value, parser):
408
v = self.type(cb_value)
409
setattr(parser.values, self._param_name, v)
410
if self.custom_callback is not None:
411
self.custom_callback(option, self._param_name, v, parser)
414
def iter_switches(self):
415
"""Iterate through the list of switches provided by the option
417
:return: an iterator of (name, short_name, argname, help)
419
for value in Option.iter_switches(self):
421
if self.value_switches:
422
for key in sorted(self.registry.keys()):
423
yield key, None, None, self.registry.get_help(key)
425
def is_hidden(self, name):
426
if name == self.name:
427
return Option.is_hidden(self, name)
428
return getattr(self.registry.get_info(name), 'hidden', False)
431
199
class OptionParser(optparse.OptionParser):
432
200
"""OptionParser that raises exceptions instead of exiting"""
434
202
DEFAULT_VALUE = object()
437
optparse.OptionParser.__init__(self)
438
self.formatter = GettextIndentedHelpFormatter()
440
204
def error(self, message):
441
raise errors.BzrCommandError(message)
444
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):
445
"""Adds gettext() call to format_option()"""
447
optparse.IndentedHelpFormatter.__init__(self)
449
def format_option(self, option):
450
"""code taken from Python's optparse.py"""
452
option.help = i18n.gettext(option.help)
453
return optparse.IndentedHelpFormatter.format_option(self, option)
205
raise BzrCommandError(message)
456
208
def get_optparser(options):
459
211
parser = OptionParser()
460
212
parser.remove_option('--help')
213
short_options = dict((k.name, v) for v, k in
214
Option.SHORT_OPTIONS.iteritems())
461
215
for option in options.itervalues():
462
option.add_option(parser, option.short_name())
216
option.add_option(parser, short_options.get(option.name))
466
def custom_help(name, help):
467
"""Clone a common option overriding the help."""
469
o = copy.copy(Option.OPTIONS[name])
474
def _standard_option(name, **kwargs):
475
"""Register a standard option."""
476
# All standard options are implicitly 'global' ones
477
Option.STD_OPTIONS[name] = Option(name, **kwargs)
478
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
480
def _standard_list_option(name, **kwargs):
481
"""Register a standard option."""
482
# All standard options are implicitly 'global' ones
483
Option.STD_OPTIONS[name] = ListOption(name, **kwargs)
484
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
487
220
def _global_option(name, **kwargs):
488
"""Register a global option."""
221
"""Register o as a global option."""
489
222
Option.OPTIONS[name] = Option(name, **kwargs)
492
def _global_registry_option(name, help, registry=None, **kwargs):
493
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
496
# This is the verbosity level detected during command line parsing.
497
# Note that the final value is dependent on the order in which the
498
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
499
# The final value will be one of the following:
507
def _verbosity_level_callback(option, opt_str, value, parser):
508
global _verbosity_level
510
# Either --no-verbose or --no-quiet was specified
512
elif opt_str == "verbose":
513
if _verbosity_level > 0:
514
_verbosity_level += 1
518
if _verbosity_level < 0:
519
_verbosity_level -= 1
521
_verbosity_level = -1
524
# Declare the standard options
525
_standard_option('help', short_name='h',
526
help='Show help message.')
527
_standard_option('quiet', short_name='q',
528
help="Only display errors and warnings.",
529
custom_callback=_verbosity_level_callback)
530
_standard_option('usage',
531
help='Show usage message and options.')
532
_standard_option('verbose', short_name='v',
533
help='Display more information.',
534
custom_callback=_verbosity_level_callback)
536
# Declare commonly used options
537
_global_option('change',
538
type=_parse_change_str,
540
param_name='revision',
541
help='Select changes introduced by the specified revision. See also "help revisionspec".')
542
_global_option('directory', short_name='d', type=unicode,
543
help='Branch to operate on, instead of working directory.')
544
_global_option('file', type=unicode, short_name='F')
545
_global_registry_option('log-format', "Use specified log format.",
546
lazy_registry=('bzrlib.log', 'log_formatter_registry'),
547
value_switches=True, title='Log format',
548
short_value_switches={'short': 'S'})
549
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
550
lazy_registry=('bzrlib.merge', 'merge_type_registry'),
551
value_switches=True, title='Merge algorithm')
552
_global_option('message', type=unicode,
554
help='Message string.')
555
_global_option('null', short_name='0',
556
help='Use an ASCII NUL (\\0) separator rather than '
224
_global_option('all')
558
225
_global_option('overwrite', help='Ignore differences between branches and '
559
'overwrite unconditionally.')
226
'overwrite unconditionally')
227
_global_option('basis', type=str)
228
_global_option('bound')
229
_global_option('diff-options', type=str)
230
_global_option('help',
231
help='show help message')
232
_global_option('file', type=unicode)
233
_global_option('force')
234
_global_option('format', type=unicode)
235
_global_option('forward')
236
_global_option('message', type=unicode)
237
_global_option('no-recurse')
238
_global_option('prefix', type=str,
239
help='Set prefixes to added to old and new filenames, as '
240
'two values separated by a colon.')
241
_global_option('profile',
242
help='show performance profiling information')
243
_global_option('revision', type=_parse_revision_str)
244
_global_option('show-ids',
245
help='show internal object ids')
246
_global_option('timezone',
248
help='display timezone as local, original, or utc')
249
_global_option('unbound')
250
_global_option('verbose',
251
help='display more information')
252
_global_option('version')
253
_global_option('email')
254
_global_option('update')
255
_global_option('log-format', type=str, help="Use this log format")
256
_global_option('long', help='Use detailed log format. Same as --log-format long')
257
_global_option('short', help='Use moderately short log format. Same as --log-format short')
258
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
259
_global_option('root', type=str)
260
_global_option('no-backup')
261
_global_option('merge-type', type=_parse_merge_type,
262
help='Select a particular merge algorithm')
263
_global_option('pattern', type=str)
264
_global_option('quiet')
560
265
_global_option('remember', help='Remember the specified location as a'
562
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
563
_global_option('revision',
564
type=_parse_revision_str,
566
help='See "help revisionspec" for details.')
567
_global_option('show-ids',
568
help='Show internal object ids.')
569
_global_option('timezone',
571
help='Display timezone as local, original, or utc.')
573
diff_writer_registry = _mod_registry.Registry()
574
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
575
diff_writer_registry.default_key = 'plain'
267
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
268
_global_option('kind', type=str)
269
_global_option('dry-run',
270
help="show what would be done, but don't actually do anything")
273
def _global_short(short_name, long_name):
274
assert short_name not in Option.SHORT_OPTIONS
275
Option.SHORT_OPTIONS[short_name] = Option.OPTIONS[long_name]
278
Option.SHORT_OPTIONS['F'] = Option.OPTIONS['file']
279
Option.SHORT_OPTIONS['h'] = Option.OPTIONS['help']
280
Option.SHORT_OPTIONS['m'] = Option.OPTIONS['message']
281
Option.SHORT_OPTIONS['r'] = Option.OPTIONS['revision']
282
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
283
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
284
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
285
Option.SHORT_OPTIONS['p'] = Option.OPTIONS['prefix']
added
removed
bzrlib/option.py
