42
41
each revision specifier supplied.
44
43
>>> _parse_revision_str('234')
45
[<RevisionSpec_dwim 234>]
44
[<RevisionSpec_revno 234>]
46
45
>>> _parse_revision_str('234..567')
47
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 567>]
46
[<RevisionSpec_revno 234>, <RevisionSpec_revno 567>]
48
47
>>> _parse_revision_str('..')
49
48
[<RevisionSpec None>, <RevisionSpec None>]
50
49
>>> _parse_revision_str('..234')
51
[<RevisionSpec None>, <RevisionSpec_dwim 234>]
50
[<RevisionSpec None>, <RevisionSpec_revno 234>]
52
51
>>> _parse_revision_str('234..')
53
[<RevisionSpec_dwim 234>, <RevisionSpec None>]
52
[<RevisionSpec_revno 234>, <RevisionSpec None>]
54
53
>>> _parse_revision_str('234..456..789') # Maybe this should be an error
55
[<RevisionSpec_dwim 234>, <RevisionSpec_dwim 456>, <RevisionSpec_dwim 789>]
54
[<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
56
55
>>> _parse_revision_str('234....789') #Error ?
57
[<RevisionSpec_dwim 234>, <RevisionSpec None>, <RevisionSpec_dwim 789>]
56
[<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 789>]
58
57
>>> _parse_revision_str('revid:test@other.com-234234')
59
58
[<RevisionSpec_revid revid:test@other.com-234234>]
60
59
>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
61
60
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
62
61
>>> _parse_revision_str('revid:test@other.com-234234..23')
63
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_dwim 23>]
62
[<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 23>]
64
63
>>> _parse_revision_str('date:2005-04-12')
65
64
[<RevisionSpec_date date:2005-04-12>]
66
65
>>> _parse_revision_str('date:2005-04-12 12:24:33')
70
69
>>> _parse_revision_str('date:2005-04-12,12:24:33')
71
70
[<RevisionSpec_date date:2005-04-12,12:24:33>]
72
71
>>> _parse_revision_str('-5..23')
73
[<RevisionSpec_dwim -5>, <RevisionSpec_dwim 23>]
72
[<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
74
73
>>> _parse_revision_str('-5')
75
[<RevisionSpec_dwim -5>]
74
[<RevisionSpec_revno -5>]
76
75
>>> _parse_revision_str('123a')
77
[<RevisionSpec_dwim 123a>]
76
Traceback (most recent call last):
78
NoSuchRevisionSpec: No namespace registered for string: '123a'
78
79
>>> _parse_revision_str('abc')
79
[<RevisionSpec_dwim abc>]
80
Traceback (most recent call last):
82
NoSuchRevisionSpec: No namespace registered for string: 'abc'
80
83
>>> _parse_revision_str('branch:../branch2')
81
84
[<RevisionSpec_branch branch:../branch2>]
82
85
>>> _parse_revision_str('branch:../../branch2')
83
86
[<RevisionSpec_branch branch:../../branch2>]
84
87
>>> _parse_revision_str('branch:../../branch2..23')
85
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_dwim 23>]
86
>>> _parse_revision_str('branch:..\\\\branch2')
87
[<RevisionSpec_branch branch:..\\branch2>]
88
>>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
89
[<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_dwim 23>]
88
[<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
91
90
# TODO: Maybe move this into revisionspec.py
93
# split on .. that is not followed by a / or \
94
sep = re.compile(r'\.\.(?![\\/])')
92
# split on the first .. that is not followed by a / ?
93
sep = re.compile("\\.\\.(?!/)")
95
94
for x in sep.split(revstr):
96
95
revs.append(revisionspec.RevisionSpec.from_string(x or None))
100
def _parse_change_str(revstr):
101
"""Parse the revision string and return a tuple with left-most
102
parent of the revision.
104
>>> _parse_change_str('123')
105
(<RevisionSpec_before before:123>, <RevisionSpec_dwim 123>)
106
>>> _parse_change_str('123..124')
107
Traceback (most recent call last):
109
breezy.errors.RangeInChangeOption: Option --change does not accept revision ranges
111
revs = _parse_revision_str(revstr)
113
raise errors.RangeInChangeOption()
114
return (revisionspec.RevisionSpec.from_string('before:' + revstr),
118
99
def _parse_merge_type(typestring):
119
100
return get_merge_type(typestring)
122
102
def get_merge_type(typestring):
123
103
"""Attempt to find the merge class/factory associated with a string."""
124
104
from merge import merge_types
126
106
return merge_types[typestring][0]
128
templ = '%s%%7s: %%s' % (' ' * 12)
129
lines = [templ % (f[0], f[1][1]) for f in merge_types.items()]
108
templ = '%s%%7s: %%s' % (' '*12)
109
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
130
110
type_list = '\n'.join(lines)
131
111
msg = "No known merge type %s. Supported types are:\n%s" %\
132
112
(typestring, type_list)
133
raise errors.CommandError(msg)
113
raise errors.BzrCommandError(msg)
136
116
class Option(object):
137
117
"""Description of a command line option
139
119
:ivar _short_name: If this option has a single-letter name, this is it.
143
# The dictionary of standard options. These are always legal.
123
# TODO: Some way to show in help a description of the option argument
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.
151
127
def __init__(self, name, help='', type=None, argname=None,
152
short_name=None, param_name=None, custom_callback=None,
154
129
"""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
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
163
138
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
140
argname -- name of option argument, if any
182
145
self._short_name = short_name
185
raise ValueError('argname not valid for booleans')
147
assert argname is None
186
148
elif argname is None:
188
150
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
152
def short_name(self):
197
153
if self._short_name:
198
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):
200
163
def set_short_name(self, short_name):
201
164
self._short_name = short_name
211
174
option_strings = ['--%s' % self.name]
212
175
if short_name is not None:
213
176
option_strings.append('-%s' % short_name)
215
help = optparse.SUPPRESS_HELP
218
177
optargfn = self.type
219
178
if optargfn is None:
220
parser.add_option(action='callback',
221
callback=self._optparse_bool_callback,
222
callback_args=(True,),
179
parser.add_option(action='store_true', dest=self.name,
181
default=OptionParser.DEFAULT_VALUE,
225
183
negation_strings = ['--%s' % self.get_negation_name()]
226
parser.add_option(action='callback',
227
callback=self._optparse_bool_callback,
228
callback_args=(False,),
184
parser.add_option(action='store_false', dest=self.name,
229
185
help=optparse.SUPPRESS_HELP, *negation_strings)
231
parser.add_option(action='callback',
232
callback=self._optparse_callback,
187
parser.add_option(action='callback',
188
callback=self._optparse_callback,
233
189
type='string', metavar=self.argname.upper(),
235
default=OptionParser.DEFAULT_VALUE,
191
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
194
def _optparse_callback(self, option, opt, value, parser):
246
except ValueError as e:
247
raise optparse.OptionValueError(
248
'invalid value for option %s: %s' % (option, value))
249
setattr(parser.values, self._param_name, v)
250
if self.custom_callback is not None:
251
self.custom_callback(option, self.name, v, parser)
195
setattr(parser.values, self.name, self.type(value))
253
197
def iter_switches(self):
254
198
"""Iterate through the list of switches provided by the option
256
200
:return: an iterator of (name, short_name, argname, help)
258
argname = self.argname
202
argname = self.argname
259
203
if argname is not None:
260
204
argname = argname.upper()
261
205
yield self.name, self.short_name(), argname, self.help
263
def is_hidden(self, name):
267
class ListOption(Option):
268
"""Option used to provide a list of values.
270
On the command line, arguments are specified by a repeated use of the
271
option. '-' is a special argument that resets the list. For example,
273
sets the value of the 'foo' option to ['a', 'b'], and
274
--foo=a --foo=b --foo=- --foo=c
275
sets the value of the 'foo' option to ['c'].
278
def add_option(self, parser, short_name):
279
"""Add this option to an Optparse parser."""
280
option_strings = ['--%s' % self.name]
281
if short_name is not None:
282
option_strings.append('-%s' % short_name)
283
parser.add_option(action='callback',
284
callback=self._optparse_callback,
285
type='string', metavar=self.argname.upper(),
286
help=self.help, dest=self._param_name, default=[],
289
def _optparse_callback(self, option, opt, value, parser):
290
values = getattr(parser.values, self._param_name)
294
values.append(self.type(value))
295
if self.custom_callback is not None:
296
self.custom_callback(option, self._param_name, values, parser)
299
208
class RegistryOption(Option):
300
209
"""Option based on a registry
433
302
for key in sorted(self.registry.keys()):
434
303
yield key, None, None, self.registry.get_help(key)
436
def is_alias(self, name):
437
"""Check whether a particular format is an alias."""
438
if name == self.name:
440
return name in self.registry.aliases()
442
def is_hidden(self, name):
443
if name == self.name:
444
return Option.is_hidden(self, name)
445
return getattr(self.registry.get_info(name), 'hidden', False)
448
306
class OptionParser(optparse.OptionParser):
449
307
"""OptionParser that raises exceptions instead of exiting"""
451
309
DEFAULT_VALUE = object()
454
optparse.OptionParser.__init__(self)
455
self.formatter = GettextIndentedHelpFormatter()
457
311
def error(self, message):
458
raise errors.CommandError(message)
461
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):
462
"""Adds gettext() call to format_option()"""
465
optparse.IndentedHelpFormatter.__init__(self)
467
def format_option(self, option):
468
"""code taken from Python's optparse.py"""
470
from .i18n import gettext
471
option.help = gettext(option.help)
472
return optparse.IndentedHelpFormatter.format_option(self, option)
312
raise errors.BzrCommandError(message)
475
315
def get_optparser(options):
476
"""Generate an optparse parser for breezy-style options"""
316
"""Generate an optparse parser for bzrlib-style options"""
478
318
parser = OptionParser()
479
319
parser.remove_option('--help')
480
for option in options:
320
for option in options.itervalues():
481
321
option.add_option(parser, option.short_name())
485
def custom_help(name, help):
486
"""Clone a common option overriding the help."""
488
o = copy.copy(Option.OPTIONS[name])
493
def _standard_option(name, **kwargs):
494
"""Register a standard option."""
495
# All standard options are implicitly 'global' ones
496
Option.STD_OPTIONS[name] = Option(name, **kwargs)
497
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
500
def _standard_list_option(name, **kwargs):
501
"""Register a standard option."""
502
# All standard options are implicitly 'global' ones
503
Option.STD_OPTIONS[name] = ListOption(name, **kwargs)
504
Option.OPTIONS[name] = Option.STD_OPTIONS[name]
507
325
def _global_option(name, **kwargs):
508
"""Register a global option."""
326
"""Register o as a global option."""
509
327
Option.OPTIONS[name] = Option(name, **kwargs)
512
def _global_registry_option(name, help, registry=None, **kwargs):
330
def _global_registry_option(name, help, registry, **kwargs):
513
331
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
516
# This is the verbosity level detected during command line parsing.
517
# Note that the final value is dependent on the order in which the
518
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
519
# The final value will be one of the following:
527
def _verbosity_level_callback(option, opt_str, value, parser):
528
global _verbosity_level
530
# Either --no-verbose or --no-quiet was specified
532
elif opt_str == "verbose":
533
if _verbosity_level > 0:
534
_verbosity_level += 1
538
if _verbosity_level < 0:
539
_verbosity_level -= 1
541
_verbosity_level = -1
544
# Declare the standard options
545
_standard_option('help', short_name='h',
546
help='Show help message.')
547
_standard_option('quiet', short_name='q',
548
help="Only display errors and warnings.",
549
custom_callback=_verbosity_level_callback)
550
_standard_option('usage',
551
help='Show usage message and options.')
552
_standard_option('verbose', short_name='v',
553
help='Display more information.',
554
custom_callback=_verbosity_level_callback)
556
# Declare commonly used options
557
_global_option('change',
558
type=_parse_change_str,
560
param_name='revision',
561
help='Select changes introduced by the specified revision. See also "help revisionspec".')
562
_global_option('directory', short_name='d', type=str,
563
help='Branch to operate on, instead of working directory.')
564
_global_option('file', type=str, short_name='F')
565
_global_registry_option('log-format', "Use specified log format.",
566
lazy_registry=('breezy.log', 'log_formatter_registry'),
567
value_switches=True, title='Log format',
568
short_value_switches={'short': 'S'})
569
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
570
lazy_registry=('breezy.merge', 'merge_type_registry'),
571
value_switches=True, title='Merge algorithm')
572
_global_option('message', type=str,
574
help='Message string.')
575
_global_option('null', short_name='0',
576
help='Use an ASCII NUL (\\0) separator rather than '
334
class MergeTypeRegistry(registry.Registry):
339
_merge_type_registry = MergeTypeRegistry()
340
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
341
"Native diff3-style merge")
342
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
343
"Merge using external diff3")
344
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
347
_global_option('all')
578
348
_global_option('overwrite', help='Ignore differences between branches and '
579
'overwrite unconditionally.')
580
_global_option('remember', help='Remember the specified location as a'
582
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
349
'overwrite unconditionally')
350
_global_option('basis', type=str)
351
_global_option('bound')
352
_global_option('diff-options', type=str)
353
_global_option('help',
354
help='show help message',
356
_global_option('file', type=unicode, short_name='F')
357
_global_option('force')
358
_global_option('format', type=unicode)
359
_global_option('forward')
360
_global_option('message', type=unicode,
362
_global_option('no-recurse')
363
_global_option('profile',
364
help='show performance profiling information')
583
365
_global_option('revision',
584
366
type=_parse_revision_str,
586
help='See "help revisionspec" for details.')
587
_global_option('show-ids',
588
help='Show internal object ids.')
589
_global_option('timezone',
368
help='See \'help revisionspec\' for details')
369
_global_option('show-ids',
370
help='show internal object ids')
371
_global_option('timezone',
591
help='Display timezone as local, original, or utc.')
593
diff_writer_registry = _mod_registry.Registry()
594
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
595
diff_writer_registry.default_key = 'plain'
373
help='display timezone as local, original, or utc')
374
_global_option('unbound')
375
_global_option('verbose',
376
help='display more information',
378
_global_option('version')
379
_global_option('email')
380
_global_option('update')
381
_global_registry_option('log-format', "Use this log format",
382
log.log_formatter_registry, value_switches=True,
384
_global_option('long', help='Use detailed log format. Same as --log-format long',
386
_global_option('short', help='Use moderately short log format. Same as --log-format short')
387
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
388
_global_option('root', type=str)
389
_global_option('no-backup')
390
_global_registry_option('merge-type', 'Select a particular merge algorithm',
391
_merge_type_registry, value_switches=True,
392
title='Merge algorithm')
393
_global_option('pattern', type=str)
394
_global_option('quiet', short_name='q')
395
_global_option('remember', help='Remember the specified location as a'
397
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
398
_global_option('kind', type=str)
399
_global_option('dry-run',
400
help="show what would be done, but don't actually do anything")
401
_global_option('name-from-revision', help='The path name in the old tree.')
404
# prior to 0.14 these were always globally registered; the old dict is
405
# available for plugins that use it but it should not be used.
406
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(
407
symbol_versioning.zero_fourteen,
410
'F': Option.OPTIONS['file'],
411
'h': Option.OPTIONS['help'],
412
'm': Option.OPTIONS['message'],
413
'r': Option.OPTIONS['revision'],
414
'v': Option.OPTIONS['verbose'],
415
'l': Option.OPTIONS['long'],
416
'q': Option.OPTIONS['quiet'],
418
'Set the short option name when constructing the Option.',