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