/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
1185.16.45 by Martin Pool
- refactor handling of short option names
127
    # TODO: Some way to show in help a description of the option argument
128
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
129
    OPTIONS = {}
130
2190.2.1 by Martin Pool
remove global registration of short options
131
    def __init__(self, name, help='', type=None, argname=None,
132
                 short_name=None):
1185.16.45 by Martin Pool
- refactor handling of short option names
133
        """Make a new command option.
134
135
        name -- regular name of the command, used in the double-dash
136
            form and also as the parameter to the command's run() 
137
            method.
138
139
        help -- help message displayed in command help
140
141
        type -- function called to parse the option argument, or 
142
            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
143
144
        argname -- name of option argument, if any
1185.16.45 by Martin Pool
- refactor handling of short option names
145
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
146
        self.name = name
147
        self.help = help
148
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
149
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
150
        if type is None:
151
            assert argname is None
152
        elif argname is None:
153
            argname = 'ARG'
154
        self.argname = argname
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
155
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
156
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
157
        if self._short_name:
158
            return self._short_name
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
159
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
160
    def set_short_name(self, short_name):
161
        self._short_name = short_name
162
1857.1.9 by Aaron Bentley
Add hidden negation options
163
    def get_negation_name(self):
164
        if self.name.startswith('no-'):
165
            return self.name[3:]
166
        else:
167
            return 'no-' + self.name
168
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
169
    def add_option(self, parser, short_name):
170
        """Add this option to an Optparse parser"""
171
        option_strings = ['--%s' % self.name]
172
        if short_name is not None:
173
            option_strings.append('-%s' % short_name)
174
        optargfn = self.type
175
        if optargfn is None:
176
            parser.add_option(action='store_true', dest=self.name, 
177
                              help=self.help,
178
                              default=OptionParser.DEFAULT_VALUE,
179
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
180
            negation_strings = ['--%s' % self.get_negation_name()]
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
181
            parser.add_option(action='store_false', dest=self.name, 
182
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
183
        else:
184
            parser.add_option(action='callback', 
185
                              callback=self._optparse_callback, 
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
186
                              type='string', metavar=self.argname.upper(),
1857.1.4 by Aaron Bentley
Set metavar according to option
187
                              help=self.help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
188
                              default=OptionParser.DEFAULT_VALUE, 
189
                              *option_strings)
190
191
    def _optparse_callback(self, option, opt, value, parser):
192
        setattr(parser.values, self.name, self.type(value))
193
1857.1.14 by Aaron Bentley
Fix man page generation
194
    def iter_switches(self):
195
        """Iterate through the list of switches provided by the option
196
        
197
        :return: an iterator of (name, short_name, argname, help)
198
        """
199
        argname =  self.argname
200
        if argname is not None:
201
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
202
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
203
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
204
    def is_hidden(self, name):
205
        return False
206
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
207
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
208
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
209
    """Option used to provide a list of values.
210
211
    On the command line, arguments are specified by a repeated use of the
212
    option. '-' is a special argument that resets the list. For example,
213
      --foo=a --foo=b
214
    sets the value of the 'foo' option to ['a', 'b'], and
215
      --foo=a --foo=b --foo=- --foo=c
216
    sets the value of the 'foo' option to ['c'].
217
    """
218
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
219
    def add_option(self, parser, short_name):
220
        """Add this option to an Optparse parser."""
221
        option_strings = ['--%s' % self.name]
222
        if short_name is not None:
223
            option_strings.append('-%s' % short_name)
224
        parser.add_option(action='callback',
225
                          callback=self._optparse_callback,
226
                          type='string', metavar=self.argname.upper(),
227
                          help=self.help, default=[],
228
                          *option_strings)
229
230
    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)
231
        values = getattr(parser.values, self.name)
232
        if value == '-':
233
            del values[:]
234
        else:
235
            values.append(self.type(value))
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
236
237
2221.4.1 by Aaron Bentley
Get registry options working
238
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
239
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
240
2221.4.6 by Aaron Bentley
Improve text and naming
241
    The values for the options correspond to entries in the registry.  Input
242
    must be a registry key.  After validation, it is converted into an object
243
    using Registry.get or a caller-provided converter.
244
    """
2221.4.1 by Aaron Bentley
Get registry options working
245
246
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
247
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
248
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
249
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
250
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
251
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
252
        """Convert a value name into an output type"""
253
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
254
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
255
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
256
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
257
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
258
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
259
    def __init__(self, name, help, registry, converter=None,
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
260
        value_switches=False, title=None, enum_switch=True):
2221.4.3 by Aaron Bentley
Add docstrings
261
        """
262
        Constructor.
263
264
        :param name: The option name.
265
        :param help: Help for the option.
266
        :param registry: A Registry containing the values
267
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
268
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
269
        :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.
270
            own switch.  For example, instead of '--format knit',
271
            '--knit' can be used interchangeably.
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
272
        :param enum_switch: If true, a switch is provided with the option name,
273
            which takes a value.
2221.4.3 by Aaron Bentley
Add docstrings
274
        """
275
        Option.__init__(self, name, help, type=self.convert)
2221.4.1 by Aaron Bentley
Get registry options working
276
        self.registry = registry
277
        self.name = name
278
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
279
        self.value_switches = value_switches
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
280
        self.enum_switch = enum_switch
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
281
        self.title = title
282
        if self.title is None:
283
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
284
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
285
    @staticmethod
