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