~bzr-pqm/bzr/bzr.dev

4988.10.5 by John Arbash Meinel
Merge bzr.dev 5021 to resolve NEWS
1
# Copyright (C) 2005-2010 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
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
20
from __future__ import absolute_import
21
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.
22
import optparse
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
23
import re
24
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
27
from bzrlib import (
28
    errors,
3236.1.1 by Michael Hudson
clean up option.py imports
29
    revisionspec,
6118.1.1 by Jonathan Riddell
add class GettextIndentedHelpFormatter to add gettext translations to option help
30
    i18n,
3236.1.1 by Michael Hudson
clean up option.py imports
31
    )
32
""")
33
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')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
46
    [<RevisionSpec_dwim 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
47
    >>> _parse_revision_str('234..567')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
48
    [<RevisionSpec_dwim 234>, <RevisionSpec_dwim 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')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
52
    [<RevisionSpec None>, <RevisionSpec_dwim 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
53
    >>> _parse_revision_str('234..')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
54
    [<RevisionSpec_dwim 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
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
56
    [<RevisionSpec_dwim 234>, <RevisionSpec_dwim 456>, <RevisionSpec_dwim 789>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
57
    >>> _parse_revision_str('234....789') #Error ?
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
58
    [<RevisionSpec_dwim 234>, <RevisionSpec None>, <RevisionSpec_dwim 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')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
64
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_dwim 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')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
74
    [<RevisionSpec_dwim -5>, <RevisionSpec_dwim 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
75
    >>> _parse_revision_str('-5')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
76
    [<RevisionSpec_dwim -5>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
77
    >>> _parse_revision_str('123a')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
78
    [<RevisionSpec_dwim 123a>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
79
    >>> _parse_revision_str('abc')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
80
    [<RevisionSpec_dwim abc>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
81
    >>> _parse_revision_str('branch:../branch2')
82
    [<RevisionSpec_branch branch:../branch2>]
1545.1.1 by Denys Duchier
distinguish ../ as path to branch and .. as revspec separator
83
    >>> _parse_revision_str('branch:../../branch2')
84
    [<RevisionSpec_branch branch:../../branch2>]
85
    >>> _parse_revision_str('branch:../../branch2..23')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
86
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_dwim 23>]
2747.1.1 by Lukáš Lalinský
Accept ..\ as a path in revision specifiers
87
    >>> _parse_revision_str('branch:..\\\\branch2')
88
    [<RevisionSpec_branch branch:..\\branch2>]
89
    >>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
90
    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_dwim 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
91
    """
92
    # TODO: Maybe move this into revisionspec.py
93
    revs = []
2747.1.1 by Lukáš Lalinský
Accept ..\ as a path in revision specifiers
94
    # split on .. that is not followed by a / or \
95
    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
96
    for x in sep.split(revstr):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
97
        revs.append(revisionspec.RevisionSpec.from_string(x or None))
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
98
    return revs
99
100
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
101
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
102
    """Parse the revision string and return a tuple with left-most
103
    parent of the revision.
104
105
    >>> _parse_change_str('123')
4569.2.12 by Matthew Fuller
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
106
    (<RevisionSpec_before before:123>, <RevisionSpec_dwim 123>)
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
107
    >>> _parse_change_str('123..124')
108
    Traceback (most recent call last):
109
      ...
110
    RangeInChangeOption: Option --change does not accept revision ranges
111
    """
112
    revs = _parse_revision_str(revstr)
113
    if len(revs) > 1:
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
114
        raise errors.RangeInChangeOption()
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
115
    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
116
            revs[0])
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
117
118
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
119
def _parse_merge_type(typestring):
1185.12.62 by Aaron Bentley
Restored merge-type selection
120
    return get_merge_type(typestring)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
121
1185.12.62 by Aaron Bentley
Restored merge-type selection
122
def get_merge_type(typestring):
123
    """Attempt to find the merge class/factory associated with a string."""
124
    from merge import merge_types
125
    try:
