bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2598.1.4
by Martin Pool
 Fix up tests for option help cleanups  | 
1  | 
# Copyright (C) 2004, 2005, 2006, 2007 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>]
 | 
| 
2747.1.1
by Lukáš Lalinský
 Accept ..\ as a path in revision specifiers  | 
89  | 
    >>> _parse_revision_str('branch:..\\\\branch2')
 | 
90  | 
    [<RevisionSpec_branch branch:..\\branch2>]
 | 
|
91  | 
    >>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
 | 
|
92  | 
    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_revno 23>]
 | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
93  | 
    """
 | 
94  | 
    # TODO: Maybe move this into revisionspec.py
 | 
|
95  | 
revs = []  | 
|
| 
2747.1.1
by Lukáš Lalinský
 Accept ..\ as a path in revision specifiers  | 
96  | 
    # split on .. that is not followed by a / or \
 | 
97  | 
sep = re.compile(r'\.\.(?![\\/])')  | 
|
| 
1948.4.28
by John Arbash Meinel
 Remove some places that were directly instantiating a RevisionSpec object. Also get rid of support for --revision 1:2, it has been deprecated for a long time  | 
98  | 
for x in sep.split(revstr):  | 
| 
1996.3.28
by John Arbash Meinel
 lazy import revisionspec and errors for bzrlib.options  | 
99  | 
revs.append(revisionspec.RevisionSpec.from_string(x or None))  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
100  | 
return revs  | 
101  | 
||
102  | 
||
| 
2745.4.1
by Lukáš Lalinsky
 New option -C/--change for diff and status to show changes in one revision. (#56299)  | 
103  | 
def _parse_change_str(revstr):  | 
| 
2745.4.5
by Lukáš Lalinsky
 '..' in the revision string doesn't always mean a range, so parse the string using _parse_revision_str and then check the number of returned revisions  | 
104  | 
"""Parse the revision string and return a tuple with left-most  | 
105  | 
    parent of the revision.
 | 
|
106  | 
||
107  | 
    >>> _parse_change_str('123')
 | 
|
108  | 
    (<RevisionSpec_before before:123>, <RevisionSpec_revno 123>)
 | 
|
109  | 
    >>> _parse_change_str('123..124')
 | 
|
110  | 
    Traceback (most recent call last):
 | 
|
111  | 
      ...
 | 
|
112  | 
    RangeInChangeOption: Option --change does not accept revision ranges
 | 
|
113  | 
    """
 | 
|
114  | 
revs = _parse_revision_str(revstr)  | 
|
115  | 
if len(revs) > 1:  | 
|
| 
2745.4.4
by Lukáš Lalinsky
 - Make the description of --change more general  | 
116  | 
raise errors.RangeInChangeOption()  | 
| 
2745.4.1
by Lukáš Lalinsky
 New option -C/--change for diff and status to show changes in one revision. (#56299)  | 
117  | 
return (revisionspec.RevisionSpec.from_string('before:' + revstr),  | 
| 
2745.4.5
by Lukáš Lalinsky
 '..' in the revision string doesn't always mean a range, so parse the string using _parse_revision_str and then check the number of returned revisions  | 
118  | 
revs[0])  | 
| 
2745.4.1
by Lukáš Lalinsky
 New option -C/--change for diff and status to show changes in one revision. (#56299)  | 
119  | 
|
120  | 
||
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
121  | 
def _parse_merge_type(typestring):  | 
| 
1185.12.62
by Aaron Bentley
 Restored merge-type selection  | 
122  | 
return get_merge_type(typestring)  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
123  | 
|
| 
1185.12.62
by Aaron Bentley
 Restored merge-type selection  | 
124  | 
def get_merge_type(typestring):  | 
125  | 
"""Attempt to find the merge class/factory associated with a string."""  | 
|
126  | 
from merge import merge_types  | 
|
127  | 
try:  | 
|
128  | 
return merge_types[typestring][0]  | 
|
129  | 
except KeyError:  | 
|
130  | 
templ = '%s%%7s: %%s' % (' '*12)  | 
|
131  | 
lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]  | 
|
132  | 
type_list = '\n'.join(lines)  | 
|
133  | 
msg = "No known merge type %s. Supported types are:\n%s" %\  | 
|
134  | 
(typestring, type_list)  | 
|
| 
1996.3.28
by John Arbash Meinel
 lazy import revisionspec and errors for bzrlib.options  | 
135  | 
raise errors.BzrCommandError(msg)  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
136  | 
|
| 
2227.1.2
by mbp at sourcefrog
 Add a simple DeprecatedDict class  | 
137  | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
138  | 
class Option(object):  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
139  | 
"""Description of a command line option  | 
140  | 
    
 | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
