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,
 | 
| 
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  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
208  | 
class RegistryOption(Option):  | 
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
209  | 
"""Option based on a registry  | 
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
210  | 
|
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
211  | 
    The values for the options correspond to entries in the registry.  Input
 | 
212  | 
    must be a registry key.  After validation, it is converted into an object
 | 
|
213  | 
    using Registry.get or a caller-provided converter.
 | 
|
214  | 
    """
 | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
215  | 
|
216  | 
def validate_value(self, value):  | 
|
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
217  | 
"""Validate a value name"""  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
218  | 
if value not in self.registry:  | 
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
219  | 
raise errors.BadOptionValue(self.name, value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
220  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
221  | 
def convert(self, value):  | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
222  | 
"""Convert a value name into an output type"""  | 
223  | 
self.validate_value(value)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
224  | 
if self.converter is None:  | 
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
225  | 
return self.registry.get(value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
226  | 
else:  | 
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
227  | 
return self.converter(value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
228  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
229  | 
def __init__(self, name, help, registry, converter=None,  | 
| 
2221.4.12
by Aaron Bentley
 Add option grouping to RegistryOption and clean up format options  | 
230  | 
value_switches=False, title=None):  | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
231  | 
"""  | 
232  | 
        Constructor.
 | 
|
233  | 
||
234  | 
        :param name: The option name.
 | 
|
235  | 
        :param help: Help for the option.
 | 
|
236  | 
        :param registry: A Registry containing the values
 | 
|
237  | 
        :param converter: Callable to invoke with the value name to produce
 | 
|
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
238  | 
            the value.  If not supplied, self.registry.get is used.
 | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
239  | 
        :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.  | 
240  | 
            own switch.  For example, instead of '--format knit',
 | 
241  | 
            '--knit' can be used interchangeably.
 | 
|
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
242  | 
        """
 | 
243  | 
Option.__init__(self, name, help, type=self.convert)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
244  | 
self.registry = registry  | 
245  | 
self.name = name  | 
|
246  | 
self.converter = converter  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
247  | 
self.value_switches = value_switches  | 
| 
2221.4.12
by Aaron Bentley
 Add option grouping to RegistryOption and clean up format options  | 
248  | 
self.title = title  | 
249  | 
if self.title is None:  | 
|
250  | 
self.title = name  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
251  | 
|
252  | 
def add_option(self, parser, short_name):  | 
|
253  | 
"""Add this option to an Optparse parser"""  | 
|
| 
2221.4.12
by Aaron Bentley
 Add option grouping to RegistryOption and clean up format options  | 
254  | 
if self.value_switches:  | 
255  | 
parser = parser.add_option_group(self.title)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
256  | 
Option.add_option(self, parser, short_name)  | 
257  | 
if self.value_switches:  | 
|
258  | 
for key in self.registry.keys():  | 
|
259  | 
option_strings = ['--%s' % key]  | 
|
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
260  | 
parser.add_option(action='callback',  | 
261  | 
callback=self._optparse_value_callback(key),  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
262  | 
help=self.registry.get_help(key),  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
263  | 
*option_strings)  | 
264  | 
||
265  | 
def _optparse_value_callback(self, cb_value):  | 
|
266  | 
def cb(option, opt, value, parser):  | 
|
267  | 
setattr(parser.values, self.name, self.type(cb_value))  | 
|
268  | 
return cb  | 
|
269  | 
||
| 
2221.4.4
by Aaron Bentley
 Fix iter_switches behavior when value_switches is true  | 
270  | 
def iter_switches(self):  | 
271  | 
"""Iterate through the list of switches provided by the option  | 
|
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
272  | 
|
| 
2221.4.4
by Aaron Bentley
 Fix iter_switches behavior when value_switches is true  | 
273  | 
        :return: an iterator of (name, short_name, argname, help)
 | 
274  | 
        """
 | 
|
275  | 
for value in Option.iter_switches(self):  | 
|
276  | 
yield value  | 
|
277  | 
if self.value_switches:  | 
|
278  | 
for key in sorted(self.registry.keys()):  | 
|
279  | 
yield key, None, None, self.registry.get_help(key)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
280  | 
|
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
281  | 
|
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
282  | 
class OptionParser(optparse.OptionParser):  | 
283  | 
"""OptionParser that raises exceptions instead of exiting"""  | 
|
284  | 
||
| 
1857.1.6
by Aaron Bentley
 Make the DEFAULT_VALUE an object instance  | 
285  | 
DEFAULT_VALUE = object()  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
286  | 
|
287  | 
def error(self, message):  | 
|
| 
1996.3.28
by John Arbash Meinel
 lazy import revisionspec and errors for bzrlib.options  | 
288  | 
raise errors.BzrCommandError(message)  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
289  | 
|
290  | 
||
291  | 
def get_optparser(options):  | 
|
292  | 
"""Generate an optparse parser for bzrlib-style options"""  | 
|
293  | 
||
294  | 
parser = OptionParser()  | 
|
295  | 
parser.remove_option('--help')  | 
|
296  | 
for option in options.itervalues():  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
297  | 
option.add_option(parser, option.short_name())  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
298  | 
return parser  | 
299  | 
||
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
300  | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
301  | 
def _global_option(name, **kwargs):  | 
302  | 
"""Register o as a global option."""  | 
|
303  | 
Option.OPTIONS[name] = Option(name, **kwargs)  | 
|
304  | 
||
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
305  | 
|
306  | 
def _global_registry_option(name, help, registry, **kwargs):  | 
|
307  | 
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)  | 
|
308  | 
||
| 
2221.4.17
by Aaron Bentley
 PEP8-ness  | 
309  | 
|
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
310  | 
class MergeTypeRegistry(registry.Registry):  | 
311  | 
||
312  | 
    pass
 | 
|
313  | 
||
| 
2221.4.17
by Aaron Bentley
 PEP8-ness  | 
314  | 
|
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
315  | 
_merge_type_registry = MergeTypeRegistry()  | 
316  | 
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',  | 
|
317  | 
"Native diff3-style merge")  | 
|
318  | 
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',  | 
|
319  | 
"Merge using external diff3")  | 
|
320  | 
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',  | 
|
321  | 
"Weave-based merge")  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
322  | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
323  | 
_global_option('all')  | 
| 
1185.12.92
by Aaron Bentley
 Fixed pull help, renamed clobber to overwrite  | 
