32
40
each revision specifier supplied.
34
42
>>> _parse_revision_str('234')
35
[<RevisionSpec_revno 234>]
43
[<RevisionSpec_dwim 234>]
36
44
>>> _parse_revision_str('234..567')
37
[<RevisionSpec_revno 234>, <RevisionSpec_revno 567>]
45
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 567>]
38
46
>>> _parse_revision_str('..')
39
47
[<RevisionSpec None>, <RevisionSpec None>]
40
48
>>> _parse_revision_str('..234')
41
[<RevisionSpec None>, <RevisionSpec_revno 234>]
49
[<RevisionSpec None>, <RevisionSpec_dwim 234>]
42
50
>>> _parse_revision_str('234..')
43
[<RevisionSpec_revno 234>, <RevisionSpec None>]
51
[<RevisionSpec_dwim 234>, <RevisionSpec None>]
44
52
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
45
[<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
53
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 456>, <RevisionSpec_dwim 789>]
46
54
>>> _parse_revision_str('234....789') #Error ?
47
[<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 789>]
55
[<RevisionSpec_dwim 234>, <RevisionSpec None>, <RevisionSpec_dwim 789>]
48
56
>>> _parse_revision_str('revid:test@other.com-234234')
49
57
[<RevisionSpec_revid revid:test@other.com-234234>]
50
58
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
51
59
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
52
60
>>> _parse_revision_str('revid:test@other.com-234234..23')
53
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 23>]
61
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_dwim 23>]
54
62
>>> _parse_revision_str('date:2005-04-12')
55
63
[<RevisionSpec_date date:2005-04-12>]
56
64
>>> _parse_revision_str('date:2005-04-12 12:24:33')
60
68
>>> _parse_revision_str('date:2005-04-12,12:24:33')
61
69
[<RevisionSpec_date date:2005-04-12,12:24:33>]
62
70
>>> _parse_revision_str('-5..23')
63
[<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
71
[<RevisionSpec_dwim -5>, <RevisionSpec_dwim 23>]
64
72
>>> _parse_revision_str('-5')
65
[<RevisionSpec_revno -5>]
73
[<RevisionSpec_dwim -5>]
66
74
>>> _parse_revision_str('123a')
67
Traceback (most recent call last):
69
NoSuchRevisionSpec: No namespace registered for string: '123a'
75
[<RevisionSpec_dwim 123a>]
70
76
>>> _parse_revision_str('abc')
71
Traceback (most recent call last):
73
NoSuchRevisionSpec: No namespace registered for string: 'abc'
77
[<RevisionSpec_dwim abc>]
74
78
>>> _parse_revision_str('branch:../branch2')
75
79
[<RevisionSpec_branch branch:../branch2>]
76
80
>>> _parse_revision_str('branch:../../branch2')
77
81
[<RevisionSpec_branch branch:../../branch2>]
78
82
>>> _parse_revision_str('branch:../../branch2..23')
79
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
83
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_dwim 23>]
84
>>> _parse_revision_str('branch:..\\\\branch2')
85
[<RevisionSpec_branch branch:..\\branch2>]
86
>>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
87
[<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_dwim 23>]
81
89
# TODO: Maybe move this into revisionspec.py
83
sep = re.compile("\\.\\.(?!/)")
91
# split on .. that is not followed by a / or \
92
sep = re.compile(r'\.\.(?![\\/])')
84
93
for x in sep.split(revstr):
85
revs.append(RevisionSpec.from_string(x or None))
94
revs.append(revisionspec.RevisionSpec.from_string(x or None))
98
def _parse_change_str(revstr):
99
"""Parse the revision string and return a tuple with left-most
100
parent of the revision.
102
>>> _parse_change_str('123')
103
(<RevisionSpec_before before:123>, <RevisionSpec_dwim 123>)
104
>>> _parse_change_str('123..124')
105
Traceback (most recent call last):
107
RangeInChangeOption: Option --change does not accept revision ranges
109
revs = _parse_revision_str(revstr)
111
raise errors.RangeInChangeOption()
112
return (revisionspec.RevisionSpec.from_string('before:' + revstr),
89
116
def _parse_merge_type(typestring):
90
117
return get_merge_type(typestring)
100
127
type_list = '\n'.join(lines)
101
128
msg = "No known merge type %s. Supported types are:\n%s" %\
102
129
(typestring, type_list)
103
raise BzrCommandError(msg)
130
raise errors.BzrCommandError(msg)
105
133
class Option(object):
106
"""Description of a command line option"""
107
# TODO: Some way to show in help a description of the option argument
134
"""Description of a command line option
136
:ivar _short_name: If this option has a single-letter name, this is it.
140
# The dictionary of standard options. These are always legal.
143
# The dictionary of commonly used options. these are only legal
144
# if a command explicitly references them by name in the list
145
# of supported options.
112
def __init__(self, name, help='', type=None, argname=None):
148
def __init__(self, name, help='', type=None, argname=None,
149
short_name=None, param_name=None, custom_callback=None,
113
151
"""Make a new command option.
115
name -- regular name of the command, used in the double-dash
116
form and also as the parameter to the command's run()
119
help -- help message displayed in command help
121
type -- function called to parse the option argument, or
153
:param name: regular name of the command, used in the double-dash
154
form and also as the parameter to the command's run()
155
method (unless param_name is specified).
157
:param help: help message displayed in command help
159
:param type: function called to parse the option argument, or
122
160
None (default) if this option doesn't take an argument.
124
argname -- name of option argument, if any
162
:param argname: name of option argument, if any
164
:param short_name: short option code for use with a single -, e.g.
165
short_name="v" to enable parsing of -v.
167
:param param_name: name of the parameter which will be passed to
168
the command's run() method.
170
:param custom_callback: a callback routine to be called after normal
171
processing. The signature of the callback routine is
172
(option, name, new_value, parser).
173
:param hidden: If True, the option should be hidden in help and
126
# TODO: perhaps a subclass that automatically does
127
# --option, --no-option for reversible booleans
179
self._short_name = short_name
132
assert argname is None
182
raise ValueError('argname not valid for booleans')
133
183
elif argname is None:
135
185
self.argname = argname
186
if param_name is None:
187
self._param_name = self.name.replace('-', '_')
189
self._param_name = param_name
190
self.custom_callback = custom_callback
137
193
def short_name(self):
138
"""Return the single character option for this command, if any.
195
return self._short_name
140
Short options are globally registered.
142
for short, option in Option.SHORT_OPTIONS.iteritems():
197
def set_short_name(self, short_name):
198
self._short_name = short_name
146
200
def get_negation_name(self):
147
201
if self.name.startswith('no-'):
154
208
option_strings = ['--%s' % self.name]
155
209
if short_name is not None:
156
210
option_strings.append('-%s' % short_name)
212
help = optparse.SUPPRESS_HELP
157
215
optargfn = self.type
158
216
if optargfn is None:
159
parser.add_option(action='store_true', dest=self.name,
161
default=OptionParser.DEFAULT_VALUE,
217
parser.add_option(action='callback',
218
callback=self._optparse_bool_callback,
219
callback_args=(True,),
163
222
negation_strings = ['--%s' % self.get_negation_name()]
164
parser.add_option(action='store_false', dest=self.name,
223
parser.add_option(action='callback',
224
callback=self._optparse_bool_callback,
225
callback_args=(False,),
165
226
help=optparse.SUPPRESS_HELP, *negation_strings)
167
parser.add_option(action='callback',
168
callback=self._optparse_callback,
228
parser.add_option(action='callback',
229
callback=self._optparse_callback,
169
230
type='string', metavar=self.argname.upper(),
171
default=OptionParser.DEFAULT_VALUE,
232
default=OptionParser.DEFAULT_VALUE,
235
def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
236
setattr(parser.values, self._param_name, bool_v)
237
if self.custom_callback is not None:
238
self.custom_callback(option, self._param_name, bool_v, parser)
174
240
def _optparse_callback(self, option, opt, value, parser):
175
setattr(parser.values, self.name, self.type(value))
242
setattr(parser.values, self._param_name, v)
243
if self.custom_callback is not None:
244
self.custom_callback(option, self.name, v, parser)
177
246
def iter_switches(self):
178
247
"""Iterate through the list of switches provided by the option
180
249
:return: an iterator of (name, short_name, argname, help)
182
251
argname = self.argname
184
253
argname = argname.upper()
185
254
yield self.name, self.short_name(), argname, self.help
256
def is_hidden(self, name):
260
class ListOption(Option):
261
"""Option used to provide a list of values.
263
On the command line, arguments are specified by a repeated use of the
264
option. '-' is a special argument that resets the list. For example,
266
sets the value of the 'foo' option to ['a', 'b'], and
267
--foo=a --foo=b --foo=- --foo=c
268
sets the value of the 'foo' option to ['c'].
271
def add_option(self, parser, short_name):
272
"""Add this option to an Optparse parser."""
273
option_strings = ['--%s' % self.name]
274
if short_name is not None:
275
option_strings.append('-%s' % short_name)
276
parser.add_option(action='callback',
277
callback=self._optparse_callback,
278
type='string', metavar=self.argname.upper(),
279
help=self.help, dest=self._param_name, default=[],
282
def _optparse_callback(self, option, opt, value, parser):
283
values = getattr(parser.values, self._param_name)
287
values.append(self.type(value))
288
if self.custom_callback is not None:
289
self.custom_callback(option, self._param_name, values, parser)
292
class RegistryOption(Option):
293
"""Option based on a registry
295
The values for the options correspond to entries in the registry. Input
296
must be a registry key. After validation, it is converted into an object
297
using Registry.get or a caller-provided converter.
300
def validate_value(self, value):
301
"""Validate a value name"""
302
if value not in self.registry:
303
raise errors.BadOptionValue(self.name, value)
305
def convert(self, value):
306
"""Convert a value name into an output type"""
307
self.validate_value(value)
308
if self.converter is None:
309
return self.registry.get(value)
311
return self.converter(value)
313
def __init__(self, name, help, registry=None, converter=None,
314
value_switches=False, title=None, enum_switch=True,
315
lazy_registry=None, short_name=None):
319
:param name: The option name.
320
:param help: Help for the option.
321
:param registry: A Registry containing the values
322
:param converter: Callable to invoke with the value name to produce
323
the value. If not supplied, self.registry.get is used.
324
:param value_switches: If true, each possible value is assigned its
325
own switch. For example, instead of '--format knit',
326
'--knit' can be used interchangeably.
327
:param enum_switch: If true, a switch is provided with the option name,
329
:param lazy_registry: A tuple of (module name, attribute name) for a
330
registry to be lazily loaded.
332
Option.__init__(self, name, help, type=self.convert, short_name=short_name)
333
self._registry = registry
335
if lazy_registry is None:
336
raise AssertionError(
337
'One of registry or lazy_registry must be given.')
338
self._lazy_registry = _mod_registry._LazyObjectGetter(
340
if registry is not None and lazy_registry is not None:
341
raise AssertionError(
342
'registry and lazy_registry are mutually exclusive')
344
self.converter = converter
345
self.value_switches = value_switches
346
self.enum_switch = enum_switch
348
if self.title is None:
353
if self._registry is None:
354
self._registry = self._lazy_registry.get_obj()
355
return self._registry
358
def from_kwargs(name_, help=None, title=None, value_switches=False,
359
enum_switch=True, **kwargs):
360
"""Convenience method to generate string-map registry options
362
name, help, value_switches and enum_switch are passed to the
363
RegistryOption constructor. Any other keyword arguments are treated
364
as values for the option, and their value is treated as the help.
366
reg = _mod_registry.Registry()
367
for name, switch_help in sorted(kwargs.items()):
368
name = name.replace('_', '-')
369
reg.register(name, name, help=switch_help)
370
if not value_switches:
371
help = help + ' "' + name + '": ' + switch_help
372
if not help.endswith("."):
374
return RegistryOption(name_, help, reg, title=title,
375
value_switches=value_switches, enum_switch=enum_switch)
377
def add_option(self, parser, short_name):
378
"""Add this option to an Optparse parser"""
379
if self.value_switches:
380
parser = parser.add_option_group(self.title)
382
Option.add_option(self, parser, short_name)
383
if self.value_switches:
384
for key in self.registry.keys():
385
option_strings = ['--%s' % key]
386
if self.is_hidden(key):
387
help = optparse.SUPPRESS_HELP
389
help = self.registry.get_help(key)
390
parser.add_option(action='callback',
391
callback=self._optparse_value_callback(key),
395
def _optparse_value_callback(self, cb_value):
396
def cb(option, opt, value, parser):
397
v = self.type(cb_value)
398
setattr(parser.values, self._param_name, v)
399
if self.custom_callback is not None:
400
self.custom_callback(option, self._param_name, v, parser)
403
def iter_switches(self):
404
"""Iterate through the list of switches provided by the option
406
:return: an iterator of (name, short_name, argname, help)
408
for value in Option.iter_switches(self):
410
if self.value_switches:
411
for key in sorted(self.registry.keys()):
412
yield key, None, None, self.registry.get_help(key)
414
def is_hidden(self, name):
415
if name == self.name:
416
return Option.is_hidden(self, name)
417
return getattr(self.registry.get_info(name), 'hidden', False)
188
420
class OptionParser(optparse.OptionParser):
189
421
"""OptionParser that raises exceptions instead of exiting"""
200
432
parser = OptionParser()
201
433
parser.remove_option('--help')
202
short_options = dict((k.name, v) for v, k in
203
Option.SHORT_OPTIONS.iteritems())
204
434
for option in options.itervalues():
205
option.add_option(parser, short_options.get(option.name))
435
option.add_option(parser, option.short_name())
439
def custom_help(name, help):
440
"""Clone a common option overriding the help."""
442
o = copy.copy(Option.OPTIONS[name])
447
def _standard_option(name, **kwargs):
448
"""Register a standard option."""
449
# All standard options are implicitly 'global' ones
450
Option.STD_OPTIONS[name] = Option(name, **kwargs)
451
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
209
454
def _global_option(name, **kwargs):
210
"""Register o as a global option."""
455
"""Register a global option."""
211
456
Option.OPTIONS[name] = Option(name, **kwargs)
459
def _global_registry_option(name, help, registry=None, **kwargs):
460
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
463
# This is the verbosity level detected during command line parsing.
464
# Note that the final value is dependent on the order in which the
465
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
466
# The final value will be one of the following:
474
def _verbosity_level_callback(option, opt_str, value, parser):
475
global _verbosity_level
477
# Either --no-verbose or --no-quiet was specified
479
elif opt_str == "verbose":
480
if _verbosity_level > 0:
481
_verbosity_level += 1
485
if _verbosity_level < 0:
486
_verbosity_level -= 1
488
_verbosity_level = -1
491
class MergeTypeRegistry(_mod_registry.Registry):
496
_merge_type_registry = MergeTypeRegistry()
497
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
498
"Native diff3-style merge")
499
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
500
"Merge using external diff3")
501
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
503
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
506
# Declare the standard options
507
_standard_option('help', short_name='h',
508
help='Show help message.')
509
_standard_option('usage',
510
help='Show usage message and options.')
511
_standard_option('verbose', short_name='v',
512
help='Display more information.',
513
custom_callback=_verbosity_level_callback)
514
_standard_option('quiet', short_name='q',
515
help="Only display errors and warnings.",
516
custom_callback=_verbosity_level_callback)
518
# Declare commonly used options
213
519
_global_option('all')
214
520
_global_option('overwrite', help='Ignore differences between branches and '
215
'overwrite unconditionally')
521
'overwrite unconditionally.')
216
522
_global_option('basis', type=str)
217
523
_global_option('bound')
218
524
_global_option('diff-options', type=str)
219
_global_option('help',
220
help='show help message')
221
_global_option('file', type=unicode)
525
_global_option('file', type=unicode, short_name='F')
222
526
_global_option('force')
223
527
_global_option('format', type=unicode)
224
528
_global_option('forward')
225
_global_option('message', type=unicode)
529
_global_option('message', type=unicode,
531
help='Message string.')
226
532
_global_option('no-recurse')
227
_global_option('prefix', type=str,
228
help='Set prefixes to added to old and new filenames, as '
229
'two values separated by a colon.')
533
_global_option('null', short_name='0',
534
help='Use an ASCII NUL (\\0) separator rather than '
230
536
_global_option('profile',
231
help='show performance profiling information')
232
_global_option('revision', type=_parse_revision_str)
233
_global_option('show-ids',
234
help='show internal object ids')
235
_global_option('timezone',
537
help='Show performance profiling information.')
538
_global_option('revision',
539
type=_parse_revision_str,
541
help='See "help revisionspec" for details.')
542
_global_option('change',
543
type=_parse_change_str,
545
param_name='revision',
546
help='Select changes introduced by the specified revision. See also "help revisionspec".')
547
_global_option('show-ids',
548
help='Show internal object ids.')
549
_global_option('timezone',
237
help='display timezone as local, original, or utc')
551
help='Display timezone as local, original, or utc.')
238
552
_global_option('unbound')
239
_global_option('verbose',
240
help='display more information')
241
553
_global_option('version')
242
554
_global_option('email')
243
555
_global_option('update')
244
_global_option('log-format', type=str, help="Use this log format")
245
_global_option('long', help='Use detailed log format. Same as --log-format long')
556
_global_registry_option('log-format', "Use specified log format.",
557
lazy_registry=('bzrlib.log', 'log_formatter_registry'),
558
value_switches=True, title='Log format')
559
_global_option('long', help='Use detailed log format. Same as --log-format long',
246
561
_global_option('short', help='Use moderately short log format. Same as --log-format short')
247
562
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
248
563
_global_option('root', type=str)
249
564
_global_option('no-backup')
250
_global_option('merge-type', type=_parse_merge_type,
251
help='Select a particular merge algorithm')
565
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
566
_merge_type_registry, value_switches=True,
567
title='Merge algorithm')
252
568
_global_option('pattern', type=str)
253
_global_option('quiet')
254
569
_global_option('remember', help='Remember the specified location as a'
256
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
571
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
257
572
_global_option('kind', type=str)
258
573
_global_option('dry-run',
259
help="show what would be done, but don't actually do anything")
262
def _global_short(short_name, long_name):
263
assert short_name not in Option.SHORT_OPTIONS
264
Option.SHORT_OPTIONS[short_name] = Option.OPTIONS[long_name]
267
Option.SHORT_OPTIONS['F'] = Option.OPTIONS['file']
268
Option.SHORT_OPTIONS['h'] = Option.OPTIONS['help']
269
Option.SHORT_OPTIONS['m'] = Option.OPTIONS['message']
270
Option.SHORT_OPTIONS['r'] = Option.OPTIONS['revision']
271
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
272
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
273
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
274
Option.SHORT_OPTIONS['p'] = Option.OPTIONS['prefix']
574
help="Show what would be done, but don't actually do anything.")
575
_global_option('name-from-revision', help='The path name in the old tree.')
576
_global_option('directory', short_name='d', type=unicode,
577
help='Branch to operate on, instead of working directory')
579
diff_writer_registry = _mod_registry.Registry()
580
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
581
diff_writer_registry.default_key = 'plain'
added
removed
bzrlib/option.py