141  | 
    :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  | 
142  | 
    Otherwise None.
 | 
143  | 
    """
 | 
|
144  | 
||
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
145  | 
    # The dictionary of standard options. These are always legal.
 | 
146  | 
STD_OPTIONS = {}  | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
147  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
148  | 
    # The dictionary of commonly used options. these are only legal
 | 
149  | 
    # if a command explicitly references them by name in the list
 | 
|
150  | 
    # of supported options.
 | 
|
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
151  | 
OPTIONS = {}  | 
152  | 
||
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
153  | 
def __init__(self, name, help='', type=None, argname=None,  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
154  | 
short_name=None, param_name=None, custom_callback=None):  | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
155  | 
"""Make a new command option.  | 
156  | 
||
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
157  | 
        :param name: regular name of the command, used in the double-dash
 | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
158  | 
            form and also as the parameter to the command's run() 
 | 
| 
2745.4.2
by Lukáš Lalinsky
 Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.  | 
159  | 
            method (unless param_name is specified).
 | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
160  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
161  | 
        :param help: help message displayed in command help
 | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
162  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
163  | 
        :param type: function called to parse the option argument, or 
 | 
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
164  | 
            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  | 
165  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
166  | 
        :param argname: name of option argument, if any
 | 
167  | 
||
168  | 
        :param short_name: short option code for use with a single -, e.g.
 | 
|
169  | 
            short_name="v" to enable parsing of -v.
 | 
|
170  | 
||
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
171  | 
        :param param_name: name of the parameter which will be passed to
 | 
| 
2745.4.2
by Lukáš Lalinsky
 Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.  | 
172  | 
            the command's run() method.
 | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
173  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
174  | 
        :param custom_callback: a callback routine to be called after normal
 | 
| 
2768.1.11
by Ian Clatworthy
 Add new option tests for custom help, callbacks and verbose/quiet linkage  | 
175  | 
            processing. The signature of the callback routine is
 | 
176  | 
            (option, name, new_value, parser).
 | 
