131
109
type_list = '\n'.join(lines)
132
110
msg = "No known merge type %s. Supported types are:\n%s" %\
133
111
(typestring, type_list)
134
raise errors.BzrCommandError(msg)
112
raise BzrCommandError(msg)
137
114
class Option(object):
138
"""Description of a command line option
140
:ivar _short_name: If this option has a single-letter name, this is it.
144
# The dictionary of standard options. These are always legal.
147
# The dictionary of commonly used options. these are only legal
148
# if a command explicitly references them by name in the list
149
# of supported options.
115
"""Description of a command line option"""
116
# TODO: Some way to show in help a description of the option argument
152
def __init__(self, name, help='', type=None, argname=None,
153
short_name=None, param_name=None, custom_callback=None):
121
def __init__(self, name, help='', type=None, argname=None):
154
122
"""Make a new command option.
156
:param name: regular name of the command, used in the double-dash
124
name -- regular name of the command, used in the double-dash
157
125
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
128
help -- help message displayed in command help
130
type -- function called to parse the option argument, or
163
131
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).
133
argname -- name of option argument, if any
135
# TODO: perhaps a subclass that automatically does
136
# --option, --no-option for reversable booleans
180
self._short_name = short_name
183
raise ValueError('argname not valid for booleans')
141
assert argname is None
184
142
elif argname is None:
186
144
self.argname = argname
187
if param_name is None:
188
self._param_name = self.name.replace('-', '_')
190
self._param_name = param_name
191
self.custom_callback = custom_callback
193
146
def short_name(self):
195
return self._short_name
197
def set_short_name(self, short_name):
198
self._short_name = short_name
200
def get_negation_name(self):
201
if self.name.startswith('no-'):
204
return 'no-' + self.name
206
def add_option(self, parser, short_name):
207
"""Add this option to an Optparse parser"""
208
option_strings = ['--%s' % self.name]
209
if short_name is not None:
210
option_strings.append('-%s' % short_name)
213
parser.add_option(action='callback',
214
callback=self._optparse_bool_callback,
215
callback_args=(True,),
218
negation_strings = ['--%s' % self.get_negation_name()]
219
parser.add_option(action='callback',
220
callback=self._optparse_bool_callback,
221
callback_args=(False,),
222
help=optparse.SUPPRESS_HELP, *negation_strings)
224
parser.add_option(action='callback',
225
callback=self._optparse_callback,
226
type='string', metavar=self.argname.upper(),
228
default=OptionParser.DEFAULT_VALUE,
231
def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
232
setattr(parser.values, self._param_name, bool_v)
233
if self.custom_callback is not None:
234
self.custom_callback(option, self._param_name, bool_v, parser)
236
def _optparse_callback(self, option, opt, value, parser):
238
setattr(parser.values, self._param_name, v)
239
if self.custom_callback is not None:
240
self.custom_callback(option, self.name, v, parser)
242
def iter_switches(self):
243
"""Iterate through the list of switches provided by the option
245
:return: an iterator of (name, short_name, argname, help)
247
argname = self.argname
248
if argname is not None:
249
argname = argname.upper()
250
yield self.name, self.short_name(), argname, self.help
252
def is_hidden(self, name):
256
class ListOption(Option):
257
"""Option used to provide a list of values.
259
On the command line, arguments are specified by a repeated use of the
260
option. '-' is a special argument that resets the list. For example,
262
sets the value of the 'foo' option to ['a', 'b'], and
263
--foo=a --foo=b --foo=- --foo=c
264
sets the value of the 'foo' option to ['c'].
267
def add_option(self, parser, short_name):
268
"""Add this option to an Optparse parser."""
269
option_strings = ['--%s' % self.name]
270
if short_name is not None:
271
option_strings.append('-%s' % short_name)
272
parser.add_option(action='callback',
273
callback=self._optparse_callback,
274
type='string', metavar=self.argname.upper(),
275
help=self.help, default=[],
278
def _optparse_callback(self, option, opt, value, parser):
279
values = getattr(parser.values, self._param_name)
283
values.append(self.type(value))
284
if self.custom_callback is not None:
285
self.custom_callback(option, self._param_name, values, parser)
288
class RegistryOption(Option):
289
"""Option based on a registry
291
The values for the options correspond to entries in the registry. Input
292
must be a registry key. After validation, it is converted into an object
293
using Registry.get or a caller-provided converter.
296
def validate_value(self, value):
297
"""Validate a value name"""
298
if value not in self.registry:
299
raise errors.BadOptionValue(self.name, value)
301
def convert(self, value):
302
"""Convert a value name into an output type"""
303
self.validate_value(value)
304
if self.converter is None:
305
return self.registry.get(value)
307
return self.converter(value)
309
def __init__(self, name, help, registry=None, converter=None,
310
value_switches=False, title=None, enum_switch=True,
315
:param name: The option name.
316
:param help: Help for the option.
317
:param registry: A Registry containing the values
318
:param converter: Callable to invoke with the value name to produce
319
the value. If not supplied, self.registry.get is used.
320
:param value_switches: If true, each possible value is assigned its
321
own switch. For example, instead of '--format knit',
322
'--knit' can be used interchangeably.
323
:param enum_switch: If true, a switch is provided with the option name,
325
:param lazy_registry: A tuple of (module name, attribute name) for a
326
registry to be lazily loaded.
328
Option.__init__(self, name, help, type=self.convert)
329
self._registry = registry
331
if lazy_registry is None:
332
raise AssertionError(
333
'One of registry or lazy_registry must be given.')
334
self._lazy_registry = _mod_registry._LazyObjectGetter(
336
if registry is not None and lazy_registry is not None:
337
raise AssertionError(
338
'registry and lazy_registry are mutually exclusive')
340
self.converter = converter
341
self.value_switches = value_switches
342
self.enum_switch = enum_switch
344
if self.title is None:
349
if self._registry is None:
350
self._registry = self._lazy_registry.get_obj()
351
return self._registry
354
def from_kwargs(name_, help=None, title=None, value_switches=False,
355
enum_switch=True, **kwargs):
356
"""Convenience method to generate string-map registry options
358
name, help, value_switches and enum_switch are passed to the
359
RegistryOption constructor. Any other keyword arguments are treated
360
as values for the option, and they value is treated as the help.
362
reg = _mod_registry.Registry()
363
for name, switch_help in kwargs.iteritems():
364
name = name.replace('_', '-')
365
reg.register(name, name, help=switch_help)
366
if not value_switches:
367
help = help + ' "' + name + '": ' + switch_help
368
if not help.endswith("."):
370
return RegistryOption(name_, help, reg, title=title,
371
value_switches=value_switches, enum_switch=enum_switch)
373
def add_option(self, parser, short_name):
374
"""Add this option to an Optparse parser"""
375
if self.value_switches:
376
parser = parser.add_option_group(self.title)
378
Option.add_option(self, parser, short_name)
379
if self.value_switches:
380
for key in self.registry.keys():
381
option_strings = ['--%s' % key]
382
if self.is_hidden(key):
383
help = optparse.SUPPRESS_HELP
385
help = self.registry.get_help(key)
386
parser.add_option(action='callback',
387
callback=self._optparse_value_callback(key),
391
def _optparse_value_callback(self, cb_value):
392
def cb(option, opt, value, parser):
393
v = self.type(cb_value)
394
setattr(parser.values, self._param_name, v)
395
if self.custom_callback is not None:
396
self.custom_callback(option, self._param_name, v, parser)
399
def iter_switches(self):
400
"""Iterate through the list of switches provided by the option
402
:return: an iterator of (name, short_name, argname, help)
404
for value in Option.iter_switches(self):
406
if self.value_switches:
407
for key in sorted(self.registry.keys()):
408
yield key, None, None, self.registry.get_help(key)
410
def is_hidden(self, name):
411
if name == self.name:
412
return Option.is_hidden(self, name)
413
return getattr(self.registry.get_info(name), 'hidden', False)
416
class OptionParser(optparse.OptionParser):
417
"""OptionParser that raises exceptions instead of exiting"""
419
DEFAULT_VALUE = object()
421
def error(self, message):
422
raise errors.BzrCommandError(message)
425
def get_optparser(options):
426
"""Generate an optparse parser for bzrlib-style options"""
428
parser = OptionParser()
429
parser.remove_option('--help')
430
for option in options.itervalues():
431
option.add_option(parser, option.short_name())
435
def custom_help(name, help):
436
"""Clone a common option overriding the help."""
438
o = copy.copy(Option.OPTIONS[name])
443
def _standard_option(name, **kwargs):
444
"""Register a standard option."""
445
# All standard options are implicitly 'global' ones
446
Option.STD_OPTIONS[name] = Option(name, **kwargs)
447
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
147
"""Return the single character option for this command, if any.
149
Short options are globally registered.
151
for short, option in Option.SHORT_OPTIONS.iteritems():
450
156
def _global_option(name, **kwargs):
451
"""Register a global option."""
157
"""Register o as a global option."""
452
158
Option.OPTIONS[name] = Option(name, **kwargs)
455
def _global_registry_option(name, help, registry=None, **kwargs):
456
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
459
# This is the verbosity level detected during command line parsing.
460
# Note that the final value is dependent on the order in which the
461
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
462
# The final value will be one of the following:
470
def _verbosity_level_callback(option, opt_str, value, parser):
471
global _verbosity_level
473
# Either --no-verbose or --no-quiet was specified
475
elif opt_str == "verbose":
476
if _verbosity_level > 0:
477
_verbosity_level += 1
481
if _verbosity_level < 0:
482
_verbosity_level -= 1
484
_verbosity_level = -1
487
class MergeTypeRegistry(_mod_registry.Registry):
492
_merge_type_registry = MergeTypeRegistry()
493
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
494
"Native diff3-style merge")
495
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
496
"Merge using external diff3")
497
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
499
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
502
# Declare the standard options
503
_standard_option('help', short_name='h',
504
help='Show help message.')
505
_standard_option('verbose', short_name='v',
506
help='Display more information.',
507
custom_callback=_verbosity_level_callback)
508
_standard_option('quiet', short_name='q',
509
help="Only display errors and warnings.",
510
custom_callback=_verbosity_level_callback)
512
# Declare commonly used options
513
160
_global_option('all')
514
161
_global_option('overwrite', help='Ignore differences between branches and '
515
'overwrite unconditionally.')
162
'overwrite unconditionally')
516
163
_global_option('basis', type=str)
517
164
_global_option('bound')
518
165
_global_option('diff-options', type=str)
519
_global_option('file', type=unicode, short_name='F')
166
_global_option('help',
167
help='show help message')
168
_global_option('file', type=unicode)
520
169
_global_option('force')
521
170
_global_option('format', type=unicode)
522
171
_global_option('forward')
523
_global_option('message', type=unicode,
525
help='Message string.')
172
_global_option('message', type=unicode)
526
173
_global_option('no-recurse')
527
174
_global_option('profile',
528
help='Show performance profiling information.')
529
_global_option('revision',
530
type=_parse_revision_str,
532
help='See "help revisionspec" for details.')
533
_global_option('change',
534
type=_parse_change_str,
536
param_name='revision',
537
help='Select changes introduced by the specified revision. See also "help revisionspec".')
538
_global_option('show-ids',
539
help='Show internal object ids.')
540
_global_option('timezone',
175
help='show performance profiling information')
176
_global_option('revision', type=_parse_revision_str)
177
_global_option('short')
178
_global_option('show-ids',
179
help='show internal object ids')
180
_global_option('timezone',
542
help='Display timezone as local, original, or utc.')
182
help='display timezone as local, original, or utc')
543
183
_global_option('unbound')
184
_global_option('verbose',
185
help='display more information')
544
186
_global_option('version')
545
187
_global_option('email')
546
188
_global_option('update')
547
_global_registry_option('log-format', "Use specified log format.",
548
lazy_registry=('bzrlib.log', 'log_formatter_registry'),
549
value_switches=True, title='Log format')
550
_global_option('long', help='Use detailed log format. Same as --log-format long',
189
_global_option('log-format', type=str, help="Use this log format")
190
_global_option('long', help='Use detailed log format. Same as --log-format long')
552
191
_global_option('short', help='Use moderately short log format. Same as --log-format short')
553
192
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
554
193
_global_option('root', type=str)
555
194
_global_option('no-backup')
556
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
557
_merge_type_registry, value_switches=True,
558
title='Merge algorithm')
195
_global_option('merge-type', type=_parse_merge_type)
559
196
_global_option('pattern', type=str)
197
_global_option('quiet')
560
198
_global_option('remember', help='Remember the specified location as a'
562
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
200
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
563
201
_global_option('kind', type=str)
564
202
_global_option('dry-run',
565
help="Show what would be done, but don't actually do anything.")
566
_global_option('name-from-revision', help='The path name in the old tree.')
568
diff_writer_registry = _mod_registry.Registry()
569
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
570
diff_writer_registry.default_key = 'plain'
203
help="show what would be done, but don't actually do anything")
206
def _global_short(short_name, long_name):
207
assert short_name not in Option.SHORT_OPTIONS
208
Option.SHORT_OPTIONS[short_name] = Option.OPTIONS[long_name]
211
Option.SHORT_OPTIONS['F'] = Option.OPTIONS['file']
212
Option.SHORT_OPTIONS['h'] = Option.OPTIONS['help']
213
Option.SHORT_OPTIONS['m'] = Option.OPTIONS['message']
214
Option.SHORT_OPTIONS['r'] = Option.OPTIONS['revision']
215
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
216
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
217
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
added
removed
bzrlib/option.py
