~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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
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
3224.5.3 by Andrew Bennetts
Avoid importing bzrlib.log unnecessarily, and always import bzrlib.registry and optparse directly in bzrlib.option because it always uses it.
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
3224.5.3 by Andrew Bennetts
Avoid importing bzrlib.log unnecessarily, and always import bzrlib.registry and optparse directly in bzrlib.option because it always uses it.
31
from bzrlib import (
32
    registry as _mod_registry,
33
    )
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
34
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
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
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,
4251.1.1 by Aaron Bentley
Support hidden options.
153
                 short_name=None, param_name=None, custom_callback=None,
154
                 hidden=False):
1185.16.45 by Martin Pool
- refactor handling of short option names
155
        """Make a new command option.
156
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
157
        :param name: regular name of the command, used in the double-dash
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
158
            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.
159
            method (unless param_name is specified).
1185.16.45 by Martin Pool
- refactor handling of short option names
160
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
161
        :param help: help message displayed in command help
1185.16.45 by Martin Pool
- refactor handling of short option names
162
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
163
        :param type: function called to parse the option argument, or
1185.16.45 by Martin Pool
- refactor handling of short option names
164
            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
165
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
166
        :param argname: name of option argument, if any
167
168
        :param short_name: short option code for use with a single -, e.g.
169
            short_name="v" to enable parsing of -v.
170
2768.1.15 by Ian Clatworthy
Merge bzr.dev
171
        :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.
172
            the command's run() method.
2768.1.15 by Ian Clatworthy
Merge bzr.dev
173
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
174
        :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
175
            processing. The signature of the callback routine is
176
            (option, name, new_value, parser).
4251.1.1 by Aaron Bentley
Support hidden options.
177
        :param hidden: If True, the option should be hidden in help and
178
            documentation.
1185.16.45 by Martin Pool
- refactor handling of short option names
179
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
180
        self.name = name
181
        self.help = help
182
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
183
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
184
        if type is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
185
            if argname:
186
                raise ValueError('argname not valid for booleans')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
187
        elif argname is None:
188
            argname = 'ARG'
189
        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.
190
        if param_name is None:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
191
            self._param_name = self.name.replace('-', '_')
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.
192
        else:
193
            self._param_name = param_name
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
194
        self.custom_callback = custom_callback
4251.1.1 by Aaron Bentley
Support hidden options.
195
        self.hidden = hidden
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
196
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
197
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
198
        if self._short_name:
199
            return self._short_name
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
200
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
201
    def set_short_name(self, short_name):
202
        self._short_name = short_name
203
1857.1.9 by Aaron Bentley
Add hidden negation options
204
    def get_negation_name(self):
205
        if self.name.startswith('no-'):
206
            return self.name[3:]
207
        else:
208
            return 'no-' + self.name
209
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
210
    def add_option(self, parser, short_name):
211
        """Add this option to an Optparse parser"""
212
        option_strings = ['--%s' % self.name]
213
        if short_name is not None:
214
            option_strings.append('-%s' % short_name)
4251.1.1 by Aaron Bentley
Support hidden options.
215
        if self.hidden:
216
            help = optparse.SUPPRESS_HELP
217
        else:
218
            help = self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
219
        optargfn = self.type
220
        if optargfn is None:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
221
            parser.add_option(action='callback',
222
                              callback=self._optparse_bool_callback,
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
223
                              callback_args=(True,),
4251.1.1 by Aaron Bentley
Support hidden options.
224
                              help=help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
225
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
226
            negation_strings = ['--%s' % self.get_negation_name()]
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
227
            parser.add_option(action='callback',
228
                              callback=self._optparse_bool_callback,
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
229
                              callback_args=(False,),
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
230
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
231
        else:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
232
            parser.add_option(action='callback',
233
                              callback=self._optparse_callback,
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
234
                              type='string', metavar=self.argname.upper(),
4251.1.1 by Aaron Bentley
Support hidden options.
235
                              help=help,
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
236
                              default=OptionParser.DEFAULT_VALUE,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
237
                              *option_strings)
238
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
239
    def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
2768.1.15 by Ian Clatworthy
Merge bzr.dev
240
        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
241
        if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
242
            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
243
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
244
    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
245
        v = self.type(value)
2768.1.15 by Ian Clatworthy
Merge bzr.dev
246
        setattr(parser.values, self._param_name, v)
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
247
        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
248
            self.custom_callback(option, self.name, v, parser)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
249
1857.1.14 by Aaron Bentley
Fix man page generation
250
    def iter_switches(self):
251
        """Iterate through the list of switches provided by the option
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
252
1857.1.14 by Aaron Bentley
Fix man page generation
253
        :return: an iterator of (name, short_name, argname, help)
