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