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