~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2004, 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
20
import re
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
24
import optparse
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
25
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
26
from bzrlib import (
27
    errors,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
28
    log,
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
29
    registry,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
30
    revisionspec,
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
31
    symbol_versioning,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
32
    )
33
""")
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
34
from bzrlib.trace import warning
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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
44
    [<RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
45
    >>> _parse_revision_str('234..567')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
46
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
50
    [<RevisionSpec None>, <RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
51
    >>> _parse_revision_str('234..')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
52
    [<RevisionSpec_revno 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
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
54
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
55
    >>> _parse_revision_str('234....789') #Error ?
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
56
    [<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
62
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 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')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
72
    [<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
73
    >>> _parse_revision_str('-5')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
74
    [<RevisionSpec_revno -5>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
75
    >>> _parse_revision_str('123a')
76
    Traceback (most recent call last):
77
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
78
    NoSuchRevisionSpec: No namespace registered for string: '123a'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
79
    >>> _parse_revision_str('abc')
80
    Traceback (most recent call last):
81
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
82
    NoSuchRevisionSpec: No namespace registered for string: 'abc'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
83
    >>> _parse_revision_str('branch:../branch2')
84
    [<RevisionSpec_branch branch:../branch2>]
1545.1.1 by Denys Duchier
distinguish ../ as path to branch and .. as revspec separator
85
    >>> _parse_revision_str('branch:../../branch2')
86
    [<RevisionSpec_branch branch:../../branch2>]
87
    >>> _parse_revision_str('branch:../../branch2..23')
1948.4.31 by John Arbash Meinel
fix bugs in the test_annonate.py suite, which was passing '-r 3' as n argument not '-r3' or '-r', '3'
88
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 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 = []
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
92
    # split on the first .. that is not followed by a / ?
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
    sep = re.compile("\\.\\.(?!/)")
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
99
def _parse_merge_type(typestring):
1185.12.62 by Aaron Bentley
Restored merge-type selection
100
    return get_merge_type(typestring)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
101
1185.12.62 by Aaron Bentley
Restored merge-type selection
102
def get_merge_type(typestring):
103
    """Attempt to find the merge class/factory associated with a string."""
104
    from merge import merge_types
105
    try:
106
        return merge_types[typestring][0]
107
    except KeyError:
108
        templ = '%s%%7s: %%s' % (' '*12)
109
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
110
        type_list = '\n'.join(lines)
111
        msg = "No known merge type %s. Supported types are:\n%s" %\
112
            (typestring, type_list)
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
113
        raise errors.BzrCommandError(msg)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
114
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
115
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
116
class Option(object):
2190.2.1 by Martin Pool
remove global registration of short options
117
    """Description of a command line option
118
    
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
119
    :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
120
    Otherwise None.
121
    """
122
1185.16.45 by Martin Pool
- refactor handling of short option names
123
    # TODO: Some way to show in help a description of the option argument
124
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
125
    OPTIONS = {}
126
2190.2.1 by Martin Pool
remove global registration of short options
127
    def __init__(self, name, help='', type=None, argname=None,
128
                 short_name=None):
1185.16.45 by Martin Pool
- refactor handling of short option names
129
        """Make a new command option.
130
131
        name -- regular name of the command, used in the double-dash
132
            form and also as the parameter to the command's run() 
133
            method.
134
135
        help -- help message displayed in command help
136
137
        type -- function called to parse the option argument, or 
138
            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
139
140
        argname -- name of option argument, if any
1185.16.45 by Martin Pool
- refactor handling of short option names
141
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
142
        self.name = name
143
        self.help = help
144
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
145
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
146
        if type is None:
147
            assert argname is None
148
        elif argname is None:
149
            argname = 'ARG'
150
        self.argname = argname
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
151
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
152
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
153
        if self._short_name:
154
            return self._short_name
155
        else:
156
            # remove this when SHORT_OPTIONS is removed
157
            # XXX: This is accessing a DeprecatedDict, so we call the super 
158
            # method to avoid warnings
