/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
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
103
def _parse_change_str(revstr):
2745.4.5 by Lukáš Lalinsky
'..' in the revision string doesn't always mean a range, so parse the string using _parse_revision_str and then check the number of returned revisions
104
    """Parse the revision string and return a tuple with left-most
105
    parent of the revision.
106
107
    >>> _parse_change_str('123')
108
    (<RevisionSpec_before before:123>, <RevisionSpec_revno 123>)
109
    >>> _parse_change_str('123..124')
110
    Traceback (most recent call last):
111
      ...
112
    RangeInChangeOption: Option --change does not accept revision ranges
113
    """
114
    revs = _parse_revision_str(revstr)
115
    if len(revs) > 1:
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
116
        raise errors.RangeInChangeOption()
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
117
    return (revisionspec.RevisionSpec.from_string('before:' + revstr),
2745.4.5 by Lukáš Lalinsky
'..' in the revision string doesn't always mean a range, so parse the string using _parse_revision_str and then check the number of returned revisions
118
            revs[0])
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
119
120
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
121
def _parse_merge_type(typestring):
1185.12.62 by Aaron Bentley
Restored merge-type selection
122
    return get_merge_type(typestring)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
123
1185.12.62 by Aaron Bentley
Restored merge-type selection
124
def get_merge_type(typestring):
125
    """Attempt to find the merge class/factory associated with a string."""
126
    from merge import merge_types
127
    try:
128
        return merge_types[typestring][0]
129
    except KeyError:
130
        templ = '%s%%7s: %%s' % (' '*12)
131
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
132
        type_list = '\n'.join(lines)
133
        msg = "No known merge type %s. Supported types are:\n%s" %\
134
            (typestring, type_list)
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
135
        raise errors.BzrCommandError(msg)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
136
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
137
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
138
class Option(object):
2190.2.1 by Martin Pool
remove global registration of short options
139
    """Description of a command line option
140
    
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
141
    :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
142
    Otherwise None.
143
    """
144
1185.16.45 by Martin Pool
- refactor handling of short option names
145
    # TODO: Some way to show in help a description of the option argument
146
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
147
    OPTIONS = {}
148
2190.2.1 by Martin Pool
remove global registration of short options
149
    def __init__(self, name, help='', type=None, argname=None,
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
150
                 short_name=None, param_name=None):
1185.16.45 by Martin Pool
- refactor handling of short option names
151
        """Make a new command option.
152
153
        name -- regular name of the command, used in the double-dash
154
            form and also as the parameter to the command's run() 
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
155
            method (unless param_name is specified).
1185.16.45 by Martin Pool
- refactor handling of short option names
156
157
        help -- help message displayed in command help
158
159
        type -- function called to parse the option argument, or 
160
            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
161
162
        argname -- name of option argument, if any
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
163
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
164
        param_name -- name of the parameter which will be passed to
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
165
            the command's run() method.
1185.16.45 by Martin Pool
- refactor handling of short option names
166
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
167
        self.name = name
168
        self.help = help
169
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
170
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
171
        if type is None:
172
            assert argname is None
173
        elif argname is None:
174
            argname = 'ARG'
175
        self.argname = argname
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
176
        if param_name is None:
177
            self._param_name = self.name
178
        else:
179
            self._param_name = param_name
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
180
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
181
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
182
        if self._short_name:
183
            return self._short_name
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
184
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
185
    def set_short_name(self, short_name):
186
        self._short_name = short_name
187
1857.1.9 by Aaron Bentley
Add hidden negation options
188
    def get_negation_name(self):
189
        if self.name.startswith('no-'):
190
            return self.name[3:]
191
        else:
192
            return 'no-' + self.name
193
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
194
    def add_option(self, parser, short_name):
195
        """Add this option to an Optparse parser"""
196
        option_strings = ['--%s' % self.name]
197
        if short_name is not None:
198
            option_strings.append('-%s' % short_name)
199
        optargfn = self.type
200
        if optargfn is None:
201
            parser.add_option(action='store_true', dest=self.name, 
202
                              help=self.help,
203
                              default=OptionParser.DEFAULT_VALUE,
204
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
205
            negation_strings = ['--%s' % self.get_negation_name()]
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
206
            parser.add_option(action='store_false', dest=self.name, 
207
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
208
        else:
209
            parser.add_option(action='callback', 
210
                              callback=self._optparse_callback, 
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
211
                              type='string', metavar=self.argname.upper(),
1857.1.4 by Aaron Bentley
Set metavar according to option
212
                              help=self.help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
213
                              default=OptionParser.DEFAULT_VALUE, 
214
                              *option_strings)
215
216
    def _optparse_callback(self, option, opt, value, parser):
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
217
        setattr(parser.values, self._param_name, self.type(value))
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
218
1857.1.14 by Aaron Bentley
Fix man page generation
219
    def iter_switches(self):
220
        """Iterate through the list of switches provided by the option
221
        
222
        :return: an iterator of (name, short_name, argname, help)
223
        """
224
        argname =  self.argname
225
        if argname is not None:
226
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
227
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
228
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
229
    def is_hidden(self, name):
230
        return False
231
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
232
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
233
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
234
    """Option used to provide a list of values.
