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