159
            for (k, v) in dict.iteritems(Option.SHORT_OPTIONS):
160
                if v == self:
161
                    return k
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
162
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
163
    def set_short_name(self, short_name):
164
        self._short_name = short_name
165
1857.1.9 by Aaron Bentley
Add hidden negation options
166
    def get_negation_name(self):
167
        if self.name.startswith('no-'):
168
            return self.name[3:]
169
        else:
170
            return 'no-' + self.name
171
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
172
    def add_option(self, parser, short_name):
173
        """Add this option to an Optparse parser"""
174
        option_strings = ['--%s' % self.name]
175
        if short_name is not None:
176
            option_strings.append('-%s' % short_name)
177
        optargfn = self.type
178
        if optargfn is None:
179
            parser.add_option(action='store_true', dest=self.name, 
180
                              help=self.help,
181
                              default=OptionParser.DEFAULT_VALUE,
182
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
183
            negation_strings = ['--%s' % self.get_negation_name()]
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
184
            parser.add_option(action='store_false', dest=self.name, 
185
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
186
        else:
187
            parser.add_option(action='callback', 
188
                              callback=self._optparse_callback, 
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
189
                              type='string', metavar=self.argname.upper(),
1857.1.4 by Aaron Bentley
Set metavar according to option
190
                              help=self.help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
191
                              default=OptionParser.DEFAULT_VALUE, 
192
                              *option_strings)
193
194
    def _optparse_callback(self, option, opt, value, parser):
195
        setattr(parser.values, self.name, self.type(value))
196
1857.1.14 by Aaron Bentley
Fix man page generation
197
    def iter_switches(self):
198
        """Iterate through the list of switches provided by the option
199
        
200
        :return: an iterator of (name, short_name, argname, help)
201
        """
202
        argname =  self.argname
203
        if argname is not None:
204
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
205
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
206
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
207
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
208
class ListOption(Option):
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
209
    """Option used to provide a list of values.
210
211
    On the command line, arguments are specified by a repeated use of the
212
    option. '-' is a special argument that resets the list. For example,
213
      --foo=a --foo=b
214
    sets the value of the 'foo' option to ['a', 'b'], and
215
      --foo=a --foo=b --foo=- --foo=c
216
    sets the value of the 'foo' option to ['c'].
217
    """
218
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
219
    def add_option(self, parser, short_name):
220
        """Add this option to an Optparse parser."""
221
        option_strings = ['--%s' % self.name]
222
        if short_name is not None:
223
            option_strings.append('-%s' % short_name)
224
        parser.add_option(action='callback',
225
                          callback=self._optparse_callback,
226
                          type='string', metavar=self.argname.upper(),
227
                          help=self.help, default=[],
228
                          *option_strings)
229
230
    def _optparse_callback(self, option, opt, value, parser):
2376.4.11 by Jonathan Lange
Provide a way of resetting list options (specifying '-' as the argument)
231
        values = getattr(parser.values, self.name)
232
        if value == '-':
233
            del values[:]
234
        else:
235
            values.append(self.type(value))
2376.4.1 by jml at canonical
Blackbox-driven --fixes option to commit.
236
237
2221.4.1 by Aaron Bentley
Get registry options working
238
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
239
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
240
2221.4.6 by Aaron Bentley
Improve text and naming
241
    The values for the options correspond to entries in the registry.  Input
242
    must be a registry key.  After validation, it is converted into an object
243
    using Registry.get or a caller-provided converter.
244
    """
2221.4.1 by Aaron Bentley
Get registry options working
245
246
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
247
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
248
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
249
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
250
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
251
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
252
        """Convert a value name into an output type"""
253
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
254
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
255
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
256
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
257
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
258
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
259
    def __init__(self, name, help, registry, converter=None,
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
260
        value_switches=False, title=None, enum_switch=True):
2221.4.3 by Aaron Bentley
Add docstrings
261
        """
262
        Constructor.
263
264
        :param name: The option name.
265
        :param help: Help for the option.
266
        :param registry: A Registry containing the values
267
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
268
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
269
        :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.
270
            own switch.  For example, instead of '--format knit',
271
            '--knit' can be used interchangeably.
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
272
        :param enum_switch: If true, a switch is provided with the option name,
273
            which takes a value.
2221.4.3 by Aaron Bentley
Add docstrings
274
        """
275
        Option.__init__(self, name, help, type=self.convert)
2221.4.1 by Aaron Bentley
Get registry options working
276
        self.registry = registry
277
        self.name = name
278
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
279
        self.value_switches = value_switches
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
280
        self.enum_switch = enum_switch
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
281
        self.title = title
282
        if self.title is None:
283
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
284
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
285
    @staticmethod
286
    def from_kwargs(name_, help=None, title=None, value_switches=False,
1551.12.43 by Aaron Bentley
Misc changes from review
287
                    enum_switch=True, **kwargs):
1551.12.24 by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options
288
        """Convenience method to generate string-map registry options
289
290
        name, help, value_switches and enum_switch are passed to the
291
        RegistryOption constructor.  Any other keyword arguments are treated
292
        as values for the option, and they value is treated as the help.
293
        """
294
        reg = registry.Registry()
295
        for name, help in kwargs.iteritems():
296
            name = name.replace('_', '-')
297
            reg.register(name, name, help=help)
298
        return RegistryOption(name_, help, reg, title=title,
299
            value_switches=value_switches, enum_switch=enum_switch)
300
2221.4.1 by Aaron Bentley
Get registry options working
301
    def add_option(self, parser, short_name):
302
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
303
        if self.value_switches:
304
            parser = parser.add_option_group(self.title)
1551.12.18 by Aaron Bentley
Allow RegistryOption to omit the value-taking option
305
        if self.enum_switch:
306
            Option.add_option(self, parser, short_name)
2221.4.1 by Aaron Bentley
Get registry options working
307
        if self.value_switches:
308
            for key in self.registry.keys():
309
                option_strings = ['--%s' % key]
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
310
                if getattr(self.registry.get_info(key), 'hidden', False):
311
                    help = optparse.SUPPRESS_HELP
312
                else:
313
                    help = self.registry.get_help(key)
2221.4.9 by Aaron Bentley
Zap trailing whitespace
314
                parser.add_option(action='callback',
315
                              callback=self._optparse_value_callback(key),
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
316
                                  help=help,
2221.4.1 by Aaron Bentley
Get registry options working
317
                                  *option_strings)
318
319
    def _optparse_value_callback(self, cb_value):
320
        def cb(option, opt, value, parser):
321
            setattr(parser.values, self.name, self.type(cb_value))
322
        return cb
323
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
324
    def iter_switches(self):
325
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
326
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
327
        :return: an iterator of (name, short_name, argname, help)
328
        """
329
        for value in Option.iter_switches(self):
330
            yield value
331
        if self.value_switches:
332
            for key in sorted(self.registry.keys()):
333
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
334
2221.4.6 by Aaron Bentley
Improve text and naming
335
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
336
class OptionParser(optparse.OptionParser):
337
    """OptionParser that raises exceptions instead of exiting"""
338
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
339
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
340
341
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
342
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
343
344
345
def get_optparser(options):
346
    """Generate an optparse parser for bzrlib-style options"""
347
348
    parser = OptionParser()
349
    parser.remove_option('--help')
350
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
351
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
352
    return parser
353
1185.16.45 by Martin Pool
- refactor handling of short option names
354
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
355
def _global_option(name, **kwargs):
356
    """Register o as a global option."""
357
    Option.OPTIONS[name] = Option(name, **kwargs)
358
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
359
360
def _global_registry_option(name, help, registry, **kwargs):
361
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
362
2221.4.17 by Aaron Bentley
PEP8-ness
363
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
364
class MergeTypeRegistry(registry.Registry):
365
366
    pass
367
2221.4.17 by Aaron Bentley
PEP8-ness
368
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
369
_merge_type_registry = MergeTypeRegistry()
370
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
371
                                   "Native diff3-style merge")
372
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
373
                                   "Merge using external diff3")
