/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
29
    revisionspec,
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
30
    symbol_versioning,
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
31
    )
32
""")
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
33
from bzrlib.trace import warning
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')
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'
43
    [<RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
44
    >>> _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'
45
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 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')
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'
49
    [<RevisionSpec None>, <RevisionSpec_revno 234>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
50
    >>> _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'
51
    [<RevisionSpec_revno 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
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'
53
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
54
    >>> _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'
55
    [<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 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')
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'
61
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 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')
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'
71
    [<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
72
    >>> _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'
73
    [<RevisionSpec_revno -5>]
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
74
    >>> _parse_revision_str('123a')
75
    Traceback (most recent call last):
76
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
77
    NoSuchRevisionSpec: No namespace registered for string: '123a'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
78
    >>> _parse_revision_str('abc')
79
    Traceback (most recent call last):
80
      ...
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
81
    NoSuchRevisionSpec: No namespace registered for string: 'abc'
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
82
    >>> _parse_revision_str('branch:../branch2')
83
    [<RevisionSpec_branch branch:../branch2>]
1545.1.1 by Denys Duchier
distinguish ../ as path to branch and .. as revspec separator
84
    >>> _parse_revision_str('branch:../../branch2')
85
    [<RevisionSpec_branch branch:../../branch2>]
86
    >>> _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'
87
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 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 = []
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
91
    # 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
92
    sep = re.compile("\\.\\.(?!/)")
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
98
def _parse_merge_type(typestring):
1185.12.62 by Aaron Bentley
Restored merge-type selection
99
    return get_merge_type(typestring)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
100
1185.12.62 by Aaron Bentley
Restored merge-type selection
101
def get_merge_type(typestring):
102
    """Attempt to find the merge class/factory associated with a string."""
103
    from merge import merge_types
104
    try:
105
        return merge_types[typestring][0]
106
    except KeyError:
107
        templ = '%s%%7s: %%s' % (' '*12)
108
        lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]
109
        type_list = '\n'.join(lines)
110
        msg = "No known merge type %s. Supported types are:\n%s" %\
111
            (typestring, type_list)
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
112
        raise errors.BzrCommandError(msg)
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
113
2227.1.2 by mbp at sourcefrog
Add a simple DeprecatedDict class
114
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
115
class Option(object):
2190.2.1 by Martin Pool
remove global registration of short options
116
    """Description of a command line option
117
    
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
118
    :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
119
    Otherwise None.
120
    """
121
1185.16.45 by Martin Pool
- refactor handling of short option names
122
    # TODO: Some way to show in help a description of the option argument
123
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
124
    OPTIONS = {}
125
2190.2.1 by Martin Pool
remove global registration of short options
126
    def __init__(self, name, help='', type=None, argname=None,
127
                 short_name=None):
1185.16.45 by Martin Pool
- refactor handling of short option names
128
        """Make a new command option.
129
130
        name -- regular name of the command, used in the double-dash
131
            form and also as the parameter to the command's run() 
132
            method.
133
134
        help -- help message displayed in command help
135
136
        type -- function called to parse the option argument, or 
137
            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
138
139
        argname -- name of option argument, if any