254
        """
255
        argname =  self.argname
256
        if argname is not None:
257
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
258
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
259
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
260
    def is_hidden(self, name):
4251.1.1 by Aaron Bentley
Support hidden options.
261
        return self.hidden
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
262
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
263
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
264
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
265
    """Option used to provide a list of values.
266
267
    On the command line, arguments are specified by a repeated use of the
268
    option. '-' is a special argument that resets the list. For example,
269
      --foo=a --foo=b
270
    sets the value of the 'foo' option to ['a', 'b'], and
271
      --foo=a --foo=b --foo=- --foo=c
272
    sets the value of the 'foo' option to ['c'].
273
    """
274
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
275
    def add_option(self, parser, short_name):
276
        """Add this option to an Optparse parser."""
277
        option_strings = ['--%s' % self.name]
278
        if short_name is not None:
279
            option_strings.append('-%s' % short_name)
280
        parser.add_option(action='callback',
281
                          callback=self._optparse_callback,
282
                          type='string', metavar=self.argname.upper(),
283
                          help=self.help, default=[],
284
                          *option_strings)
285
286
    def _optparse_callback(self, option, opt, value, parser):
2768.1.15 by Ian Clatworthy
Merge bzr.dev
287
        values = getattr(parser.values, self._param_name)
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
288
        if value == '-':
289
            del values[:]
290
        else:
291
            values.append(self.type(value))
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
292
        if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
293
            self.custom_callback(option, self._param_name, values, parser)
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
294
295
2221.4.1 by Aaron Bentley
Get registry options working
296
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
297
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
298
2221.4.6 by Aaron Bentley
Improve text and naming
299
    The values for the options correspond to entries in the registry.  Input
300
    must be a registry key.  After validation, it is converted into an object
301
    using Registry.get or a caller-provided converter.
302
    """
2221.4.1 by Aaron Bentley
Get registry options working
303
304
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
305
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
306
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
307
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
308
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
309
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
310
        """Convert a value name into an output type"""
311
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
312
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
313
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
314
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
315
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
316
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
317
    def __init__(self, name, help, registry=None, converter=None,
318
        value_switches=False, title=None, enum_switch=True,
319
        lazy_registry=None):
2221.4.3 by Aaron Bentley
Add docstrings
320
        """
321
        Constructor.
322
323
        :param name: The option name.
324
        :param help: Help for the option.
325
        :param registry: A Registry containing the values
326
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
327
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
328
        :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.
329
            own switch.  For example, instead of '--format knit',
330
            '--knit' can be used interchangeably.
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
331
        :param enum_switch: If true, a switch is provided with the option name,
332
            which takes a value.
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
333
        :param lazy_registry: A tuple of (module name, attribute name) for a
334
            registry to be lazily loaded.
2221.4.3 by Aaron Bentley
Add docstrings
335
        """
336
        Option.__init__(self, name, help, type=self.convert)
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
337
        self._registry = registry
338
        if registry is None:
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
339
            if lazy_registry is None:
340
                raise AssertionError(
341
                    'One of registry or lazy_registry must be given.')
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
342
            self._lazy_registry = _mod_registry._LazyObjectGetter(
343
                *lazy_registry)
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
344
        if registry is not None and lazy_registry is not None:
345
            raise AssertionError(
346
                'registry and lazy_registry are mutually exclusive')
2221.4.1 by Aaron Bentley
Get registry options working
347
        self.name = name
348
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
349
        self.value_switches = value_switches
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
350
        self.enum_switch = enum_switch
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
351
        self.title = title
352
        if self.title is None:
353
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
354
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
355
    @property
356
    def registry(self):
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
357
        if self._registry is None:
358
            self._registry = self._lazy_registry.get_obj()
359
        return self._registry
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
360
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
361
    @staticmethod
