← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-15 21:00:20 UTC
  • mfrom: (3113.5.1 test.174055)
  • Revision ID: pqm@pqm.ubuntu.com-20071215210020-m28kk1qmbcc9n6qs
(bialix) XFAIL test for #174055: can't run bzr info while dirstate
 is locked

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
17
17
# TODO: For things like --diff-prefix, we want a way to customize the display
18
18
# of the option argument.
19
19
 
20
 
import optparse
21
20
import re
22
21
 
23
22
from bzrlib.lazy_import import lazy_import
24
23
lazy_import(globals(), """
 
24
import optparse
 
25
 
25
26
from bzrlib import (
26
27
    errors,
 
28
    log,
 
29
    registry,
27
30
    revisionspec,
 
31
    symbol_versioning,
28
32
    )
29
33
""")
 
34
from bzrlib.trace import warning
30
35
 
31
 
from bzrlib import (
32
 
    log,
33
 
    registry,
34
 
    )
35
36
 
36
37
def _parse_revision_str(revstr):
37
38
    """This handles a revision string -> revno.
179
180
        self.type = type
180
181
        self._short_name = short_name
181
182
        if type is None:
182
 
            if argname:
183
 
                raise ValueError('argname not valid for booleans')
 
183
            assert argname is None
184
184
        elif argname is None:
185
185
            argname = 'ARG'
186
186
        self.argname = argname
345
345
        for name, switch_help in kwargs.iteritems():
346
346
            name = name.replace('_', '-')
347
347
            reg.register(name, name, help=switch_help)
348
 
            if not value_switches:
349
 
                help = help + '  "' + name + '": ' + switch_help
350
 
                if not help.endswith("."):
351
 
                    help = help + "."
352
348
        return RegistryOption(name_, help, reg, title=title,
353
349
            value_switches=value_switches, enum_switch=enum_switch)
354
350
 
478
474
                                   "Merge using external diff3")
479
475
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
480
476
                                   "Weave-based merge")
481
 
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
482
 
                                   "LCA-newness merge")
483
477
 
484
478
# Declare the standard options
485
479
_standard_option('help', short_name='h',