324  | 
_global_option('overwrite', help='Ignore differences between branches and '  | 
325  | 
'overwrite unconditionally')  | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
326  | 
_global_option('basis', type=str)  | 
| 
1505.1.2
by John Arbash Meinel
 (broken) working on implementing bound branches.  | 
327  | 
_global_option('bound')  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
328  | 
_global_option('diff-options', type=str)  | 
| 
1185.16.55
by mbp at sourcefrog
 - more option help  | 
329  | 
_global_option('help',  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
330  | 
help='show help message',  | 
331  | 
short_name='h')  | 
|
332  | 
_global_option('file', type=unicode, short_name='F')  | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
333  | 
_global_option('force')  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
334  | 
_global_option('format', type=unicode)  | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
335  | 
_global_option('forward')  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
336  | 
_global_option('message', type=unicode,  | 
337  | 
short_name='m')  | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
338  | 
_global_option('no-recurse')  | 
| 
1185.16.55
by mbp at sourcefrog
 - more option help  | 
339  | 
_global_option('profile',  | 
340  | 
help='show performance profiling information')  | 
|
| 
2204.2.1
by Wouter van Heyst
 Fix merge conflicts.  | 
341  | 
_global_option('revision',  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
342  | 
type=_parse_revision_str,  | 
| 
2204.2.1
by Wouter van Heyst
 Fix merge conflicts.  | 
343  | 
short_name='r',  | 
| 
2201.2.1
by Wouter van Heyst
 Make mention of the revisionspec topic in the revision option help (#31633).  | 
344  | 
help='See \'help revisionspec\' for details')  | 
| 
1185.16.47
by Martin Pool
 - help for global options  | 
345  | 
_global_option('show-ids',  | 
346  | 
help='show internal object ids')  | 
|
| 
1185.16.48
by mbp at sourcefrog
 - more refactoring of and tests for option parsing  | 
347  | 
_global_option('timezone',  | 
348  | 
type=str,  | 
|
349  | 
help='display timezone as local, original, or utc')  | 
|
| 
1505.1.2
by John Arbash Meinel
 (broken) working on implementing bound branches.  | 
350  | 
_global_option('unbound')  | 
| 
1185.16.48
by mbp at sourcefrog
 - more refactoring of and tests for option parsing  | 
351  | 
_global_option('verbose',  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
352  | 
help='display more information',  | 
353  | 
short_name='v')  | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
354  | 
_global_option('version')  | 
355  | 
_global_option('email')  | 
|
356  | 
_global_option('update')  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
357  | 
_global_registry_option('log-format', "Use this log format",  | 
| 
2221.4.13
by Aaron Bentley
 Add title to log format option section  | 
358  | 
log.log_formatter_registry, value_switches=True,  | 
359  | 
title='Log format')  | 
|
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
360  | 
_global_option('long', help='Use detailed log format. Same as --log-format long',  | 
361  | 
short_name='l')  | 
|
| 
1857.1.20
by Aaron Bentley
 Strip out all the EnumOption stuff  | 
362  | 
_global_option('short', help='Use moderately short log format. Same as --log-format short')  | 
363  | 
_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  | 
364  | 
_global_option('root', type=str)  | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
365  | 
_global_option('no-backup')  | 
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
366  | 
_global_registry_option('merge-type', 'Select a particular merge algorithm',  | 
367  | 
_merge_type_registry, value_switches=True,  | 
|
368  | 
title='Merge algorithm')  | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
369  | 
_global_option('pattern', type=str)  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
370  | 
_global_option('quiet', short_name='q')  | 
| 
1185.12.92
by Aaron Bentley
 Fixed pull help, renamed clobber to overwrite  | 
371  | 
_global_option('remember', help='Remember the specified location as a'  | 
372  | 
' default.')  | 
|
| 
1185.24.3
by Aaron Bentley
 Integrated reprocessing into the rest of the merge stuff  | 
373  | 
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')  | 
| 
1185.33.33
by Martin Pool
 [patch] add 'bzr inventory --kind directory'; remove 'bzr directories'  | 
374  | 
_global_option('kind', type=str)  | 
| 
1185.33.90
by Martin Pool
 [merge] add --dry-run option (mpe)  | 
375  | 
_global_option('dry-run',  | 
376  | 
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  | 
377  | 
_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  | 
378  | 
|
379  | 
||
380  | 
# prior to 0.14 these were always globally registered; the old dict is
 | 
|
381  | 
# available for plugins that use it but it should not be used.
 | 
|
382  | 
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(  | 
|
383  | 
symbol_versioning.zero_fourteen,  | 
|
384  | 
'SHORT_OPTIONS',  | 
|
385  | 
    {
 | 
|
386  | 
'F': Option.OPTIONS['file'],  | 
|
387  | 
'h': Option.OPTIONS['help'],  | 
|
388  | 
'm': Option.OPTIONS['message'],  | 
|
389  | 
'r': Option.OPTIONS['revision'],  | 
|
390  | 
'v': Option.OPTIONS['verbose'],  | 
|
391  | 
'l': Option.OPTIONS['long'],  | 
|
392  | 
'q': Option.OPTIONS['quiet'],  | 
|
393  | 
    },
 | 
|
394  | 
'Set the short option name when constructing the Option.',  | 
|
395  | 
    )
 |