1185.16.45 by Martin Pool
- refactor handling of short option names
140
        """
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
141
        self.name = name
142
        self.help = help
143
        self.type = type
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
144
        self._short_name = short_name
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
145
        if type is None:
146
            assert argname is None
147
        elif argname is None:
148
            argname = 'ARG'
149
        self.argname = argname
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
150
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
151
    def short_name(self):
2227.1.3 by mbp at sourcefrog
Restore access to SHORT_OPTIONS for compatibility
152
        if self._short_name:
153
            return self._short_name
154
        else:
155
            # remove this when SHORT_OPTIONS is removed
156
            # XXX: This is accessing a DeprecatedDict, so we call the super 
157
            # method to avoid warnings
158
            for (k, v) in dict.iteritems(Option.SHORT_OPTIONS):
159
                if v == self:
160
                    return k
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
161
2227.1.4 by mbp at sourcefrog
add test that legacy SHORT_OPTIONS really works, and set_short_name
162
    def set_short_name(self, short_name):
163
        self._short_name = short_name
164
1857.1.9 by Aaron Bentley
Add hidden negation options
165
    def get_negation_name(self):
166
        if self.name.startswith('no-'):
167
            return self.name[3:]
168
        else:
169
            return 'no-' + self.name
170
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
171
    def add_option(self, parser, short_name):
172
        """Add this option to an Optparse parser"""
173
        option_strings = ['--%s' % self.name]
174
        if short_name is not None:
175
            option_strings.append('-%s' % short_name)
176
        optargfn = self.type
177
        if optargfn is None:
178
            parser.add_option(action='store_true', dest=self.name, 
179
                              help=self.help,
180
                              default=OptionParser.DEFAULT_VALUE,
181
                              *option_strings)
1857.1.9 by Aaron Bentley
Add hidden negation options
182
            negation_strings = ['--%s' % self.get_negation_name()]
1857.1.22 by Aaron Bentley
Negations set value to False, instead of Optparser.DEFAULT_VALUE
183
            parser.add_option(action='store_false', dest=self.name, 
184
                              help=optparse.SUPPRESS_HELP, *negation_strings)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
185
        else:
186
            parser.add_option(action='callback', 
187
                              callback=self._optparse_callback, 
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
188
                              type='string', metavar=self.argname.upper(),
1857.1.4 by Aaron Bentley
Set metavar according to option
189
                              help=self.help,
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
190
                              default=OptionParser.DEFAULT_VALUE, 
191
                              *option_strings)
192
193
    def _optparse_callback(self, option, opt, value, parser):
194
        setattr(parser.values, self.name, self.type(value))
195
1857.1.14 by Aaron Bentley
Fix man page generation
196
    def iter_switches(self):
197
        """Iterate through the list of switches provided by the option
198
        
199
        :return: an iterator of (name, short_name, argname, help)
200
        """
201
        argname =  self.argname
202
        if argname is not None:
203
            argname = argname.upper()
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
204
        yield self.name, self.short_name(), argname, self.help
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
205
1857.1.15 by Aaron Bentley
Add tests for generating an option parser
206
2221.4.1 by Aaron Bentley
Get registry options working
207
class RegistryOption(Option):
2221.4.6 by Aaron Bentley
Improve text and naming
208
    """Option based on a registry
2221.4.9 by Aaron Bentley
Zap trailing whitespace
209
2221.4.6 by Aaron Bentley
Improve text and naming
210
    The values for the options correspond to entries in the registry.  Input
211
    must be a registry key.  After validation, it is converted into an object
212
    using Registry.get or a caller-provided converter.
213
    """
2221.4.1 by Aaron Bentley
Get registry options working
214
215
    def validate_value(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
216
        """Validate a value name"""
2221.4.1 by Aaron Bentley
Get registry options working
217
        if value not in self.registry:
2221.4.6 by Aaron Bentley
Improve text and naming
218
            raise errors.BadOptionValue(self.name, value)
2221.4.1 by Aaron Bentley
Get registry options working
219
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
220
    def convert(self, value):
2221.4.3 by Aaron Bentley
Add docstrings
221
        """Convert a value name into an output type"""
222
        self.validate_value(value)
2221.4.1 by Aaron Bentley
Get registry options working
223
        if self.converter is None:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
224
            return self.registry.get(value)
2221.4.1 by Aaron Bentley
Get registry options working
225
        else:
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
226
            return self.converter(value)
2221.4.1 by Aaron Bentley
Get registry options working
227
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
228
    def __init__(self, name, help, registry, converter=None,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
229
        value_switches=False, title=None):
2221.4.3 by Aaron Bentley
Add docstrings
230
        """
