110
128
type_list = '\n'.join(lines)
111
129
msg = "No known merge type %s. Supported types are:\n%s" %\
112
130
(typestring, type_list)
113
raise BzrCommandError(msg)
131
raise errors.BzrCommandError(msg)
115
134
class Option(object):
116
"""Description of a command line option"""
117
# TODO: Some way to show in help a description of the option argument
135
"""Description of a command line option
137
:ivar _short_name: If this option has a single-letter name, this is it.
141
# The dictionary of standard options. These are always legal.
144
# The dictionary of commonly used options. these are only legal
145
# if a command explicitly references them by name in the list
146
# of supported options.
122
def __init__(self, name, help='', type=None, argname=None):
149
def __init__(self, name, help='', type=None, argname=None,
150
short_name=None, param_name=None, custom_callback=None,
123
152
"""Make a new command option.
125
name -- regular name of the command, used in the double-dash
126
form and also as the parameter to the command's run()
129
help -- help message displayed in command help
131
type -- function called to parse the option argument, or
154
:param name: regular name of the command, used in the double-dash
155
form and also as the parameter to the command's run()
156
method (unless param_name is specified).
158
:param help: help message displayed in command help
160
:param type: function called to parse the option argument, or
132
161
None (default) if this option doesn't take an argument.
134
argname -- name of option argument, if any
163
:param argname: name of option argument, if any
165
:param short_name: short option code for use with a single -, e.g.
166
short_name="v" to enable parsing of -v.
168
:param param_name: name of the parameter which will be passed to
169
the command's run() method.
171
:param custom_callback: a callback routine to be called after normal
172
processing. The signature of the callback routine is
173
(option, name, new_value, parser).
174
:param hidden: If True, the option should be hidden in help and
136
# TODO: perhaps a subclass that automatically does
137
# --option, --no-option for reversible booleans
180
self._short_name = short_name
142
assert argname is None
183
raise ValueError('argname not valid for booleans')
143
184
elif argname is None:
145
186
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
147
194
def short_name(self):
148
"""Return the single character option for this command, if any.
150
Short options are globally registered.
152
for short, option in Option.SHORT_OPTIONS.iteritems():
196
return self._short_name
198
def set_short_name(self, short_name):
199
self._short_name = short_name
201
def get_negation_name(self):
202
if self.name.startswith('no-'):
205
return 'no-' + self.name
207
def add_option(self, parser, short_name):
208
"""Add this option to an Optparse parser"""
209
option_strings = ['--%s' % self.name]
210
if short_name is not None:
211
option_strings.append('-%s' % short_name)
213
help = optparse.SUPPRESS_HELP
218
parser.add_option(action='callback',
219
callback=self._optparse_bool_callback,
220
callback_args=(True,),
223
negation_strings = ['--%s' % self.get_negation_name()]
224
parser.add_option(action='callback',
225
callback=self._optparse_bool_callback,
226
callback_args=(False,),
227
help=optparse.SUPPRESS_HELP, *negation_strings)
229
parser.add_option(action='callback',
230
callback=self._optparse_callback,
231
type='string', metavar=self.argname.upper(),
233
default=OptionParser.DEFAULT_VALUE,
236
def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
237
setattr(parser.values, self._param_name, bool_v)
238
if self.custom_callback is not None:
239
self.custom_callback(option, self._param_name, bool_v, parser)
241
def _optparse_callback(self, option, opt, value, parser):
243
setattr(parser.values, self._param_name, v)
244
if self.custom_callback is not None:
245
self.custom_callback(option, self.name, v, parser)
247
def iter_switches(self):
248
"""Iterate through the list of switches provided by the option
250
:return: an iterator of (name, short_name, argname, help)
252
argname = self.argname
253
if argname is not None:
254
argname = argname.upper()
255
yield self.name, self.short_name(), argname, self.help
257
def is_hidden(self, name):
261
class ListOption(Option):
262
"""Option used to provide a list of values.
264
On the command line, arguments are specified by a repeated use of the
265
option. '-' is a special argument that resets the list. For example,
267
sets the value of the 'foo' option to ['a', 'b'], and
268
--foo=a --foo=b --foo=- --foo=c
269
sets the value of the 'foo' option to ['c'].
272
def add_option(self, parser, short_name):
273
"""Add this option to an Optparse parser."""
274
option_strings = ['--%s' % self.name]
275
if short_name is not None:
276
option_strings.append('-%s' % short_name)
277
parser.add_option(action='callback',
278
callback=self._optparse_callback,
279
type='string', metavar=self.argname.upper(),
280
help=self.help, dest=self._param_name, default=[],
283
def _optparse_callback(self, option, opt, value, parser):
284
values = getattr(parser.values, self._param_name)
288
values.append(self.type(value))
289
if self.custom_callback is not None:
290
self.custom_callback(option, self._param_name, values, parser)
293
class RegistryOption(Option):
294
"""Option based on a registry
296
The values for the options correspond to entries in the registry. Input
297
must be a registry key. After validation, it is converted into an object
298
using Registry.get or a caller-provided converter.
301
def validate_value(self, value):
302
"""Validate a value name"""
303
if value not in self.registry:
304
raise errors.BadOptionValue(self.name, value)
306
def convert(self, value):
307
"""Convert a value name into an output type"""
308
self.validate_value(value)
309
if self.converter is None:
310
return self.registry.get(value)
312
return self.converter(value)
314
def __init__(self, name, help, registry=None, converter=None,
315
value_switches=False, title=None, enum_switch=True,
316
lazy_registry=None, short_name=None, short_value_switches=None):
320
:param name: The option name.
321
:param help: Help for the option.
322
:param registry: A Registry containing the values
323
:param converter: Callable to invoke with the value name to produce
324
the value. If not supplied, self.registry.get is used.
325
:param value_switches: If true, each possible value is assigned its
326
own switch. For example, instead of '--format knit',
327
'--knit' can be used interchangeably.
328
:param enum_switch: If true, a switch is provided with the option name,
330
:param lazy_registry: A tuple of (module name, attribute name) for a
331
registry to be lazily loaded.
332
:param short_name: The short name for the enum switch, if any
333
:param short_value_switches: A dict mapping values to short names
335
Option.__init__(self, name, help, type=self.convert, short_name=short_name)
336
self._registry = registry
338
if lazy_registry is None:
339
raise AssertionError(
340
'One of registry or lazy_registry must be given.')
341
self._lazy_registry = _mod_registry._LazyObjectGetter(
343
if registry is not None and lazy_registry is not None:
344
raise AssertionError(
345
'registry and lazy_registry are mutually exclusive')
347
self.converter = converter
348
self.value_switches = value_switches
349
self.enum_switch = enum_switch
350
self.short_value_switches = short_value_switches
352
if self.title is None:
357
if self._registry is None:
358
self._registry = self._lazy_registry.get_obj()
359
return self._registry
362
def from_kwargs(name_, help=None, title=None, value_switches=False,
363
enum_switch=True, **kwargs):
364
"""Convenience method to generate string-map registry options
366
name, help, value_switches and enum_switch are passed to the
367
RegistryOption constructor. Any other keyword arguments are treated
368
as values for the option, and their value is treated as the help.
370
reg = _mod_registry.Registry()
371
for name, switch_help in sorted(kwargs.items()):
372
name = name.replace('_', '-')
373
reg.register(name, name, help=switch_help)
374
if not value_switches:
375
help = help + ' "' + name + '": ' + switch_help
376
if not help.endswith("."):
378
return RegistryOption(name_, help, reg, title=title,
379
value_switches=value_switches, enum_switch=enum_switch)
381
def add_option(self, parser, short_name):
382
"""Add this option to an Optparse parser"""
383
if self.value_switches:
384
parser = parser.add_option_group(self.title)
386
Option.add_option(self, parser, short_name)
387
if self.value_switches:
388
for key in self.registry.keys():
389
option_strings = ['--%s' % key]
390
if self.is_hidden(key):
391
help = optparse.SUPPRESS_HELP
393
help = self.registry.get_help(key)
394
if (self.short_value_switches and
395
key in self.short_value_switches):
396
option_strings.append('-%s' %
397
self.short_value_switches[key])
398
parser.add_option(action='callback',
399
callback=self._optparse_value_callback(key),
403
def _optparse_value_callback(self, cb_value):
404
def cb(option, opt, value, parser):
405
v = self.type(cb_value)
406
setattr(parser.values, self._param_name, v)
407
if self.custom_callback is not None:
408
self.custom_callback(option, self._param_name, v, parser)
411
def iter_switches(self):
412
"""Iterate through the list of switches provided by the option
414
:return: an iterator of (name, short_name, argname, help)
416
for value in Option.iter_switches(self):
418
if self.value_switches:
419
for key in sorted(self.registry.keys()):
420
yield key, None, None, self.registry.get_help(key)
422
def is_hidden(self, name):
423
if name == self.name:
424
return Option.is_hidden(self, name)
425
return getattr(self.registry.get_info(name), 'hidden', False)
428
class OptionParser(optparse.OptionParser):
429
"""OptionParser that raises exceptions instead of exiting"""
431
DEFAULT_VALUE = object()
434
optparse.OptionParser.__init__(self)
435
self.formatter = GettextIndentedHelpFormatter()
437
def error(self, message):
438
raise errors.BzrCommandError(message)
440
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):
441
"""Adds gettext() call to format_option()"""
443
optparse.IndentedHelpFormatter.__init__(self)
445
def format_option(self, option):
446
"""code taken from Python's optparse.py"""
448
option.help = i18n.gettext(option.help)
449
return optparse.IndentedHelpFormatter.format_option(self, option)
451
def get_optparser(options):
452
"""Generate an optparse parser for bzrlib-style options"""
454
parser = OptionParser()
455
parser.remove_option('--help')
456
for option in options.itervalues():
457
option.add_option(parser, option.short_name())
461
def custom_help(name, help):
462
"""Clone a common option overriding the help."""
464
o = copy.copy(Option.OPTIONS[name])
469
def _standard_option(name, **kwargs):
470
"""Register a standard option."""
471
# All standard options are implicitly 'global' ones
472
Option.STD_OPTIONS[name] = Option(name, **kwargs)
473
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
157
476
def _global_option(name, **kwargs):
158
"""Register o as a global option."""
477
"""Register a global option."""
159
478
Option.OPTIONS[name] = Option(name, **kwargs)
481
def _global_registry_option(name, help, registry=None, **kwargs):
482
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
485
# This is the verbosity level detected during command line parsing.
486
# Note that the final value is dependent on the order in which the
487
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
488
# The final value will be one of the following:
496
def _verbosity_level_callback(option, opt_str, value, parser):
497
global _verbosity_level
499
# Either --no-verbose or --no-quiet was specified
501
elif opt_str == "verbose":
502
if _verbosity_level > 0:
503
_verbosity_level += 1
507
if _verbosity_level < 0:
508
_verbosity_level -= 1
510
_verbosity_level = -1
513
class MergeTypeRegistry(_mod_registry.Registry):
518
_merge_type_registry = MergeTypeRegistry()
519
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
520
"Native diff3-style merge")
521
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
522
"Merge using external diff3")
523
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
525
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
528
# Declare the standard options
529
_standard_option('help', short_name='h',
530
help='Show help message.')
531
_standard_option('usage',
532
help='Show usage message and options.')
533
_standard_option('verbose', short_name='v',
534
help='Display more information.',
535
custom_callback=_verbosity_level_callback)
536
_standard_option('quiet', short_name='q',
537
help="Only display errors and warnings.",
538
custom_callback=_verbosity_level_callback)
540
# Declare commonly used options
161
541
_global_option('all')
162
542
_global_option('overwrite', help='Ignore differences between branches and '
163
'overwrite unconditionally')
543
'overwrite unconditionally.')
164
544
_global_option('basis', type=str)
165
545
_global_option('bound')
166
546
_global_option('diff-options', type=str)
167
_global_option('help',
168
help='show help message')
169
_global_option('file', type=unicode)
547
_global_option('file', type=unicode, short_name='F')
170
548
_global_option('force')
171
549
_global_option('format', type=unicode)
172
550
_global_option('forward')
173
_global_option('message', type=unicode)
551
_global_option('message', type=unicode,
553
help='Message string.')
174
554
_global_option('no-recurse')
175
_global_option('prefix', type=str,
176
help='Set prefixes to added to old and new filenames, as '
177
'two values separated by a colon.')
555
_global_option('null', short_name='0',
556
help='Use an ASCII NUL (\\0) separator rather than '
178
558
_global_option('profile',
179
help='show performance profiling information')
180
_global_option('revision', type=_parse_revision_str)
181
_global_option('show-ids',
182
help='show internal object ids')
183
_global_option('timezone',
559
help='Show performance profiling information.')
560
_global_option('revision',
561
type=_parse_revision_str,
563
help='See "help revisionspec" for details.')
564
_global_option('change',
565
type=_parse_change_str,
567
param_name='revision',
568
help='Select changes introduced by the specified revision. See also "help revisionspec".')
569
_global_option('show-ids',
570
help='Show internal object ids.')
571
_global_option('timezone',
185
help='display timezone as local, original, or utc')
573
help='Display timezone as local, original, or utc.')
186
574
_global_option('unbound')
187
_global_option('verbose',
188
help='display more information')
189
575
_global_option('version')
190
576
_global_option('email')
191
577
_global_option('update')
192
_global_option('log-format', type=str, help="Use this log format")
193
_global_option('long', help='Use detailed log format. Same as --log-format long')
578
_global_registry_option('log-format', "Use specified log format.",
579
lazy_registry=('bzrlib.log', 'log_formatter_registry'),
580
value_switches=True, title='Log format',
581
short_value_switches={'short': 'S'})
582
_global_option('long', help='Use detailed log format. Same as --log-format long',
194
584
_global_option('short', help='Use moderately short log format. Same as --log-format short')
195
585
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
196
586
_global_option('root', type=str)
197
587
_global_option('no-backup')
198
_global_option('merge-type', type=_parse_merge_type,
199
help='Select a particular merge algorithm')
588
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
589
_merge_type_registry, value_switches=True,
590
title='Merge algorithm')
200
591
_global_option('pattern', type=str)
201
_global_option('quiet')
202
592
_global_option('remember', help='Remember the specified location as a'
204
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
594
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
205
595
_global_option('kind', type=str)
206
596
_global_option('dry-run',
207
help="show what would be done, but don't actually do anything")
210
def _global_short(short_name, long_name):
211
assert short_name not in Option.SHORT_OPTIONS
212
Option.SHORT_OPTIONS[short_name] = Option.OPTIONS[long_name]
215
Option.SHORT_OPTIONS['F'] = Option.OPTIONS['file']
216
Option.SHORT_OPTIONS['h'] = Option.OPTIONS['help']
217
Option.SHORT_OPTIONS['m'] = Option.OPTIONS['message']
218
Option.SHORT_OPTIONS['r'] = Option.OPTIONS['revision']
219
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
220
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
221
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
222
Option.SHORT_OPTIONS['p'] = Option.OPTIONS['prefix']
597
help="Show what would be done, but don't actually do anything.")
598
_global_option('name-from-revision', help='The path name in the old tree.')
599
_global_option('directory', short_name='d', type=unicode,
600
help='Branch to operate on, instead of working directory')
602
diff_writer_registry = _mod_registry.Registry()
603
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
604
diff_writer_registry.default_key = 'plain'
added
removed
bzrlib/option.py