374
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
375
                                   "Weave-based merge")
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
376
1185.16.45 by Martin Pool
- refactor handling of short option names
377
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
378
_global_option('overwrite', help='Ignore differences between branches and '
379
               'overwrite unconditionally')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
380
_global_option('basis', type=str)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
381
_global_option('bound')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
382
_global_option('diff-options', type=str)
1185.16.55 by mbp at sourcefrog
- more option help
383
_global_option('help',
2190.2.1 by Martin Pool
remove global registration of short options
384
               help='show help message',
385
               short_name='h')
386
_global_option('file', type=unicode, short_name='F')
1185.16.45 by Martin Pool
- refactor handling of short option names
387
_global_option('force')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
388
_global_option('format', type=unicode)
1185.16.45 by Martin Pool
- refactor handling of short option names
389
_global_option('forward')
2190.2.1 by Martin Pool
remove global registration of short options
390
_global_option('message', type=unicode,
391
               short_name='m')
1185.16.45 by Martin Pool
- refactor handling of short option names
392
_global_option('no-recurse')
1185.16.55 by mbp at sourcefrog
- more option help
393
_global_option('profile',
394
               help='show performance profiling information')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
395
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
396
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
397
               short_name='r',
2201.2.1 by Wouter van Heyst
Make mention of the revisionspec topic in the revision option help (#31633).
398
               help='See \'help revisionspec\' for details')