231
        Constructor.
232
233
        :param name: The option name.
234
        :param help: Help for the option.
235
        :param registry: A Registry containing the values
236
        :param converter: Callable to invoke with the value name to produce
2221.4.6 by Aaron Bentley
Improve text and naming
237
            the value.  If not supplied, self.registry.get is used.
2221.4.3 by Aaron Bentley
Add docstrings
238
        :param value_switches: If true, each possible value is assigned its
2221.4.9 by Aaron Bentley
Zap trailing whitespace
239
            own switch.  For example, instead of '--format metaweave',
2221.4.3 by Aaron Bentley
Add docstrings
240
            '--metaweave' can be used interchangeably.
241
        """
242
        Option.__init__(self, name, help, type=self.convert)
2221.4.1 by Aaron Bentley
Get registry options working
243
        self.registry = registry
244
        self.name = name
245
        self.converter = converter
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
246
        self.value_switches = value_switches
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
247
        self.title = title
248
        if self.title is None:
249
            self.title = name
2221.4.1 by Aaron Bentley
Get registry options working
250
251
    def add_option(self, parser, short_name):
252
        """Add this option to an Optparse parser"""
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
253
        if self.value_switches:
254
            parser = parser.add_option_group(self.title)
2221.4.1 by Aaron Bentley
Get registry options working
255
        Option.add_option(self, parser, short_name)
256
        if self.value_switches:
257
            for key in self.registry.keys():
258
                option_strings = ['--%s' % key]
2221.4.9 by Aaron Bentley
Zap trailing whitespace
259
                parser.add_option(action='callback',
260
                              callback=self._optparse_value_callback(key),
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
261
                                  help=self.registry.get_help(key),
2221.4.1 by Aaron Bentley
Get registry options working
262
                                  *option_strings)
263
264
    def _optparse_value_callback(self, cb_value):
265
        def cb(option, opt, value, parser):
266
            setattr(parser.values, self.name, self.type(cb_value))
267
        return cb
268
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
269
    def iter_switches(self):
270
        """Iterate through the list of switches provided by the option
2221.4.9 by Aaron Bentley
Zap trailing whitespace
271
2221.4.4 by Aaron Bentley
Fix iter_switches behavior when value_switches is true
272
        :return: an iterator of (name, short_name, argname, help)