362
    def from_kwargs(name_, help=None, title=None, value_switches=False,
1551.12.43 by Aaron Bentley
Misc changes from review
363
                    enum_switch=True, **kwargs):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
364
        """Convenience method to generate string-map registry options
365
366
        name, help, value_switches and enum_switch are passed to the
367
        RegistryOption constructor.  Any other keyword arguments are treated
368
        as values for the option, and they value is treated as the help.
369
        """
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
370
        reg = _mod_registry.Registry()
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
371
        for name, switch_help in kwargs.iteritems():
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
372
            name = name.replace('_', '-')
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
373
            reg.register(name, name, help=switch_help)
3571.2.1 by Robert Widhopf-Fenk
Add the help of values to the help of the option if there are no value switches.
374
            if not value_switches:
375
                help = help + '  "' + name + '": ' + switch_help
376
                if not help.endswith("."):
377
                    help = help + "."
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
378
        return RegistryOption(name_, help, reg, title=title,
379
            value_switches=value_switches, enum_switch=enum_switch)
380
2221.4.1 by Aaron Bentley
Get registry options working
381
    def add_option(self, parser, short_name):
382
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
383
        if self.value_switches:
384
            parser = parser.add_option_group(self.title)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
385
        if self.enum_switch:
386
            Option.add_option(self, parser, short_name)
2221.4.1 by Aaron Bentley
Get registry options working
387
        if self.value_switches:
388
            for key in self.registry.keys():
389
                option_strings = ['--%s' % key]
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
390
                if self.is_hidden(key):
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
391
                    help = optparse.SUPPRESS_HELP
392
                else:
393
                    help = self.registry.get_help(key)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
394
                parser.add_option(action='callback',
395
                              callback=self._optparse_value_callback(key),
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
396
                                  help=help,
2221.4.1 by Aaron Bentley
Get registry options working
397
                                  *option_strings)
398
399
    def _optparse_value_callback(self, cb_value):
400
        def cb(option, opt, value, parser):
2768.1.11 by Ian Clatworthy
Add new option tests for custom help, callbacks and verbose/quiet linkage
401
            v = self.type(cb_value)
2768.1.15 by Ian Clatworthy
Merge bzr.dev
402
            setattr(parser.values, self._param_name, v)
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
403
            if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
404
                self.custom_callback(option, self._param_name, v, parser)
2221.4.1 by Aaron Bentley
Get registry options working
405
        return cb
406
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
407
    def iter_switches(self):
408
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
409
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
410
        :return: an iterator of (name, short_name, argname, help)