126
        return merge_types[typestring][0]
127
    except KeyError:
128
        templ = '%s%%7s: %%s' % (' '*12)
129
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
130
        type_list = '\n'.join(lines)
131
        msg = "No known merge type %s. Supported types are:\n%s" %\
132
            (typestring, type_list)
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
133
        raise errors.BzrCommandError(msg)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
134
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
135
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
136
class Option(object):
2190.2.1 by Martin Pool
remove global registration of short options
137
    """Description of a command line option
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
138
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
139
    :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
140
    Otherwise None.
141
    """
142
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
143
    # The dictionary of standard options. These are always legal.
144
    STD_OPTIONS = {}
1185.16.45 by Martin Pool
- refactor handling of short option names
145
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
146
    # The dictionary of commonly used options. these are only legal
147
    # if a command explicitly references them by name in the list
148
    # of supported options.
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
149
    OPTIONS = {}
150
2190.2.1 by Martin Pool
remove global registration of short options
151
    def __init__(self, name, help='', type=None, argname=None,
4251.1.1 by Aaron Bentley
Support hidden options.
152
                 short_name=None, param_name=None, custom_callback=None,
153
                 hidden=False):
1185.16.45 by Martin Pool
- refactor handling of short option names
154
        """Make a new command option.
155
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
156
        :param name: regular name of the command, used in the double-dash
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
157
            form and also as the parameter to the command's run()
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
158
            method (unless param_name is specified).
1185.16.45 by Martin Pool
- refactor handling of short option names
159
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
160
        :param help: help message displayed in command help
1185.16.45 by Martin Pool
- refactor handling of short option names
161
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
162
        :param type: function called to parse the option argument, or
1185.16.45 by Martin Pool
- refactor handling of short option names
163
            None (default) if this option doesn't take an argument.
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
164
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
165
        :param argname: name of option argument, if any
166
167
        :param short_name: short option code for use with a single -, e.g.
168
            short_name="v" to enable parsing of -v.
169
2768.1.15 by Ian Clatworthy
Merge bzr.dev
170
        :param param_name: name of the parameter which will be passed to
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
171
            the command's run() method.
2768.1.15 by Ian Clatworthy
Merge bzr.dev
172
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
173
        :param custom_callback: a callback routine to be called after normal
2768.1.11 by Ian Clatworthy
Add new option tests for custom help, callbacks and verbose/quiet linkage
174
            processing. The signature of the callback routine is
175
            (option, name, new_value, parser).
4251.1.1 by Aaron Bentley
Support hidden options.
176
        :param hidden: If True, the option should be hidden in help and
177
            documentation.
1185.16.45 by Martin Pool
- refactor handling of short option names
178
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
179
        self.name = name
180
        self.help = help
181
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
182
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
183
        if type is None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
184
            if argname:
185
                raise ValueError('argname not valid for booleans')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
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:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
190
            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.
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
4251.1.1 by Aaron Bentley
Support hidden options.
194
        self.hidden = hidden
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
195
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
196
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
197
        if self._short_name:
198
            return self._short_name
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
199
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
200
    def set_short_name(self, short_name):
201
        self._short_name = short_name
202
1857.1.9 by Aaron Bentley
Add hidden negation options
203
    def get_negation_name(self):
204
        if self.name.startswith('no-'):
205
            return self.name[3:]
206
        else:
207
            return 'no-' + self.name
208
5875.4.4 by INADA Naoki
Remove l10n of options.
209
    def add_option(self, parser, short_name):
210
        """Add this option to an Optparse parser"""
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
211
        option_strings = ['--%s' % self.name]
212
        if short_name is not None:
213
            option_strings.append('-%s' % short_name)
4251.1.1 by Aaron Bentley
Support hidden options.
214
        if self.hidden:
215
            help = optparse.SUPPRESS_HELP
216
        else:
5875.4.4 by INADA Naoki
Remove l10n of options.
217
            help = self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
218
        optargfn = self.type
219
        if optargfn is None:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
220
            parser.add_option(action='callback',
221
                              callback=self._optparse_bool_callback,
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
222
                              callback_args=(True,),
4251.1.1 by Aaron Bentley
Support hidden options.
223
                              help=help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
224
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
225
            negation_strings = ['--%s' % self.get_negation_name()]
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
226
            parser.add_option(action='callback',
227
                              callback=self._optparse_bool_callback,
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
228
                              callback_args=(False,),
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
229
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
230
        else:
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
231
            parser.add_option(action='callback',
232
                              callback=self._optparse_callback,
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
233
                              type='string', metavar=self.argname.upper(),
4251.1.1 by Aaron Bentley
Support hidden options.
234
                              help=help,
3668.2.1 by Vincent Ladeuil
Fix bug #263249 by setting valid default _param_name.
235
                              default=OptionParser.DEFAULT_VALUE,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
236
                              *option_strings)
237
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
238
    def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):
2768.1.15 by Ian Clatworthy
Merge bzr.dev
239
        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
240
        if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
241
            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
242
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
243
    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
244
        v = self.type(value)
2768.1.15 by Ian Clatworthy
Merge bzr.dev
245
        setattr(parser.values, self._param_name, v)
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
246
        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
247
            self.custom_callback(option, self.name, v, parser)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
248
1857.1.14 by Aaron Bentley
Fix man page generation
249
    def iter_switches(self):
250
        """Iterate through the list of switches provided by the option
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
251
1857.1.14 by Aaron Bentley
Fix man page generation
252
        :return: an iterator of (name, short_name, argname, help)
