/brz/remove-bazaar

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