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