/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2598.1.4 by Martin Pool
Fix up tests for option help cleanups
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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
16
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
17
# TODO: For things like --diff-prefix, we want a way to customize the display
18
# of the option argument.
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
19
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
20
import re
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
24
import optparse
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
25
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
26
from bzrlib import (
27
    errors,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
28
    log,
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
29
    registry,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
30
    revisionspec,
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
31
    symbol_versioning,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
32
    )
33
""")
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
34
from bzrlib.trace import warning
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
35
36
37
def _parse_revision_str(revstr):
38
    """This handles a revision string -> revno.
39
40
    This always returns a list.  The list will have one element for
41
    each revision specifier supplied.
42
43
    >>> _parse_revision_str('234')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
44
    [<RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
45
    >>> _parse_revision_str('234..567')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
46
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 567>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
47
    >>> _parse_revision_str('..')
48
    [<RevisionSpec None>, <RevisionSpec None>]
49
    >>> _parse_revision_str('..234')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
50
    [<RevisionSpec None>, <RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
51
    >>> _parse_revision_str('234..')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
52
    [<RevisionSpec_revno 234>, <RevisionSpec None>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
53
    >>> _parse_revision_str('234..456..789') # Maybe this should be an error
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
54
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
55
    >>> _parse_revision_str('234....789') #Error ?
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
56
    [<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 789>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
62
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
72
    [<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
73
    >>> _parse_revision_str('-5')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
74
    [<RevisionSpec_revno -5>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
75
    >>> _parse_revision_str('123a')
76
    Traceback (most recent call last):
77
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
78
    NoSuchRevisionSpec: No namespace registered for string: '123a'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
79
    >>> _parse_revision_str('abc')
80
    Traceback (most recent call last):
81
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
82
    NoSuchRevisionSpec: No namespace registered for string: 'abc'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
83
    >>> _parse_revision_str('branch:../branch2')
84
    [<RevisionSpec_branch branch:../branch2>]
1545.1.1 by Denys Duchier
distinguish ../ as path to branch and .. as revspec separator
85
    >>> _parse_revision_str('branch:../../branch2')
86
    [<RevisionSpec_branch branch:../../branch2>]
87
    >>> _parse_revision_str('branch:../../branch2..23')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
88
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
2747.1.1 by Lukáš Lalinský
Accept ..\ as a path in revision specifiers
89
    >>> _parse_revision_str('branch:..\\\\branch2')
90
    [<RevisionSpec_branch branch:..\\branch2>]
91
    >>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
92
    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_revno 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
93
    """
94
    # TODO: Maybe move this into revisionspec.py
95
    revs = []
2747.1.1 by Lukáš Lalinský
Accept ..\ as a path in revision specifiers
96
    # split on .. that is not followed by a / or \
97
    sep = re.compile(r'\.\.(?![\\/])')
1948.4.28 by John Arbash Meinel
Remove some places that were directly instantiating a RevisionSpec object. Also get rid of support for --revision 1:2, it has been deprecated for a long time
98
    for x in sep.split(revstr):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
99
        revs.append(revisionspec.RevisionSpec.from_string(x or None))
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
100
    return revs
101
102
103
def _parse_merge_type(typestring):
1185.12.62 by Aaron Bentley
Restored merge-type selection
104
    return get_merge_type(typestring)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
105
1185.12.62 by Aaron Bentley
Restored merge-type selection
106
def get_merge_type(typestring):
107
    """Attempt to find the merge class/factory associated with a string."""
108
    from merge import merge_types
109
    try:
110
        return merge_types[typestring][0]
111
    except KeyError:
112
        templ = '%s%%7s: %%s' % (' '*12)
113
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
114
        type_list = '\n'.join(lines)
115
        msg = "No known merge type %s. Supported types are:\n%s" %\
116
            (typestring, type_list)
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
117
        raise errors.BzrCommandError(msg)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
118
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
119
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
120
class Option(object):
2190.2.1 by Martin Pool
remove global registration of short options
121
    """Description of a command line option
122
    
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
123
    :ivar _short_name: If this option has a single-letter name, this is it.
2190.2.1 by Martin Pool
remove global registration of short options
124
    Otherwise None.
125
    """
126
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
127
    # The dictionary of standard options. These are always legal.
128
    STD_OPTIONS = {}
1185.16.45 by Martin Pool
- refactor handling of short option names
129
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
130
    # The dictionary of commonly used options. these are only legal
131
    # if a command explicitly references them by name in the list
132
    # of supported options.
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
133
    OPTIONS = {}
134
2190.2.1 by Martin Pool
remove global registration of short options
135
    def __init__(self, name, help='', type=None, argname=None,
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
136
                 short_name=None, custom_callback=None):
1185.16.45 by Martin Pool
- refactor handling of short option names
137
        """Make a new command option.
138
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
139
        :param name: regular name of the command, used in the double-dash
1185.16.45 by Martin Pool
- refactor handling of short option names
140
            form and also as the parameter to the command's run() 
141
            method.
142
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
143
        :param help: help message displayed in command help
1185.16.45 by Martin Pool
- refactor handling of short option names
144
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
145
        :param type: function called to parse the option argument, or 
1185.16.45 by Martin Pool
- refactor handling of short option names
146
            None (default) if this option doesn't take an argument.
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
147
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
148
        :param argname: name of option argument, if any
149
150
        :param short_name: short option code for use with a single -, e.g.
151
            short_name="v" to enable parsing of -v.
152
153
        :param custom_callback: a callback routine to be called after normal
154
            processing. The signature of the callback routine is the same
155
            as that for normal option callbacks. See optparse in the standard
156
            Python library for details.
1185.16.45 by Martin Pool
- refactor handling of short option names
157
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
158
        self.name = name
159
        self.help = help
160
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
161
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
162
        if type is None:
163
            assert argname is None
164
        elif argname is None:
165
            argname = 'ARG'
166
        self.argname = argname
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
167
        self.custom_callback = custom_callback
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
168
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
169
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
170
        if self._short_name:
171
            return self._short_name
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
172
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
173
    def set_short_name(self, short_name):
174
        self._short_name = short_name
175
1857.1.9 by Aaron Bentley
Add hidden negation options
176
    def get_negation_name(self):
177
        if self.name.startswith('no-'):
178
            return self.name[3:]
179
        else:
180
            return 'no-' + self.name
181
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
182
    def add_option(self, parser, short_name):
183
        """Add this option to an Optparse parser"""
184
        option_strings = ['--%s' % self.name]
185
        if short_name is not None:
186
            option_strings.append('-%s' % short_name)
187
        optargfn = self.type
188
        if optargfn is None:
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
189
            parser.add_option(action='callback', 
190
                              callback=self._optparse_bool_callback, 
191
                              callback_args=(True,),
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
192
                              help=self.help,
193
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
194
            negation_strings = ['--%s' % self.get_negation_name()]
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
195
            parser.add_option(action='callback', 
196
                              callback=self._optparse_bool_callback, 
197
                              callback_args=(False,),
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
198
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
199
        else:
200
            parser.add_option(action='callback', 
201
                              callback=self._optparse_callback, 
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
202
                              type='string', metavar=self.argname.upper(),
1857.1.4 by Aaron Bentley
Set metavar according to option
203
                              help=self.help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
204
                              default=OptionParser.DEFAULT_VALUE, 
205
                              *option_strings)
206
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
207
    def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
208
        setattr(parser.values, self.name, bool_v)
209
        if self.custom_callback is not None:
210
            self.custom_callback(option, self.name, bool_v, parser)
211
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
212
    def _optparse_callback(self, option, opt, value, parser):
213
        setattr(parser.values, self.name, self.type(value))
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
214
        if self.custom_callback is not None:
215
            self.custom_callback(option, opt, value, parser)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
216
1857.1.14 by Aaron Bentley
Fix man page generation
217
    def iter_switches(self):
218
        """Iterate through the list of switches provided by the option
219
        
220
        :return: an iterator of (name, short_name, argname, help)
221
        """
222
        argname =  self.argname
223
        if argname is not None:
224
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
225
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
226
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
227
    def is_hidden(self, name):
228
        return False
229
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
230
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
231
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
232
    """Option used to provide a list of values.
233
234
    On the command line, arguments are specified by a repeated use of the
235
    option. '-' is a special argument that resets the list. For example,
236
      --foo=a --foo=b
237
    sets the value of the 'foo' option to ['a', 'b'], and
238
      --foo=a --foo=b --foo=- --foo=c
239
    sets the value of the 'foo' option to ['c'].
240
    """
241
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
242
    def add_option(self, parser, short_name):
243
        """Add this option to an Optparse parser."""
244
        option_strings = ['--%s' % self.name]
245
        if short_name is not None:
246
            option_strings.append('-%s' % short_name)
247
        parser.add_option(action='callback',
248
                          callback=self._optparse_callback,
249
                          type='string', metavar=self.argname.upper(),
250
                          help=self.help, default=[],
251
                          *option_strings)
252
253
    def _optparse_callback(self, option, opt, value, parser):
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
254
        values = getattr(parser.values, self.name)
255
        if value == '-':
256
            del values[:]
257
        else:
258
            values.append(self.type(value))
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
259
        if self.custom_callback is not None:
260
            self.custom_callback(option, opt, value, parser)
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
261
262
2221.4.1 by Aaron Bentley
Get registry options working
263
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
264
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
265
2221.4.6 by Aaron Bentley
Improve text and naming
266
    The values for the options correspond to entries in the registry.  Input
267
    must be a registry key.  After validation, it is converted into an object
268
    using Registry.get or a caller-provided converter.
269
    """
2221.4.1 by Aaron Bentley
Get registry options working
270
271
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
272
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
273
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
274
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
275
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
276
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
277
        """Convert a value name into an output type"""
278
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
279
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
280
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
281
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
282
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
283
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
284
    def __init__(self, name, help, registry, converter=None,
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
285
        value_switches=False, title=None, enum_switch=True):
2221.4.3 by Aaron Bentley
Add docstrings
286
        """
287
        Constructor.
288
289
        :param name: The option name.
290
        :param help: Help for the option.
291
        :param registry: A Registry containing the values
292
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
293
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
294
        :param value_switches: If true, each possible value is assigned its
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
295
            own switch.  For example, instead of '--format knit',
296
            '--knit' can be used interchangeably.
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
297
        :param enum_switch: If true, a switch is provided with the option name,
298
            which takes a value.
2221.4.3 by Aaron Bentley
Add docstrings
299
        """
300
        Option.__init__(self, name, help, type=self.convert)
2221.4.1 by Aaron Bentley
Get registry options working
301
        self.registry = registry
302
        self.name = name
303
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
304
        self.value_switches = value_switches
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
305
        self.enum_switch = enum_switch
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
306
        self.title = title
307
        if self.title is None:
308
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
309
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
310
    @staticmethod
311
    def from_kwargs(name_, help=None, title=None, value_switches=False,
1551.12.43 by Aaron Bentley
Misc changes from review
312
                    enum_switch=True, **kwargs):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
313
        """Convenience method to generate string-map registry options
314
315
        name, help, value_switches and enum_switch are passed to the
316
        RegistryOption constructor.  Any other keyword arguments are treated
317
        as values for the option, and they value is treated as the help.
318
        """
319
        reg = registry.Registry()
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
320
        for name, switch_help in kwargs.iteritems():
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
321
            name = name.replace('_', '-')
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
322
            reg.register(name, name, help=switch_help)
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
323
        return RegistryOption(name_, help, reg, title=title,
324
            value_switches=value_switches, enum_switch=enum_switch)
325
2221.4.1 by Aaron Bentley
Get registry options working
326
    def add_option(self, parser, short_name):
327
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
328
        if self.value_switches:
329
            parser = parser.add_option_group(self.title)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
330
        if self.enum_switch:
331
            Option.add_option(self, parser, short_name)
2221.4.1 by Aaron Bentley
Get registry options working
332
        if self.value_switches:
333
            for key in self.registry.keys():
334
                option_strings = ['--%s' % key]
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
335
                if self.is_hidden(key):
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
336
                    help = optparse.SUPPRESS_HELP
337
                else:
338
                    help = self.registry.get_help(key)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
339
                parser.add_option(action='callback',
340
                              callback=self._optparse_value_callback(key),
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
341
                                  help=help,
2221.4.1 by Aaron Bentley
Get registry options working
342
                                  *option_strings)
343
344
    def _optparse_value_callback(self, cb_value):
345
        def cb(option, opt, value, parser):
346
            setattr(parser.values, self.name, self.type(cb_value))
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
347
            if self.custom_callback is not None:
348
                self.custom_callback(option, opt, value, parser)
2221.4.1 by Aaron Bentley
Get registry options working
349
        return cb
350
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
351
    def iter_switches(self):
352
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
353
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
354
        :return: an iterator of (name, short_name, argname, help)
355
        """
356
        for value in Option.iter_switches(self):
357
            yield value
358
        if self.value_switches:
359
            for key in sorted(self.registry.keys()):
360
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
361
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
362
    def is_hidden(self, name):
363
        if name == self.name:
364
            return Option.is_hidden(self, name)
365
        return getattr(self.registry.get_info(name), 'hidden', False)
366
2221.4.6 by Aaron Bentley
Improve text and naming
367
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
368
class OptionParser(optparse.OptionParser):
369
    """OptionParser that raises exceptions instead of exiting"""
370
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
371
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
372
373
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
374
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
375
376
377
def get_optparser(options):
378
    """Generate an optparse parser for bzrlib-style options"""
379
380
    parser = OptionParser()
381
    parser.remove_option('--help')
382
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
383
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
384
    return parser
385
1185.16.45 by Martin Pool
- refactor handling of short option names
386
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
387
def custom_help(name, help):
388
    """Clone a common option overriding the help."""
389
    import copy
390
    o = copy.copy(Option.OPTIONS[name])
391
    o.help = help
392
    return o
393
394
395
def _standard_option(name, **kwargs):
396
    """Register a standard option."""
397
    # All standard options are implicitly 'global' ones
398
    Option.STD_OPTIONS[name] = Option(name, **kwargs)
399
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
400
401
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
402
def _global_option(name, **kwargs):
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
403
    """Register a global option."""
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
404
    Option.OPTIONS[name] = Option(name, **kwargs)
405
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
406
407
def _global_registry_option(name, help, registry, **kwargs):
408
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
409
2221.4.17 by Aaron Bentley
PEP8-ness
410
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
411
class MergeTypeRegistry(registry.Registry):
412
413
    pass
414
2221.4.17 by Aaron Bentley
PEP8-ness
415
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
416
# This is the verbosity level detected during command line parsing.
417
# Note that the final value is dependent on the order in which the
418
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
419
# The final value will be one of the following:
420
#
421
# * -ve for quiet
422
# * 0 for normal
423
# * +ve for verbose
424
_verbosity_level = 0
425
426
427
def _verbosity_level_callback(option, opt_str, value, parser):
428
    global _verbosity_level
429
    if not value:
430
        # Either --no-verbose or --no-quiet was specified
431
        _verbosity_level = 0
432
    elif opt_str == "verbose":
433
        if _verbosity_level > 0:
434
            _verbosity_level += 1
435
        else:
436
            _verbosity_level = 1
437
    else:
438
        if _verbosity_level < 0:
439
            _verbosity_level -= 1
440
        else:
441
            _verbosity_level = -1
442
443
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
444
_merge_type_registry = MergeTypeRegistry()
445
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
446
                                   "Native diff3-style merge")
447
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
448
                                   "Merge using external diff3")
449
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
450
                                   "Weave-based merge")
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
451
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
452
# Declare the standard options
453
_standard_option('help', short_name='h',
454
                 help='Show help message.')
455
_standard_option('verbose', short_name='v',
456
                 help='Display more information.',
457
                 custom_callback=_verbosity_level_callback)
458
_standard_option('quiet', short_name='q',
459
                 help="Only display errors and warnings.",
460
                 custom_callback=_verbosity_level_callback)
461
462
# Declare commonly used options
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
463
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
464
_global_option('overwrite', help='Ignore differences between branches and '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
465
               'overwrite unconditionally.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
466
_global_option('basis', type=str)
467
_global_option('bound')
468
_global_option('diff-options', type=str)
469
_global_option('file', type=unicode, short_name='F')
470
_global_option('force')
471
_global_option('format', type=unicode)
472
_global_option('forward')
473
_global_option('message', type=unicode,
474
               short_name='m',
475
               help='Message string.')
476
_global_option('no-recurse')
477
_global_option('profile',
478
               help='Show performance profiling information.')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
479
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
480
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
481
               short_name='r',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
482
               help='See \'help revisionspec\' for details.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
483
_global_option('show-ids',
484
               help='Show internal object ids.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
485
_global_option('timezone', 
486
               type=str,
487
               help='display timezone as local, original, or utc')
488
_global_option('unbound')
489
_global_option('version')
490
_global_option('email')
491
_global_option('update')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
492
_global_registry_option('log-format', "Use specified log format.",
2221.4.13 by Aaron Bentley
Add title to log format option section
493
                        log.log_formatter_registry, value_switches=True,
494
                        title='Log format')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
495
_global_option('long', help='Use detailed log format. Same as --log-format long',
496
               short_name='l')
497
_global_option('short', help='Use moderately short log format. Same as --log-format short')
498
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
499
_global_option('root', type=str)
500
_global_option('no-backup')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
501
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
502
                        _merge_type_registry, value_switches=True,
503
                        title='Merge algorithm')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
504
_global_option('pattern', type=str)
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
505
_global_option('remember', help='Remember the specified location as a'
506
               ' default.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
507
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
508
_global_option('kind', type=str)
509
_global_option('dry-run',
510
               help="Show what would be done, but don't actually do anything.")
511
_global_option('name-from-revision', help='The path name in the old tree.')