411
        """
412
        for value in Option.iter_switches(self):
413
            yield value
414
        if self.value_switches:
415
            for key in sorted(self.registry.keys()):
416
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
417
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
418
    def is_hidden(self, name):
419
        if name == self.name:
420
            return Option.is_hidden(self, name)
421
        return getattr(self.registry.get_info(name), 'hidden', False)
422
2221.4.6 by Aaron Bentley
Improve text and naming
423
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
424
class OptionParser(optparse.OptionParser):
425
    """OptionParser that raises exceptions instead of exiting"""
426
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
427
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
428
429
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
430
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
431
432
433
def get_optparser(options):
434
    """Generate an optparse parser for bzrlib-style options"""
435
436
    parser = OptionParser()
437
    parser.remove_option('--help')
438
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
439
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
440
    return parser
441
1185.16.45 by Martin Pool
- refactor handling of short option names
442
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
443
def custom_help(name, help):
444
    """Clone a common option overriding the help."""
445
    import copy
446
    o = copy.copy(Option.OPTIONS[name])
447
    o.help = help
448
    return o
449
450
451
def _standard_option(name, **kwargs):
452
    """Register a standard option."""
453
    # All standard options are implicitly 'global' ones
454
    Option.STD_OPTIONS[name] = Option(name, **kwargs)
455
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
456
457
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
458
def _global_option(name, **kwargs):
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
459
    """Register a global option."""
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
460
    Option.OPTIONS[name] = Option(name, **kwargs)
461
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
462
3224.5.3 by Andrew Bennetts
Avoid importing bzrlib.log unnecessarily, and always import bzrlib.registry and optparse directly in bzrlib.option because it always uses it.
463
def _global_registry_option(name, help, registry=None, **kwargs):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
464
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
465
2221.4.17 by Aaron Bentley
PEP8-ness
466
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
467
# This is the verbosity level detected during command line parsing.
468
# Note that the final value is dependent on the order in which the
469
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
470
# The final value will be one of the following:
471
#
472
# * -ve for quiet
473
# * 0 for normal
474
# * +ve for verbose
475
_verbosity_level = 0
476
477
478
def _verbosity_level_callback(option, opt_str, value, parser):
479
    global _verbosity_level
480
    if not value:
481
        # Either --no-verbose or --no-quiet was specified
482
        _verbosity_level = 0
483
    elif opt_str == "verbose":
484
        if _verbosity_level > 0:
485
            _verbosity_level += 1
486
        else:
487
            _verbosity_level = 1
488
    else:
489
        if _verbosity_level < 0:
490
            _verbosity_level -= 1
491
        else:
492
            _verbosity_level = -1
493
494
3755.1.2 by Vincent Ladeuil
Fix conflict. Related to moved lines, nice use case
495
class MergeTypeRegistry(_mod_registry.Registry):
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
496
497
    pass
498
499
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
500
_merge_type_registry = MergeTypeRegistry()
501
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
502
                                   "Native diff3-style merge")
503
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
504
                                   "Merge using external diff3")
505
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
506
                                   "Weave-based merge")
3144.3.1 by Aaron Bentley
Implement LCA merge, with problematic conflict markers
507
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
508
                                   "LCA-newness merge")
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
509
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
510
# Declare the standard options
511
_standard_option('help', short_name='h',
512
                 help='Show help message.')
3984.4.6 by Ian Clatworthy
Show usage on --usage, not -h
513
_standard_option('usage',
514
                 help='Show usage message and options.')
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
515
_standard_option('verbose', short_name='v',
516
                 help='Display more information.',
517
                 custom_callback=_verbosity_level_callback)
518
_standard_option('quiet', short_name='q',
519
                 help="Only display errors and warnings.",
520
                 custom_callback=_verbosity_level_callback)
521
522
# Declare commonly used options
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
523
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
524
_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
525
               'overwrite unconditionally.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
526
_global_option('basis', type=str)
527
_global_option('bound')
528
_global_option('diff-options', type=str)
529
_global_option('file', type=unicode, short_name='F')
530
_global_option('force')
531
_global_option('format', type=unicode)
532
_global_option('forward')
533
_global_option('message', type=unicode,
534
               short_name='m',
535
               help='Message string.')
536
_global_option('no-recurse')
537
_global_option('profile',
538
               help='Show performance profiling information.')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
539
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
540
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
541
               short_name='r',
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
542
               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)
543
_global_option('change',
544
               type=_parse_change_str,
2745.4.3 by Lukáš Lalinsky
Change -C to -c.
545
               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.
546
               param_name='revision',
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
547
               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
548
_global_option('show-ids',
549
               help='Show internal object ids.')
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
550
_global_option('timezone',
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
551
               type=str,
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
552
               help='Display timezone as local, original, or utc.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
553
_global_option('unbound')
554
_global_option('version')
555
_global_option('email')
556
_global_option('update')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
557
_global_registry_option('log-format', "Use specified log format.",
3224.5.3 by Andrew Bennetts
Avoid importing bzrlib.log unnecessarily, and always import bzrlib.registry and optparse directly in bzrlib.option because it always uses it.
558
                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),
559
                        value_switches=True, title='Log format')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
560
_global_option('long', help='Use detailed log format. Same as --log-format long',
561
               short_name='l')
562
_global_option('short', help='Use moderately short log format. Same as --log-format short')
563
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
564
_global_option('root', type=str)
565
_global_option('no-backup')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
566
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
567
                        _merge_type_registry, value_switches=True,
568
                        title='Merge algorithm')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
569
_global_option('pattern', type=str)
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
570
_global_option('remember', help='Remember the specified location as a'
571
               ' default.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
572
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
573
_global_option('kind', type=str)
574
_global_option('dry-run',
575
               help="Show what would be done, but don't actually do anything.")
576
_global_option('name-from-revision', help='The path name in the old tree.')
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
577
578
diff_writer_registry = _mod_registry.Registry()
579
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
580
diff_writer_registry.default_key = 'plain'