|
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
177  | 
        """
 | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
178  | 
self.name = name  | 
179  | 
self.help = help  | 
|
180  | 
self.type = type  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
181  | 
self._short_name = short_name  | 
| 
1185.16.48
by mbp at sourcefrog
 - more refactoring of and tests for option parsing  | 
182  | 
if type is None:  | 
183  | 
assert argname is None  | 
|
184  | 
elif argname is None:  | 
|
185  | 
argname = 'ARG'  | 
|
186  | 
self.argname = argname  | 
|
| 
2745.4.2
by Lukáš Lalinsky
 Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.  | 
187  | 
if param_name is None:  | 
188  | 
self._param_name = self.name  | 
|
189  | 
else:  | 
|
190  | 
self._param_name = param_name  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
191  | 
self.custom_callback = custom_callback  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
192  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
193  | 
def short_name(self):  | 
| 
2227.1.3
by mbp at sourcefrog
 Restore access to SHORT_OPTIONS for compatibility  | 
194  | 
if self._short_name:  | 
195  | 
return self._short_name  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
196  | 
|
| 
2227.1.4
by mbp at sourcefrog
 add test that legacy SHORT_OPTIONS really works, and set_short_name  | 
197  | 
def set_short_name(self, short_name):  | 
198  | 
self._short_name = short_name  | 
|
199  | 
||
| 
1857.1.9
by Aaron Bentley
 Add hidden negation options  | 
200  | 
def get_negation_name(self):  | 
201  | 
if self.name.startswith('no-'):  | 
|
202  | 
return self.name[3:]  | 
|
203  | 
else:  | 
|
204  | 
return 'no-' + self.name  | 
|
205  | 
||
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
206  | 
def add_option(self, parser, short_name):  | 
207  | 
"""Add this option to an Optparse parser"""  | 
|
208  | 
option_strings = ['--%s' % self.name]  | 
|
209  | 
if short_name is not None:  | 
|
210  | 
option_strings.append('-%s' % short_name)  | 
|
211  | 
optargfn = self.type  | 
|
212  | 
if optargfn is None:  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
213  | 
parser.add_option(action='callback',  | 
214  | 
callback=self._optparse_bool_callback,  | 
|
215  | 
callback_args=(True,),  | 
|
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
216  | 
help=self.help,  | 
217  | 
*option_strings)  | 
|
| 
1857.1.9
by Aaron Bentley
 Add hidden negation options  | 
218  | 
negation_strings = ['--%s' % self.get_negation_name()]  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
219  | 
parser.add_option(action='callback',  | 
220  | 
callback=self._optparse_bool_callback,  | 
|
221  | 
callback_args=(False,),  | 
|
| 
1857.1.22
by Aaron Bentley
 Negations set value to False, instead of Optparser.DEFAULT_VALUE  | 
222  | 
help=optparse.SUPPRESS_HELP, *negation_strings)  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
223  | 
else:  | 
224  | 
parser.add_option(action='callback',  | 
|
225  | 
callback=self._optparse_callback,  | 
|
| 
1857.1.12
by Aaron Bentley
 Fix a bunch of test cases that assumed --merge-type or log-format  | 
226  | 
type='string', metavar=self.argname.upper(),  | 
| 
1857.1.4
by Aaron Bentley
 Set metavar according to option  | 
227  | 
help=self.help,  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
228  | 
default=OptionParser.DEFAULT_VALUE,  | 
229  | 
*option_strings)  | 
|
230  | 
||
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
231  | 
def _optparse_bool_callback(self, option, opt_str, value, parser, bool_v):  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
232  | 
setattr(parser.values, self._param_name, bool_v)  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
233  | 
if self.custom_callback is not None:  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
234  | 
self.custom_callback(option, self._param_name, bool_v, parser)  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
235  | 
|
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
236  | 
def _optparse_callback(self, option, opt, value, parser):  | 
| 
2768.1.11
by Ian Clatworthy
 Add new option tests for custom help, callbacks and verbose/quiet linkage  | 
237  | 
v = self.type(value)  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
238  | 
setattr(parser.values, self._param_name, v)  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
239  | 
if self.custom_callback is not None:  | 
| 
2768.1.11
by Ian Clatworthy
 Add new option tests for custom help, callbacks and verbose/quiet linkage  | 
240  | 
self.custom_callback(option, self.name, v, parser)  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
241  | 
|
| 
1857.1.14
by Aaron Bentley
 Fix man page generation  | 
242  | 
def iter_switches(self):  | 
243  | 
"""Iterate through the list of switches provided by the option  | 
|
244  | 
        
 | 
|
245  | 
        :return: an iterator of (name, short_name, argname, help)
 | 
|
246  | 
        """
 | 
|
247  | 
argname = self.argname  | 
|
248  | 
if argname is not None:  | 
|
249  | 
argname = argname.upper()  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
250  | 
yield self.name, self.short_name(), argname, self.help  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
251  | 
|
| 
1551.18.12
by Aaron Bentley
 Man page doesn't list hidden options (#131667)  | 
252  | 
def is_hidden(self, name):  | 
253  | 
return False  | 
|
254  | 
||
| 
1857.1.15
by Aaron Bentley
 Add tests for generating an option parser  | 
255  | 
|
| 
2376.4.1
by jml at canonical
 Blackbox-driven --fixes option to commit.  | 
256  | 
class ListOption(Option):  | 
| 
2376.4.22
by Jonathan Lange
 Variety of whitespace cleanups, tightening of tests and docstring changes in  | 
257  | 
"""Option used to provide a list of values.  | 
258  | 
||
259  | 
    On the command line, arguments are specified by a repeated use of the
 | 
