~bzr-pqm/bzr/bzr.dev

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