1185.16.47 by Martin Pool
- help for global options
399
_global_option('show-ids', 
400
               help='show internal object ids')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
401
_global_option('timezone', 
402
               type=str,
403
               help='display timezone as local, original, or utc')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
404
_global_option('unbound')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
405
_global_option('verbose',
2190.2.1 by Martin Pool
remove global registration of short options
406
               help='display more information',
407
               short_name='v')
1185.16.45 by Martin Pool
- refactor handling of short option names
408
_global_option('version')
409
_global_option('email')
410
_global_option('update')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
411
_global_registry_option('log-format', "Use this log format",
2221.4.13 by Aaron Bentley
Add title to log format option section
412
                        log.log_formatter_registry, value_switches=True,
413
                        title='Log format')
2190.2.1 by Martin Pool
remove global registration of short options
414
_global_option('long', help='Use detailed log format. Same as --log-format long',
415
               short_name='l')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
416
_global_option('short', help='Use moderately short log format. Same as --log-format short')
417
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
418
_global_option('root', type=str)
1185.16.45 by Martin Pool
- refactor handling of short option names
419
_global_option('no-backup')
2221.4.15 by Aaron Bentley
Use RegistryOption for merge type
420
_global_registry_option('merge-type', 'Select a particular merge algorithm',
421
                        _merge_type_registry, value_switches=True,
422
                        title='Merge algorithm')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
423
_global_option('pattern', type=str)
2190.2.1 by Martin Pool
remove global registration of short options
424
_global_option('quiet', short_name='q')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
425
_global_option('remember', help='Remember the specified location as a'
426
               ' default.')
1185.24.3 by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff
427
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
428
_global_option('kind', type=str)
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
429
_global_option('dry-run',
430
               help="show what would be done, but don't actually do anything")
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
431
_global_option('name-from-revision', help='The path name in the old tree.')
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
432
433
434
# prior to 0.14 these were always globally registered; the old dict is
435
# available for plugins that use it but it should not be used.
436
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(
437
    symbol_versioning.zero_fourteen,
438
    'SHORT_OPTIONS',
439
    {
440
        'F': Option.OPTIONS['file'],
441
        'h': Option.OPTIONS['help'],
442
        'm': Option.OPTIONS['message'],
443
        'r': Option.OPTIONS['revision'],
444
        'v': Option.OPTIONS['verbose'],
445
        'l': Option.OPTIONS['long'],
446
        'q': Option.OPTIONS['quiet'],
447
    },
448
    'Set the short option name when constructing the Option.',
449
    )