|
260  | 
    option. '-' is a special argument that resets the list. For example,
 | 
|
261  | 
      --foo=a --foo=b
 | 
|
262  | 
    sets the value of the 'foo' option to ['a', 'b'], and
 | 
|
263  | 
      --foo=a --foo=b --foo=- --foo=c
 | 
|
264  | 
    sets the value of the 'foo' option to ['c'].
 | 
|
265  | 
    """
 | 
|
266  | 
||
| 
2376.4.1
by jml at canonical
 Blackbox-driven --fixes option to commit.  | 
267  | 
def add_option(self, parser, short_name):  | 
268  | 
"""Add this option to an Optparse parser."""  | 
|
269  | 
option_strings = ['--%s' % self.name]  | 
|
270  | 
if short_name is not None:  | 
|
271  | 
option_strings.append('-%s' % short_name)  | 
|
272  | 
parser.add_option(action='callback',  | 
|
273  | 
callback=self._optparse_callback,  | 
|
274  | 
type='string', metavar=self.argname.upper(),  | 
|
275  | 
help=self.help, default=[],  | 
|
276  | 
*option_strings)  | 
|
277  | 
||
278  | 
def _optparse_callback(self, option, opt, value, parser):  | 
|
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
279  | 
values = getattr(parser.values, self._param_name)  | 
| 
2376.4.11
by Jonathan Lange
 Provide a way of resetting list options (specifying '-' as the argument)  | 
280  | 
if value == '-':  | 
281  | 
del values[:]  | 
|
282  | 
else:  | 
|
283  | 
values.append(self.type(value))  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
284  | 
if self.custom_callback is not None:  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
285  | 
self.custom_callback(option, self._param_name, values, parser)  | 
| 
2376.4.1
by jml at canonical
 Blackbox-driven --fixes option to commit.  | 
286  | 
|
287  | 
||
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
288  | 
class RegistryOption(Option):  | 
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
289  | 
"""Option based on a registry  | 
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
290  | 
|
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
291  | 
    The values for the options correspond to entries in the registry.  Input
 | 
292  | 
    must be a registry key.  After validation, it is converted into an object
 | 
|
293  | 
    using Registry.get or a caller-provided converter.
 | 
|
294  | 
    """
 | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
295  | 
|
296  | 
def validate_value(self, value):  | 
|
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
297  | 
"""Validate a value name"""  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
298  | 
if value not in self.registry:  | 
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
299  | 
raise errors.BadOptionValue(self.name, value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
300  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
301  | 
def convert(self, value):  | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
302  | 
"""Convert a value name into an output type"""  | 
303  | 
self.validate_value(value)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
304  | 
if self.converter is None:  | 
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
305  | 
return self.registry.get(value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
306  | 
else:  | 
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
307  | 
return self.converter(value)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
308  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
309  | 
def __init__(self, name, help, registry, converter=None,  | 
| 
1551.12.18
by Aaron Bentley
 Allow RegistryOption to omit the value-taking option  | 
310  | 
value_switches=False, title=None, enum_switch=True):  | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
311  | 
"""  | 
312  | 
        Constructor.
 | 
|
313  | 
||
314  | 
        :param name: The option name.
 | 
|
315  | 
        :param help: Help for the option.
 | 
|
316  | 
        :param registry: A Registry containing the values
 | 
|
317  | 
        :param converter: Callable to invoke with the value name to produce
 | 
|
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
318  | 
            the value.  If not supplied, self.registry.get is used.
 | 
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
319  | 
        :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.  | 
320  | 
            own switch.  For example, instead of '--format knit',
 | 
321  | 
            '--knit' can be used interchangeably.
 | 
|
| 
1551.12.18
by Aaron Bentley
 Allow RegistryOption to omit the value-taking option  | 
322  | 
        :param enum_switch: If true, a switch is provided with the option name,
 | 
323  | 
            which takes a value.
 | 
|
| 
2221.4.3
by Aaron Bentley
 Add docstrings  | 