253
        """
254
        argname =  self.argname
255
        if argname is not None:
256
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
257
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
258
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
259
    def is_hidden(self, name):
4251.1.1 by Aaron Bentley
Support hidden options.
260
        return self.hidden
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
261
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
262
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
263
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
264
    """Option used to provide a list of values.
265
266
    On the command line, arguments are specified by a repeated use of the
267
    option. '-' is a special argument that resets the list. For example,
268
      --foo=a --foo=b
269
    sets the value of the 'foo' option to ['a', 'b'], and
270
      --foo=a --foo=b --foo=- --foo=c
271
    sets the value of the 'foo' option to ['c'].
272
    """
273
5875.4.4 by INADA Naoki
Remove l10n of options.
274
    def add_option(self, parser, short_name):
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
275
        """Add this option to an Optparse parser."""
276
        option_strings = ['--%s' % self.name]
277
        if short_name is not None:
278
            option_strings.append('-%s' % short_name)
279
        parser.add_option(action='callback',
280
                          callback=self._optparse_callback,
281
                          type='string', metavar=self.argname.upper(),
5875.4.4 by INADA Naoki
Remove l10n of options.
282
                          help=self.help, dest=self._param_name, default=[],
283
                          *option_strings)
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
284
285
    def _optparse_callback(self, option, opt, value, parser):
2768.1.15 by Ian Clatworthy
Merge bzr.dev
286
        values = getattr(parser.values, self._param_name)
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
287
        if value == '-':
288
            del values[:]
289
        else:
290
            values.append(self.type(value))
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
291
        if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
292
            self.custom_callback(option, self._param_name, values, parser)
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
293
294
2221.4.1 by Aaron Bentley
Get registry options working
295
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
296
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
297
2221.4.6 by Aaron Bentley
Improve text and naming
298
    The values for the options correspond to entries in the registry.  Input
299
    must be a registry key.  After validation, it is converted into an object
300
    using Registry.get or a caller-provided converter.
301
    """
2221.4.1 by Aaron Bentley
Get registry options working
302
303
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
304
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
305
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
306
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
307
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
308
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
309
        """Convert a value name into an output type"""
310
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
311
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
312
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
313
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
314
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
315
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.
316
    def __init__(self, name, help, registry=None, converter=None,
317
        value_switches=False, title=None, enum_switch=True,
5945.1.1 by Martin von Gagern
Allow -s as shorthand for --log-format=short.
318
        lazy_registry=None, short_name=None, short_value_switches=None):