235
236
    On the command line, arguments are specified by a repeated use of the
237
    option. '-' is a special argument that resets the list. For example,
238
      --foo=a --foo=b
239
    sets the value of the 'foo' option to ['a', 'b'], and
240
      --foo=a --foo=b --foo=- --foo=c
241
    sets the value of the 'foo' option to ['c'].
242
    """
243
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
244
    def add_option(self, parser, short_name):
245
        """Add this option to an Optparse parser."""
246
        option_strings = ['--%s' % self.name]
247
        if short_name is not None:
248
            option_strings.append('-%s' % short_name)
249
        parser.add_option(action='callback',
250
                          callback=self._optparse_callback,
251
                          type='string', metavar=self.argname.upper(),
252
                          help=self.help, default=[],
253
                          *option_strings)
254
255
    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)
256
        values = getattr(parser.values, self.name)
257
        if value == '-':
258
            del values[:]
259
        else:
260
            values.append(self.type(value))
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))
347
        return cb
348
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
349
    def iter_switches(self):
350
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
351
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
352
        :return: an iterator of (name, short_name, argname, help)
353
        """
354
        for value in Option.iter_switches(self):
355
            yield value
356
        if self.value_switches:
357
            for key in sorted(self.registry.keys()):
358
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
359
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
360
    def is_hidden(self, name):
361
        if name == self.name:
362
            return Option.is_hidden(self, name)
363
        return getattr(self.registry.get_info(name), 'hidden', False)
364
2221.4.6 by Aaron Bentley
Improve text and naming
365
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
366
class OptionParser(optparse.OptionParser):
367
    """OptionParser that raises exceptions instead of exiting"""
368
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
369
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
370
371
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
372
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
373
374
375
def get_optparser(options):
376
    """Generate an optparse parser for bzrlib-style options"""
377
378
    parser = OptionParser()
379
    parser.remove_option('--help')
380
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
381
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
382
    return parser
383
1185.16.45 by Martin Pool
- refactor handling of short option names
384
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
385
def _global_option(name, **kwargs):
386
    """Register o as a global option."""
387
    Option.OPTIONS[name] = Option(name, **kwargs)
388
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
389
390
def _global_registry_option(name, help, registry, **kwargs):
391
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
392
2221.4.17 by Aaron Bentley
PEP8-ness
393
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
394
class MergeTypeRegistry(registry.Registry):
395
396
    pass
397
2221.4.17 by Aaron Bentley
PEP8-ness
398
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
399
_merge_type_registry = MergeTypeRegistry()
400
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
401
                                   "Native diff3-style merge")
402
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
403
                                   "Merge using external diff3")
404
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
405
                                   "Weave-based merge")
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
406
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
407
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
408
_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
409
               'overwrite unconditionally.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
410
_global_option('basis', type=str)
411
_global_option('bound')
412
_global_option('diff-options', type=str)
413
_global_option('file', type=unicode, short_name='F')
414
_global_option('force')
415
_global_option('format', type=unicode)
416
_global_option('forward')
417
_global_option('message', type=unicode,
418
               short_name='m',
419
               help='Message string.')
420
_global_option('no-recurse')
421
_global_option('profile',
422
               help='Show performance profiling information.')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
423
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
424
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
425
               short_name='r',
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
426
               help='See "help revisionspec" for details.')
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
427
_global_option('change',
428
               type=_parse_change_str,
2745.4.3 by Lukáš Lalinsky
Change -C to -c.
429
               short_name='c',
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
430
               param_name='revision',
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
431
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
432
_global_option('show-ids',
433
               help='Show internal object ids.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
434
_global_option('timezone', 
435
               type=str,
436
               help='display timezone as local, original, or utc')
437
_global_option('unbound')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
438
_global_option('verbose',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
439
               help='Display more information.',
2190.2.1 by Martin Pool
remove global registration of short options
440
               short_name='v')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
441
_global_option('version')
442
_global_option('email')
443
_global_option('update')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
444
_global_registry_option('log-format', "Use specified log format.",
2221.4.13 by Aaron Bentley
Add title to log format option section
445
                        log.log_formatter_registry, value_switches=True,
446
                        title='Log format')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
447
_global_option('long', help='Use detailed log format. Same as --log-format long',
448
               short_name='l')
449
_global_option('short', help='Use moderately short log format. Same as --log-format short')
450
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
451
_global_option('root', type=str)
452
_global_option('no-backup')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
453
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
454
                        _merge_type_registry, value_switches=True,
455
                        title='Merge algorithm')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
456
_global_option('pattern', type=str)
457
_global_option('quiet', short_name='q')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
458
_global_option('remember', help='Remember the specified location as a'
459
               ' default.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
460
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
461
_global_option('kind', type=str)
462
_global_option('dry-run',
463
               help="Show what would be done, but don't actually do anything.")
464
_global_option('name-from-revision', help='The path name in the old tree.')
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
465
2598.1.8 by Martin Pool
Clean up old/unused global options
466
_help_option = Option('help',
467
                      help='Show help message.',
468
                      short_name='h')