324  | 
        """
 | 
325  | 
Option.__init__(self, name, help, type=self.convert)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
326  | 
self.registry = registry  | 
327  | 
self.name = name  | 
|
328  | 
self.converter = converter  | 
|
| 
2221.4.2
by Aaron Bentley
 Implement RegistryOption on init  | 
329  | 
self.value_switches = value_switches  | 
| 
1551.12.18
by Aaron Bentley
 Allow RegistryOption to omit the value-taking option  | 
330  | 
self.enum_switch = enum_switch  | 
| 
2221.4.12
by Aaron Bentley
 Add option grouping to RegistryOption and clean up format options  | 
331  | 
self.title = title  | 
332  | 
if self.title is None:  | 
|
333  | 
self.title = name  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
334  | 
|
| 
1551.12.24
by Aaron Bentley
 Add RegistryOption.from_swargs to simplify simple registry options  | 
335  | 
    @staticmethod
 | 
336  | 
def from_kwargs(name_, help=None, title=None, value_switches=False,  | 
|
| 
1551.12.43
by Aaron Bentley
 Misc changes from review  | 
337  | 
enum_switch=True, **kwargs):  | 
| 
1551.12.24
by Aaron Bentley
 Add RegistryOption.from_swargs to simplify simple registry options  | 
338  | 
"""Convenience method to generate string-map registry options  | 
339  | 
||
340  | 
        name, help, value_switches and enum_switch are passed to the
 | 
|
341  | 
        RegistryOption constructor.  Any other keyword arguments are treated
 | 
|
342  | 
        as values for the option, and they value is treated as the help.
 | 
|
343  | 
        """
 | 
|
344  | 
reg = registry.Registry()  | 
|
| 
2681.1.5
by Aaron Bentley
 Display correct help message in from_kwargs  | 
345  | 
for name, switch_help in kwargs.iteritems():  | 
| 
1551.12.24
by Aaron Bentley
 Add RegistryOption.from_swargs to simplify simple registry options  | 
346  | 
name = name.replace('_', '-')  | 
| 
2681.1.5
by Aaron Bentley
 Display correct help message in from_kwargs  | 
347  | 
reg.register(name, name, help=switch_help)  | 
| 
1551.12.24
by Aaron Bentley
 Add RegistryOption.from_swargs to simplify simple registry options  | 
348  | 
return RegistryOption(name_, help, reg, title=title,  | 
349  | 
value_switches=value_switches, enum_switch=enum_switch)  | 
|
350  | 
||
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
351  | 
def add_option(self, parser, short_name):  | 
352  | 
"""Add this option to an Optparse parser"""  | 
|
| 
2221.4.12
by Aaron Bentley
 Add option grouping to RegistryOption and clean up format options  | 
353  | 
if self.value_switches:  | 
354  | 
parser = parser.add_option_group(self.title)  | 
|
| 
1551.12.18
by Aaron Bentley
 Allow RegistryOption to omit the value-taking option  | 
355  | 
if self.enum_switch:  | 
356  | 
Option.add_option(self, parser, short_name)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
357  | 
if self.value_switches:  | 
358  | 
for key in self.registry.keys():  | 
|
359  | 
option_strings = ['--%s' % key]  | 
|
| 
1551.18.12
by Aaron Bentley
 Man page doesn't list hidden options (#131667)  | 
360  | 
if self.is_hidden(key):  | 
| 
1551.13.2
by Aaron Bentley
 Hide dirstate-with-subtree format  | 
361  | 
help = optparse.SUPPRESS_HELP  | 
362  | 
else:  | 
|
363  | 
help = self.registry.get_help(key)  | 
|
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
364  | 
parser.add_option(action='callback',  | 
365  | 
callback=self._optparse_value_callback(key),  | 
|
| 
1551.13.2
by Aaron Bentley
 Hide dirstate-with-subtree format  | 
366  | 
help=help,  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
367  | 
*option_strings)  | 
368  | 
||
369  | 
def _optparse_value_callback(self, cb_value):  | 
|
370  | 
def cb(option, opt, value, parser):  | 
|
| 
2768.1.11
by Ian Clatworthy
 Add new option tests for custom help, callbacks and verbose/quiet linkage  | 
371  | 
v = self.type(cb_value)  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
372  | 
setattr(parser.values, self._param_name, v)  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
373  | 
if self.custom_callback is not None:  | 
| 
2768.1.15
by Ian Clatworthy
 Merge bzr.dev  | 
374  | 
self.custom_callback(option, self._param_name, v, parser)  | 
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
375  | 
return cb  | 
376  | 
||
| 
2221.4.4
by Aaron Bentley
 Fix iter_switches behavior when value_switches is true  | 
377  | 
def iter_switches(self):  | 
378  | 
"""Iterate through the list of switches provided by the option  | 
|
| 
2221.4.9
by Aaron Bentley
 Zap trailing whitespace  | 
