1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
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.
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.
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
17
# TODO: For things like --diff-prefix, we want a way to customize the display
18
# of the option argument.
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
34
from bzrlib.trace import warning
37
def _parse_revision_str(revstr):
38
"""This handles a revision string -> revno.
40
This always returns a list. The list will have one element for
41
each revision specifier supplied.
43
>>> _parse_revision_str('234')
44
[<RevisionSpec_revno 234>]
45
>>> _parse_revision_str('234..567')
46
[<RevisionSpec_revno 234>, <RevisionSpec_revno 567>]
47
>>> _parse_revision_str('..')
48
[<RevisionSpec None>, <RevisionSpec None>]
49
>>> _parse_revision_str('..234')
50
[<RevisionSpec None>, <RevisionSpec_revno 234>]
51
>>> _parse_revision_str('234..')
52
[<RevisionSpec_revno 234>, <RevisionSpec None>]
53
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
54
[<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
55
>>> _parse_revision_str('234....789') #Error ?
56
[<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 789>]
57
>>> _parse_revision_str('revid:test@other.com-234234')
58
[<RevisionSpec_revid revid:test@other.com-234234>]
59
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
60
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
61
>>> _parse_revision_str('revid:test@other.com-234234..23')
62
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 23>]
63
>>> _parse_revision_str('date:2005-04-12')
64
[<RevisionSpec_date date:2005-04-12>]
65
>>> _parse_revision_str('date:2005-04-12 12:24:33')
66
[<RevisionSpec_date date:2005-04-12 12:24:33>]
67
>>> _parse_revision_str('date:2005-04-12T12:24:33')
68
[<RevisionSpec_date date:2005-04-12T12:24:33>]
69
>>> _parse_revision_str('date:2005-04-12,12:24:33')
70
[<RevisionSpec_date date:2005-04-12,12:24:33>]
71
>>> _parse_revision_str('-5..23')
72
[<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
73
>>> _parse_revision_str('-5')
74
[<RevisionSpec_revno -5>]
75
>>> _parse_revision_str('123a')
76
Traceback (most recent call last):
78
NoSuchRevisionSpec: No namespace registered for string: '123a'
79
>>> _parse_revision_str('abc')
80
Traceback (most recent call last):
82
NoSuchRevisionSpec: No namespace registered for string: 'abc'
83
>>> _parse_revision_str('branch:../branch2')
84
[<RevisionSpec_branch branch:../branch2>]
85
>>> _parse_revision_str('branch:../../branch2')
86
[<RevisionSpec_branch branch:../../branch2>]
87
>>> _parse_revision_str('branch:../../branch2..23')
88
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
90
# TODO: Maybe move this into revisionspec.py
92
# split on the first .. that is not followed by a / ?
93
sep = re.compile("\\.\\.(?!/)")
94
for x in sep.split(revstr):
95
revs.append(revisionspec.RevisionSpec.from_string(x or None))
99
def _parse_merge_type(typestring):
100
return get_merge_type(typestring)
102
def get_merge_type(typestring):
103
"""Attempt to find the merge class/factory associated with a string."""
104
from merge import merge_types
106
return merge_types[typestring][0]
108
templ = '%s%%7s: %%s' % (' '*12)
109
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
110
type_list = '\n'.join(lines)
111
msg = "No known merge type %s. Supported types are:\n%s" %\
112
(typestring, type_list)
113
raise errors.BzrCommandError(msg)
116
class Option(object):
117
"""Description of a command line option
119
:ivar _short_name: If this option has a single-letter name, this is it.
123
# TODO: Some way to show in help a description of the option argument
127
def __init__(self, name, help='', type=None, argname=None,
129
"""Make a new command option.
131
name -- regular name of the command, used in the double-dash
132
form and also as the parameter to the command's run()
135
help -- help message displayed in command help
137
type -- function called to parse the option argument, or
138
None (default) if this option doesn't take an argument.
140
argname -- name of option argument, if any
145
self._short_name = short_name
147
assert argname is None
148
elif argname is None:
150
self.argname = argname
152
def short_name(self):
154
return self._short_name
156
# remove this when SHORT_OPTIONS is removed
157
# XXX: This is accessing a DeprecatedDict, so we call the super
158
# method to avoid warnings
159
for (k, v) in dict.iteritems(Option.SHORT_OPTIONS):
163
def set_short_name(self, short_name):
164
self._short_name = short_name
166
def get_negation_name(self):
167
if self.name.startswith('no-'):
170
return 'no-' + self.name
172
def add_option(self, parser, short_name):
173
"""Add this option to an Optparse parser"""
174
option_strings = ['--%s' % self.name]
175
if short_name is not None:
176
option_strings.append('-%s' % short_name)
179
parser.add_option(action='store_true', dest=self.name,
181
default=OptionParser.DEFAULT_VALUE,
183
negation_strings = ['--%s' % self.get_negation_name()]
184
parser.add_option(action='store_false', dest=self.name,
185
help=optparse.SUPPRESS_HELP, *negation_strings)
187
parser.add_option(action='callback',
188
callback=self._optparse_callback,
189
type='string', metavar=self.argname.upper(),
191
default=OptionParser.DEFAULT_VALUE,
194
def _optparse_callback(self, option, opt, value, parser):
195
setattr(parser.values, self.name, self.type(value))
197
def iter_switches(self):
198
"""Iterate through the list of switches provided by the option
200
:return: an iterator of (name, short_name, argname, help)
202
argname = self.argname
203
if argname is not None:
204
argname = argname.upper()
205
yield self.name, self.short_name(), argname, self.help
208
class RegistryOption(Option):
209
"""Option based on a registry
211
The values for the options correspond to entries in the registry. Input
212
must be a registry key. After validation, it is converted into an object
213
using Registry.get or a caller-provided converter.
216
def validate_value(self, value):
217
"""Validate a value name"""
218
if value not in self.registry:
219
raise errors.BadOptionValue(self.name, value)
221
def convert(self, value):
222
"""Convert a value name into an output type"""
223
self.validate_value(value)
224
if self.converter is None:
225
return self.registry.get(value)
227
return self.converter(value)
229
def __init__(self, name, help, registry, converter=None,
230
value_switches=False, title=None, enum_switch=True):
234
:param name: The option name.
235
:param help: Help for the option.
236
:param registry: A Registry containing the values
237
:param converter: Callable to invoke with the value name to produce
238
the value. If not supplied, self.registry.get is used.
239
:param value_switches: If true, each possible value is assigned its
240
own switch. For example, instead of '--format knit',
241
'--knit' can be used interchangeably.
242
:param enum_switch: If true, a switch is provided with the option name,
245
Option.__init__(self, name, help, type=self.convert)
246
self.registry = registry
248
self.converter = converter
249
self.value_switches = value_switches
250
self.enum_switch = enum_switch
252
if self.title is None:
256
def from_kwargs(name_, help=None, title=None, value_switches=False,
257
enum_switch=True, **kwargs):
258
"""Convenience method to generate string-map registry options
260
name, help, value_switches and enum_switch are passed to the
261
RegistryOption constructor. Any other keyword arguments are treated
262
as values for the option, and they value is treated as the help.
264
reg = registry.Registry()
265
for name, help in kwargs.iteritems():
266
name = name.replace('_', '-')
267
reg.register(name, name, help=help)
268
return RegistryOption(name_, help, reg, title=title,
269
value_switches=value_switches, enum_switch=enum_switch)
271
def add_option(self, parser, short_name):
272
"""Add this option to an Optparse parser"""
273
if self.value_switches:
274
parser = parser.add_option_group(self.title)
276
Option.add_option(self, parser, short_name)
277
if self.value_switches:
278
for key in self.registry.keys():
279
option_strings = ['--%s' % key]
280
parser.add_option(action='callback',
281
callback=self._optparse_value_callback(key),
282
help=self.registry.get_help(key),
285
def _optparse_value_callback(self, cb_value):
286
def cb(option, opt, value, parser):
287
setattr(parser.values, self.name, self.type(cb_value))
290
def iter_switches(self):
291
"""Iterate through the list of switches provided by the option
293
:return: an iterator of (name, short_name, argname, help)
295
for value in Option.iter_switches(self):
297
if self.value_switches:
298
for key in sorted(self.registry.keys()):
299
yield key, None, None, self.registry.get_help(key)
302
class OptionParser(optparse.OptionParser):
303
"""OptionParser that raises exceptions instead of exiting"""
305
DEFAULT_VALUE = object()
307
def error(self, message):
308
raise errors.BzrCommandError(message)
311
def get_optparser(options):
312
"""Generate an optparse parser for bzrlib-style options"""
314
parser = OptionParser()
315
parser.remove_option('--help')
316
for option in options.itervalues():
317
option.add_option(parser, option.short_name())
321
def _global_option(name, **kwargs):
322
"""Register o as a global option."""
323
Option.OPTIONS[name] = Option(name, **kwargs)
326
def _global_registry_option(name, help, registry, **kwargs):
327
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
330
class MergeTypeRegistry(registry.Registry):
335
_merge_type_registry = MergeTypeRegistry()
336
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
337
"Native diff3-style merge")
338
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
339
"Merge using external diff3")
340
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
343
_global_option('all')
344
_global_option('overwrite', help='Ignore differences between branches and '
345
'overwrite unconditionally')
346
_global_option('basis', type=str)
347
_global_option('bound')
348
_global_option('diff-options', type=str)
349
_global_option('help',
350
help='show help message',
352
_global_option('file', type=unicode, short_name='F')
353
_global_option('force')
354
_global_option('format', type=unicode)
355
_global_option('forward')
356
_global_option('message', type=unicode,
358
_global_option('no-recurse')
359
_global_option('profile',
360
help='show performance profiling information')
361
_global_option('revision',
362
type=_parse_revision_str,
364
help='See \'help revisionspec\' for details')
365
_global_option('show-ids',
366
help='show internal object ids')
367
_global_option('timezone',
369
help='display timezone as local, original, or utc')
370
_global_option('unbound')
371
_global_option('verbose',
372
help='display more information',
374
_global_option('version')
375
_global_option('email')
376
_global_option('update')
377
_global_registry_option('log-format', "Use this log format",
378
log.log_formatter_registry, value_switches=True,
380
_global_option('long', help='Use detailed log format. Same as --log-format long',
382
_global_option('short', help='Use moderately short log format. Same as --log-format short')
383
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
384
_global_option('root', type=str)
385
_global_option('no-backup')
386
_global_registry_option('merge-type', 'Select a particular merge algorithm',
387
_merge_type_registry, value_switches=True,
388
title='Merge algorithm')
389
_global_option('pattern', type=str)
390
_global_option('quiet', short_name='q')
391
_global_option('remember', help='Remember the specified location as a'
393
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
394
_global_option('kind', type=str)
395
_global_option('dry-run',
396
help="show what would be done, but don't actually do anything")
397
_global_option('name-from-revision', help='The path name in the old tree.')
400
# prior to 0.14 these were always globally registered; the old dict is
401
# available for plugins that use it but it should not be used.
402
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(
403
symbol_versioning.zero_fourteen,
406
'F': Option.OPTIONS['file'],
407
'h': Option.OPTIONS['help'],
408
'm': Option.OPTIONS['message'],
409
'r': Option.OPTIONS['revision'],
410
'v': Option.OPTIONS['verbose'],
411
'l': Option.OPTIONS['long'],
412
'q': Option.OPTIONS['quiet'],
414
'Set the short option name when constructing the Option.',
added
removed
bzrlib/option.py