273
        """
274
        for value in Option.iter_switches(self):
275
            yield value
276
        if self.value_switches:
277
            for key in sorted(self.registry.keys()):
278
                yield key, None, None, self.registry.get_help(key)
2221.4.1 by Aaron Bentley
Get registry options working
279
2221.4.6 by Aaron Bentley
Improve text and naming
280
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
281
class OptionParser(optparse.OptionParser):
282
    """OptionParser that raises exceptions instead of exiting"""
283
1857.1.6 by Aaron Bentley
Make the DEFAULT_VALUE an object instance
284
    DEFAULT_VALUE = object()
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
285
286
    def error(self, message):
1996.3.28 by John Arbash Meinel
lazy import revisionspec and errors for bzrlib.options
287
        raise errors.BzrCommandError(message)
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
288
289
290
def get_optparser(options):
291
    """Generate an optparse parser for bzrlib-style options"""
292
293
    parser = OptionParser()
294
    parser.remove_option('--help')
295
    for option in options.itervalues():
2227.1.1 by mbp at sourcefrog
Back out previous incompatible change: Option.short_name is now again
296
        option.add_option(parser, option.short_name())
1857.1.3 by Aaron Bentley
Make option adding depend on Option type
297
    return parser
298
1185.16.45 by Martin Pool
- refactor handling of short option names
299
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
300
def _global_option(name, **kwargs):
301
    """Register o as a global option."""
302
    Option.OPTIONS[name] = Option(name, **kwargs)
303
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
304
305
def _global_registry_option(name, help, registry, **kwargs):
306
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
307
308
1185.16.45 by Martin Pool
- refactor handling of short option names
309
_global_option('all')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
310
_global_option('overwrite', help='Ignore differences between branches and '
311
               'overwrite unconditionally')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
312
_global_option('basis', type=str)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
313
_global_option('bound')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
314
_global_option('diff-options', type=str)
1185.16.55 by mbp at sourcefrog
- more option help
315
_global_option('help',
2190.2.1 by Martin Pool
remove global registration of short options
316
               help='show help message',
317
               short_name='h')
318
_global_option('file', type=unicode, short_name='F')
1185.16.45 by Martin Pool
- refactor handling of short option names
319
_global_option('force')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
320
_global_option('format', type=unicode)
1185.16.45 by Martin Pool
- refactor handling of short option names
321
_global_option('forward')
2190.2.1 by Martin Pool
remove global registration of short options
322
_global_option('message', type=unicode,
323
               short_name='m')
1185.16.45 by Martin Pool
- refactor handling of short option names
324
_global_option('no-recurse')
1185.16.55 by mbp at sourcefrog
- more option help
325
_global_option('profile',
326
               help='show performance profiling information')
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
327
_global_option('revision',
2190.2.1 by Martin Pool
remove global registration of short options
328
               type=_parse_revision_str,
2204.2.1 by Wouter van Heyst
Fix merge conflicts.
329
               short_name='r',
2201.2.1 by Wouter van Heyst
Make mention of the revisionspec topic in the revision option help (#31633).
330
               help='See \'help revisionspec\' for details')
1185.16.47 by Martin Pool
- help for global options
331
_global_option('show-ids', 
332
               help='show internal object ids')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
333
_global_option('timezone', 
334
               type=str,
335
               help='display timezone as local, original, or utc')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
336
_global_option('unbound')
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
337
_global_option('verbose',
2190.2.1 by Martin Pool
remove global registration of short options
338
               help='display more information',
339
               short_name='v')
1185.16.45 by Martin Pool
- refactor handling of short option names
340
_global_option('version')
341
_global_option('email')
342
_global_option('update')
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
343
_global_registry_option('log-format', "Use this log format",
2221.4.13 by Aaron Bentley
Add title to log format option section
344
                        log.log_formatter_registry, value_switches=True,
345
                        title='Log format')
2190.2.1 by Martin Pool
remove global registration of short options
346
_global_option('long', help='Use detailed log format. Same as --log-format long',
347
               short_name='l')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
348
_global_option('short', help='Use moderately short log format. Same as --log-format short')
349
_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
350
_global_option('root', type=str)
1185.16.45 by Martin Pool
- refactor handling of short option names
351
_global_option('no-backup')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
352
_global_option('merge-type', type=_parse_merge_type, 
353
               help='Select a particular merge algorithm')
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
354
_global_option('pattern', type=str)
2190.2.1 by Martin Pool
remove global registration of short options
355
_global_option('quiet', short_name='q')
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
356
_global_option('remember', help='Remember the specified location as a'
357
               ' default.')
1185.24.3 by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff
358
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
359
_global_option('kind', type=str)
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
360
_global_option('dry-run',
361
               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
362
_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
363
364
365
# prior to 0.14 these were always globally registered; the old dict is
366
# available for plugins that use it but it should not be used.
367
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(
368
    symbol_versioning.zero_fourteen,
369
    'SHORT_OPTIONS',
370
    {
371
        'F': Option.OPTIONS['file'],
372
        'h': Option.OPTIONS['help'],
373
        'm': Option.OPTIONS['message'],
374
        'r': Option.OPTIONS['revision'],
375
        'v': Option.OPTIONS['verbose'],
376
        'l': Option.OPTIONS['long'],
377
        'q': Option.OPTIONS['quiet'],
378
    },
379
    'Set the short option name when constructing the Option.',
380
    )