379  | 
|
| 
2221.4.4
by Aaron Bentley
 Fix iter_switches behavior when value_switches is true  | 
380  | 
        :return: an iterator of (name, short_name, argname, help)
 | 
381  | 
        """
 | 
|
382  | 
for value in Option.iter_switches(self):  | 
|
383  | 
yield value  | 
|
384  | 
if self.value_switches:  | 
|
385  | 
for key in sorted(self.registry.keys()):  | 
|
386  | 
yield key, None, None, self.registry.get_help(key)  | 
|
| 
2221.4.1
by Aaron Bentley
 Get registry options working  | 
387  | 
|
| 
1551.18.12
by Aaron Bentley
 Man page doesn't list hidden options (#131667)  | 
388  | 
def is_hidden(self, name):  | 
389  | 
if name == self.name:  | 
|
390  | 
return Option.is_hidden(self, name)  | 
|
391  | 
return getattr(self.registry.get_info(name), 'hidden', False)  | 
|
392  | 
||
| 
2221.4.6
by Aaron Bentley
 Improve text and naming  | 
393  | 
|
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
394  | 
class OptionParser(optparse.OptionParser):  | 
395  | 
"""OptionParser that raises exceptions instead of exiting"""  | 
|
396  | 
||
| 
1857.1.6
by Aaron Bentley
 Make the DEFAULT_VALUE an object instance  | 
397  | 
DEFAULT_VALUE = object()  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
398  | 
|
399  | 
def error(self, message):  | 
|
| 
1996.3.28
by John Arbash Meinel
 lazy import revisionspec and errors for bzrlib.options  | 
400  | 
raise errors.BzrCommandError(message)  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
401  | 
|
402  | 
||
403  | 
def get_optparser(options):  | 
|
404  | 
"""Generate an optparse parser for bzrlib-style options"""  | 
|
405  | 
||
406  | 
parser = OptionParser()  | 
|
407  | 
parser.remove_option('--help')  | 
|
408  | 
for option in options.itervalues():  | 
|
| 
2227.1.1
by mbp at sourcefrog
 Back out previous incompatible change: Option.short_name is now again  | 
409  | 
option.add_option(parser, option.short_name())  | 
| 
1857.1.3
by Aaron Bentley
 Make option adding depend on Option type  | 
410  | 
return parser  | 
411  | 
||
| 
1185.16.45
by Martin Pool
 - refactor handling of short option names  | 
412  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
413  | 
def custom_help(name, help):  | 
414  | 
"""Clone a common option overriding the help."""  | 
|
415  | 
import copy  | 
|
416  | 
o = copy.copy(Option.OPTIONS[name])  | 
|
417  | 
o.help = help  | 
|
418  | 
return o  | 
|
419  | 
||
420  | 
||
421  | 
def _standard_option(name, **kwargs):  | 
|
422  | 
"""Register a standard option."""  | 
|
423  | 
    # All standard options are implicitly 'global' ones
 | 
|
424  | 
Option.STD_OPTIONS[name] = Option(name, **kwargs)  | 
|
425  | 
Option.OPTIONS[name] = Option.STD_OPTIONS[name]  | 
|
426  | 
||
427  | 
||
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
428  | 
def _global_option(name, **kwargs):  | 
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
429  | 
"""Register a global option."""  | 
| 
1185.16.41
by Martin Pool
 [patch] define cli options as objects, not strings  | 
430  | 
Option.OPTIONS[name] = Option(name, **kwargs)  | 
431  | 
||
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
432  | 
|
433  | 
def _global_registry_option(name, help, registry, **kwargs):  | 
|
434  | 
Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)  | 
|
435  | 
||
| 
2221.4.17
by Aaron Bentley
 PEP8-ness  | 
436  | 
|
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
437  | 
class MergeTypeRegistry(registry.Registry):  | 
438  | 
||
439  | 
    pass
 | 
|
440  | 
||
| 
2221.4.17
by Aaron Bentley
 PEP8-ness  | 
441  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
442  | 
# This is the verbosity level detected during command line parsing.
 | 
443  | 
# Note that the final value is dependent on the order in which the
 | 
|
444  | 
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
 | 
|
445  | 
# The final value will be one of the following:
 | 
|
446  | 
#
 | 
|
447  | 
# * -ve for quiet
 | 
|
448  | 
# * 0 for normal
 | 
|
449  | 
# * +ve for verbose
 | 
|
450  | 
_verbosity_level = 0  | 
|
451  | 
||
452  | 
||
453  | 
def _verbosity_level_callback(option, opt_str, value, parser):  | 
|
454  | 
global _verbosity_level  | 
|
455  | 
if not value:  | 
|
456  | 
        # Either --no-verbose or --no-quiet was specified
 | 
|
457  | 
_verbosity_level = 0  | 
|
458  | 
elif opt_str == "verbose":  | 
|
459  | 
if _verbosity_level > 0:  | 
|
460  | 
_verbosity_level += 1  | 
|
461  | 
else:  | 
|
462  | 
_verbosity_level = 1  | 
|
463  | 
else:  | 
|
464  | 
if _verbosity_level < 0:  | 
|
465  | 
_verbosity_level -= 1  | 
|
466  | 
else:  | 
|
467  | 
_verbosity_level = -1  | 
|
468  | 
||
469  | 
||
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
470  | 
_merge_type_registry = MergeTypeRegistry()  | 
471  | 
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',  | 
|
472  | 
"Native diff3-style merge")  | 
|
473  | 
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',  | 
|
474  | 
"Merge using external diff3")  | 
|
475  | 
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',  | 
|
476  | 
"Weave-based merge")  | 
|
| 
3144.3.1
by Aaron Bentley
 Implement LCA merge, with problematic conflict markers  | 
477  | 
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',  | 
478  | 
"LCA-newness merge")  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
479  | 
|
| 
2768.1.3
by Ian Clatworthy
 Support custom help for commonly used options and standard option definition  | 
480  | 
# Declare the standard options
 | 
481  | 
_standard_option('help', short_name='h',  | 
|
482  | 
help='Show help message.')  | 
|
483  | 
_standard_option('verbose', short_name='v',  | 
|
484  | 
help='Display more information.',  | 
|
485  | 
custom_callback=_verbosity_level_callback)  | 
|
486  | 
_standard_option('quiet', short_name='q',  | 
|
487  | 
help="Only display errors and warnings.",  | 
|
488  | 
custom_callback=_verbosity_level_callback)  | 
|
489  | 
||
490  | 
# Declare commonly used options
 | 
|
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
491  | 
_global_option('all')  | 
| 
1185.12.92
by Aaron Bentley
 Fixed pull help, renamed clobber to overwrite  | 
492  | 
_global_option('overwrite', help='Ignore differences between branches and '  | 
| 
2598.1.1
by Martin Pool
 Add test for and documentation of option style, fix up existing options to comply  | 
493  | 
'overwrite unconditionally.')  | 
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
494  | 
_global_option('basis', type=str)  | 
495  | 
_global_option('bound')  | 
|
496  | 
_global_option('diff-options', type=str)  | 
|
497  | 
_global_option('file', type=unicode, short_name='F')  | 
|
498  | 
_global_option('force')  | 
|
499  | 
_global_option('format', type=unicode)  | 
|
500  | 
_global_option('forward')  | 
|
501  | 
_global_option('message', type=unicode,  | 
|
502  | 
short_name='m',  | 
|
503  | 
help='Message string.')  | 
|
504  | 
_global_option('no-recurse')  | 
|
505  | 
_global_option('profile',  | 
|
506  | 
help='Show performance profiling information.')  | 
|
| 
2204.2.1
by Wouter van Heyst
 Fix merge conflicts.  | 
507  | 
_global_option('revision',  | 
| 
2190.2.1
by Martin Pool
 remove global registration of short options  | 
508  | 
type=_parse_revision_str,  | 
| 
2204.2.1
by Wouter van Heyst
 Fix merge conflicts.  | 
509  | 
short_name='r',  | 
| 
2745.4.4
by Lukáš Lalinsky
 - Make the description of --change more general  | 
510  | 
help='See "help revisionspec" for details.')  | 
| 
2745.4.1
by Lukáš Lalinsky
 New option -C/--change for diff and status to show changes in one revision. (#56299)  | 
511  | 
_global_option('change',  | 
512  | 
type=_parse_change_str,  | 
|
| 
2745.4.3
by Lukáš Lalinsky
 Change -C to -c.  | 
513  | 
short_name='c',  | 
| 
2745.4.2
by Lukáš Lalinsky
 Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.  | 
514  | 
param_name='revision',  | 
| 
2745.4.4
by Lukáš Lalinsky
 - Make the description of --change more general  | 
515  | 
help='Select changes introduced by the specified revision. See also "help revisionspec".')  | 
| 
2598.1.1
by Martin Pool
 Add test for and documentation of option style, fix up existing options to comply  | 
516  | 
_global_option('show-ids',  | 
517  | 
help='Show internal object ids.')  | 
|
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
518  | 
_global_option('timezone',  | 
519  | 
type=str,  | 
|
520  | 
help='display timezone as local, original, or utc')  | 
|
521  | 
_global_option('unbound')  | 
|
522  | 
_global_option('version')  | 
|
523  | 
_global_option('email')  | 
|
524  | 
_global_option('update')  | 
|
| 
2598.1.1
by Martin Pool
 Add test for and documentation of option style, fix up existing options to comply  | 
525  | 
_global_registry_option('log-format', "Use specified log format.",  | 
| 
2221.4.13
by Aaron Bentley
 Add title to log format option section  | 
526  | 
log.log_formatter_registry, value_switches=True,  | 
527  | 
title='Log format')  | 
|
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
528  | 
_global_option('long', help='Use detailed log format. Same as --log-format long',  | 
529  | 
short_name='l')  | 
|
530  | 
_global_option('short', help='Use moderately short log format. Same as --log-format short')  | 
|
531  | 
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')  | 
|
532  | 
_global_option('root', type=str)  | 
|
533  | 
_global_option('no-backup')  | 
|
| 
2598.1.1
by Martin Pool
 Add test for and documentation of option style, fix up existing options to comply  | 
534  | 
_global_registry_option('merge-type', 'Select a particular merge algorithm.',  | 
| 
2221.4.15
by Aaron Bentley
 Use RegistryOption for merge type  | 
535  | 
_merge_type_registry, value_switches=True,  | 
536  | 
title='Merge algorithm')  | 
|
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
537  | 
_global_option('pattern', type=str)  | 
| 
1185.12.92
by Aaron Bentley
 Fixed pull help, renamed clobber to overwrite  | 
538  | 
_global_option('remember', help='Remember the specified location as a'  | 
539  | 
' default.')  | 
|
| 
2598.1.1
by Martin Pool
 Add test for and documentation of option style, fix up existing options to comply  | 
540  | 
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')  | 
| 
2598.1.14
by Martin Pool
 Revert tightening of options api - breaks too many plugins  | 
541  | 
_global_option('kind', type=str)  | 
542  | 
_global_option('dry-run',  | 
|
543  | 
help="Show what would be done, but don't actually do anything.")  | 
|
544  | 
_global_option('name-from-revision', help='The path name in the old tree.')  |