286
    def from_kwargs(name_, help=None, title=None, value_switches=False,
1551.12.43 by Aaron Bentley
Misc changes from review
287
                    enum_switch=True, **kwargs):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
288
        """Convenience method to generate string-map registry options
289
290
        name, help, value_switches and enum_switch are passed to the
291
        RegistryOption constructor.  Any other keyword arguments are treated
292
        as values for the option, and they value is treated as the help.
293
        """
294
        reg = registry.Registry()
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
295
        for name, switch_help in kwargs.iteritems():
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
296
            name = name.replace('_', '-')
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
297
            reg.register(name, name, help=switch_help)
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
298
        return RegistryOption(name_, help, reg, title=title,
299
            value_switches=value_switches, enum_switch=enum_switch)
300
2221.4.1 by Aaron Bentley
Get registry options working
301
    def add_option(self, parser, short_name):
302
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
303
        if self.value_switches:
304
            parser = parser.add_option_group(self.title)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
305
        if self.enum_switch:
306
            Option.add_option(self, parser, short_name)
2221.4.1 by Aaron Bentley
Get registry options working
307
        if self.value_switches:
308
            for key in self.registry.keys():
309
                option_strings = ['--%s' % key]
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
310
                if self.is_hidden(key):
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
311
                    help = optparse.SUPPRESS_HELP
312
                else:
313
                    help = self.registry.get_help(key)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
314
                parser.add_option(action='callback',
315
                              callback=self._optparse_value_callback(key),
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
316
                                  help=help,
2221.4.1 by Aaron Bentley
Get registry options working
317
                                  *option_strings)
318
319
    def _optparse_value_callback(self, cb_value):
320
        def cb(option, opt, value, parser):
321
            setattr(parser.values, self.name, self.type(cb_value))
322
        return cb
323
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
324
    def iter_switches(self):
325
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
326
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
327
        :return: an iterator of (name, short_name, argname, help)
328
        """
329
        for value in Option.iter_switches(self):
330
            yield value
331
        if self.value_switches:
332
            for key in sorted(self.registry.keys()):
333
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
334
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
335
    def is_hidden(self, name):
336
        if name == self.name:
337
            return Option.is_hidden(self, name)
338
        return getattr(self.registry.get_info(name), 'hidden', False)
339
2221.4.6 by Aaron Bentley
Improve text and naming
340
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
341
class OptionParser(optparse.OptionParser):
342
    """OptionParser that raises exceptions instead of exiting"""
343
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
344
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
345
346
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
347
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
348
349
350
def get_optparser(options):
351
    """Generate an optparse parser for bzrlib-style options"""
352
353
    parser = OptionParser()
354
    parser.remove_option('--help')
355
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
356
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
357
    return parser
358
1185.16.45 by Martin Pool
- refactor handling of short option names
359
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
360
def _global_option(name, **kwargs):
361
    """Register o as a global option."""
362
    Option.OPTIONS[name] = Option(name, **kwargs)
363
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
364
365
def _global_registry_option(name, help, registry, **kwargs):
366
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
367
2221.4.17 by Aaron Bentley
PEP8-ness
368
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
369
class MergeTypeRegistry(registry.Registry):
370
371
    pass
372
2221.4.17 by Aaron Bentley
PEP8-ness
373
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
374
_merge_type_registry = MergeTypeRegistry()
375
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
376
                                   "Native diff3-style merge")
377
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
378
                                   "Merge using external diff3")
379
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
380
                                   "Weave-based merge")
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
381
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
382
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
383
_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
384
               'overwrite unconditionally.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
385
_global_option('basis', type=str)
386
_global_option('bound')
387
_global_option('diff-options', type=str)
388
_global_option('file', type=unicode, short_name='F')
389
_global_option('force')
390
_global_option('format', type=unicode)
391
_global_option('forward')
392
_global_option('message', type=unicode,
393
               short_name='m',
394
               help='Message string.')
395
_global_option('no-recurse')
396
_global_option('profile',
397
               help='Show performance profiling information.')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
398
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
399
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
400
               short_name='r',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
401
               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
402
_global_option('show-ids',
403
               help='Show internal object ids.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
404
_global_option('timezone', 
405
               type=str,
406
               help='display timezone as local, original, or utc')
407
_global_option('unbound')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
408
_global_option('verbose',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
409
               help='Display more information.',
2190.2.1 by Martin Pool
remove global registration of short options
410
               short_name='v')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
411
_global_option('version')
412
_global_option('email')
413
_global_option('update')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
414
_global_registry_option('log-format', "Use specified log format.",
2221.4.13 by Aaron Bentley
Add title to log format option section
415
                        log.log_formatter_registry, value_switches=True,
416
                        title='Log format')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
417
_global_option('long', help='Use detailed log format. Same as --log-format long',
418
               short_name='l')
419
_global_option('short', help='Use moderately short log format. Same as --log-format short')
420
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
421
_global_option('root', type=str)
422
_global_option('no-backup')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
423
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
424
                        _merge_type_registry, value_switches=True,
425
                        title='Merge algorithm')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
426
_global_option('pattern', type=str)
427
_global_option('quiet', short_name='q')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
428
_global_option('remember', help='Remember the specified location as a'
429
               ' default.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
430
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
431
_global_option('kind', type=str)
432
_global_option('dry-run',
433
               help="Show what would be done, but don't actually do anything.")
434
_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
435
2598.1.8 by Martin Pool
Clean up old/unused global options
436
_help_option = Option('help',
437
                      help='Show help message.',
438
                      short_name='h')