2221.4.3 by Aaron Bentley
Add docstrings
319
        """
320
        Constructor.
321
322
        :param name: The option name.
323
        :param help: Help for the option.
324
        :param registry: A Registry containing the values
325
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
326
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
327
        :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.
328
            own switch.  For example, instead of '--format knit',
329
            '--knit' can be used interchangeably.
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
330
        :param enum_switch: If true, a switch is provided with the option name,
331
            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.
332
        :param lazy_registry: A tuple of (module name, attribute name) for a
333
            registry to be lazily loaded.
5945.1.1 by Martin von Gagern
Allow -s as shorthand for --log-format=short.
334
        :param short_name: The short name for the enum switch, if any
335
        :param short_value_switches: A dict mapping values to short names
2221.4.3 by Aaron Bentley
Add docstrings
336
        """
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
337
        Option.__init__(self, name, help, type=self.convert,
338
                        short_name=short_name)
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.
339
        self._registry = registry
340
        if registry is None:
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
341
            if lazy_registry is None:
342
                raise AssertionError(
343
                    '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.
344
            self._lazy_registry = _mod_registry._LazyObjectGetter(
345
                *lazy_registry)
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
346
        if registry is not None and lazy_registry is not None:
347
            raise AssertionError(
348
                'registry and lazy_registry are mutually exclusive')
2221.4.1 by Aaron Bentley
Get registry options working
349
        self.name = name
350
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
351
        self.value_switches = value_switches
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
352
        self.enum_switch = enum_switch
5945.1.1 by Martin von Gagern
Allow -s as shorthand for --log-format=short.
353
        self.short_value_switches = short_value_switches
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
354
        self.title = title
355
        if self.title is None:
356
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
357
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.
358
    @property
359
    def registry(self):
3224.5.34 by Andrew Bennetts
Polish lazy_registry feature a little.
360
        if self._registry is None:
361
            self._registry = self._lazy_registry.get_obj()
362
        return self._registry
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
363
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
364
    @staticmethod
365
    def from_kwargs(name_, help=None, title=None, value_switches=False,
1551.12.43 by Aaron Bentley
Misc changes from review
366
                    enum_switch=True, **kwargs):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
367
        """Convenience method to generate string-map registry options
368
369
        name, help, value_switches and enum_switch are passed to the
370
        RegistryOption constructor.  Any other keyword arguments are treated
4597.3.51 by Vincent Ladeuil
Implement conflicts.ResolveActionOption.
371
        as values for the option, and their value is treated as the help.
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
372
        """
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.
373
        reg = _mod_registry.Registry()
3756.1.1 by Martin von Gagern
List arguments of RegistryOption.from_kwargs in alphabetical order.
374
        for name, switch_help in sorted(kwargs.items()):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
375
            name = name.replace('_', '-')
2681.1.5 by Aaron Bentley
Display correct help message in from_kwargs
376
            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.
377
            if not value_switches:
378
                help = help + '  "' + name + '": ' + switch_help
379
                if not help.endswith("."):
380
                    help = help + "."
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
381
        return RegistryOption(name_, help, reg, title=title,
382
            value_switches=value_switches, enum_switch=enum_switch)
383
5875.4.4 by INADA Naoki
Remove l10n of options.
384
    def add_option(self, parser, short_name):
2221.4.1 by Aaron Bentley
Get registry options working
385
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
386
        if self.value_switches:
387
            parser = parser.add_option_group(self.title)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
388
        if self.enum_switch:
389
            Option.add_option(self, parser, short_name)
2221.4.1 by Aaron Bentley
Get registry options working
390
        if self.value_switches:
391
            for key in self.registry.keys():
392
                option_strings = ['--%s' % key]
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
393
                if self.is_hidden(key):
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
394
                    help = optparse.SUPPRESS_HELP
395
                else:
5875.3.21 by INADA Naoki
Change get_gettext method to gettext property.
396
                    help = self.registry.get_help(key)
5945.1.1 by Martin von Gagern
Allow -s as shorthand for --log-format=short.
397
                if (self.short_value_switches and
398
                    key in self.short_value_switches):
399
                    option_strings.append('-%s' %
400
                                          self.short_value_switches[key])
2221.4.9 by Aaron Bentley
Zap trailing whitespace
401
                parser.add_option(action='callback',
402
                              callback=self._optparse_value_callback(key),
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
403
                                  help=help,
2221.4.1 by Aaron Bentley
Get registry options working
404
                                  *option_strings)
405
406
    def _optparse_value_callback(self, cb_value):
407
        def cb(option, opt, value, parser):
2768.1.11 by Ian Clatworthy
Add new option tests for custom help, callbacks and verbose/quiet linkage
408
            v = self.type(cb_value)
2768.1.15 by Ian Clatworthy
Merge bzr.dev
409
            setattr(parser.values, self._param_name, v)
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
410
            if self.custom_callback is not None:
2768.1.15 by Ian Clatworthy
Merge bzr.dev
411
                self.custom_callback(option, self._param_name, v, parser)
2221.4.1 by Aaron Bentley
Get registry options working
412
        return cb
413
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
414
    def iter_switches(self):
415
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
416
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
417
        :return: an iterator of (name, short_name, argname, help)
418
        """
419
        for value in Option.iter_switches(self):
420
            yield value
421
        if self.value_switches:
422
            for key in sorted(self.registry.keys()):
423
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
424
1551.18.12 by Aaron Bentley
Man page doesn't list hidden options (#131667)
425
    def is_hidden(self, name):
426
        if name == self.name:
427
            return Option.is_hidden(self, name)
428
        return getattr(self.registry.get_info(name), 'hidden', False)
429
2221.4.6 by Aaron Bentley
Improve text and naming
430
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
431
class OptionParser(optparse.OptionParser):
432
    """OptionParser that raises exceptions instead of exiting"""
433
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
434
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
435
6118.1.1 by Jonathan Riddell
add class GettextIndentedHelpFormatter to add gettext translations to option help
436
    def __init__(self):
437
        optparse.OptionParser.__init__(self)
438
        self.formatter = GettextIndentedHelpFormatter()
439
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
440
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
441
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
442
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
443
6118.1.1 by Jonathan Riddell
add class GettextIndentedHelpFormatter to add gettext translations to option help
444
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):
445
    """Adds gettext() call to format_option()"""
446
    def __init__(self):
447
        optparse.IndentedHelpFormatter.__init__(self)
448
449
    def format_option(self, option):
450
        """code taken from Python's optparse.py"""
451
        if option.help:
452
            option.help = i18n.gettext(option.help)
453
        return optparse.IndentedHelpFormatter.format_option(self, option)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
454
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
455
5875.4.4 by INADA Naoki
Remove l10n of options.
456
def get_optparser(options):
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
457
    """Generate an optparse parser for bzrlib-style options"""
458
459
    parser = OptionParser()
460
    parser.remove_option('--help')
461
    for option in options.itervalues():
5875.4.4 by INADA Naoki
Remove l10n of options.
462
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
463
    return parser
464
1185.16.45 by Martin Pool
- refactor handling of short option names
465
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
466
def custom_help(name, help):
467
    """Clone a common option overriding the help."""
468
    import copy
469
    o = copy.copy(Option.OPTIONS[name])
470
    o.help = help
471
    return o
472
473
474
def _standard_option(name, **kwargs):
475
    """Register a standard option."""
476
    # All standard options are implicitly 'global' ones
477
    Option.STD_OPTIONS[name] = Option(name, **kwargs)
478
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
479
6161.1.1 by Vincent Ladeuil
Allow config options to be overridden from the command line
480
def _standard_list_option(name, **kwargs):
481
    """Register a standard option."""
482
    # All standard options are implicitly 'global' ones
483
    Option.STD_OPTIONS[name] = ListOption(name, **kwargs)
484
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
485
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
486
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
487
def _global_option(name, **kwargs):
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
488
    """Register a global option."""
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
489
    Option.OPTIONS[name] = Option(name, **kwargs)
490
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
491
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.
492
def _global_registry_option(name, help, registry=None, **kwargs):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
493
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
494
2221.4.17 by Aaron Bentley
PEP8-ness
495
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
496
# This is the verbosity level detected during command line parsing.
497
# Note that the final value is dependent on the order in which the
498
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
499
# The final value will be one of the following:
500
#
501
# * -ve for quiet
502
# * 0 for normal
503
# * +ve for verbose
504
_verbosity_level = 0
505
506
507
def _verbosity_level_callback(option, opt_str, value, parser):
508
    global _verbosity_level
509
    if not value:
510
        # Either --no-verbose or --no-quiet was specified
511
        _verbosity_level = 0
512
    elif opt_str == "verbose":
513
        if _verbosity_level > 0:
514
            _verbosity_level += 1
515
        else:
516
            _verbosity_level = 1
517
    else:
518
        if _verbosity_level < 0:
519
            _verbosity_level -= 1
520
        else:
521
            _verbosity_level = -1
522
523
524
# Declare the standard options
525
_standard_option('help', short_name='h',
526
                 help='Show help message.')
6161.1.1 by Vincent Ladeuil
Allow config options to be overridden from the command line
527
_standard_option('quiet', short_name='q',
528
                 help="Only display errors and warnings.",
529
                 custom_callback=_verbosity_level_callback)
3984.4.6 by Ian Clatworthy
Show usage on --usage, not -h
530
_standard_option('usage',
531
                 help='Show usage message and options.')
2768.1.3 by Ian Clatworthy
Support custom help for commonly used options and standard option definition
532
_standard_option('verbose', short_name='v',
533
                 help='Display more information.',
534
                 custom_callback=_verbosity_level_callback)
535
536
# Declare commonly used options
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
537
_global_option('change',
538
               type=_parse_change_str,
539
               short_name='c',
540
               param_name='revision',
541
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
542
_global_option('directory', short_name='d', type=unicode,
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
543
               help='Branch to operate on, instead of working directory.')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
544
_global_option('file', type=unicode, short_name='F')
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
545
_global_registry_option('log-format', "Use specified log format.",
546
                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),
547
                        value_switches=True, title='Log format',
548
                        short_value_switches={'short': 'S'})
549
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
6259.3.1 by Martin Packman
Relocate merge type registry to bzrlib.merge from bzrlib.option
550
                        lazy_registry=('bzrlib.merge', 'merge_type_registry'),
551
                        value_switches=True, title='Merge algorithm')
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
552
_global_option('message', type=unicode,
553
               short_name='m',
554
               help='Message string.')
5250.1.1 by Parth Malwankar
-0/--null should be a global option and not standard option.
555
_global_option('null', short_name='0',
556
                 help='Use an ASCII NUL (\\0) separator rather than '
557
                      'a newline.')
6155.4.1 by Vincent Ladeuil
Sort options by name to make it easier to add a new one.
558
_global_option('overwrite', help='Ignore differences between branches and '
559
               'overwrite unconditionally.')
560
_global_option('remember', help='Remember the specified location as a'
561
               ' default.')
6259.1.1 by Martin Packman
Remove registration of global options that aren't used by bzrlib or common plugins
562
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
563
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
564
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
565
               short_name='r',
2745.4.4 by Lukáš Lalinsky
- Make the description of --change more general
566
               help='See "help revisionspec" for details.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
567
_global_option('show-ids',
568
               help='Show internal object ids.')
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
569
_global_option('timezone',
2598.1.14 by Martin Pool
Revert tightening of options api - breaks too many plugins
570
               type=str,
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
571
               help='Display timezone as local, original, or utc.')
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
572
573
diff_writer_registry = _mod_registry.Registry()
574
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')
575
diff_writer_registry.default_key = 'plain'