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