/brz/remove-bazaar

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