← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-09 13:30:12 UTC
  • mfrom: (5609.48.11 2.3)
  • mto: (6015.33.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: v.ladeuil+lp@free.fr-20110909133012-jc1d1zyqgak57123
Merge 2.3 into 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
1
 
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
40
40
    each revision specifier supplied.
41
41
 
42
42
    >>> _parse_revision_str('234')
43
 
    [<RevisionSpec_revno 234>]
 
43
    [<RevisionSpec_dwim 234>]
44
44
    >>> _parse_revision_str('234..567')
45
 
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 567>]
 
45
    [<RevisionSpec_dwim 234>, <RevisionSpec_dwim 567>]
46
46
    >>> _parse_revision_str('..')
47
47
    [<RevisionSpec None>, <RevisionSpec None>]
48
48
    >>> _parse_revision_str('..234')
49
 
    [<RevisionSpec None>, <RevisionSpec_revno 234>]
 
49
    [<RevisionSpec None>, <RevisionSpec_dwim 234>]
50
50
    >>> _parse_revision_str('234..')
51
 
    [<RevisionSpec_revno 234>, <RevisionSpec None>]
 
51
    [<RevisionSpec_dwim 234>, <RevisionSpec None>]
52
52
    >>> _parse_revision_str('234..456..789') # Maybe this should be an error
53
 
    [<RevisionSpec_revno 234>, <RevisionSpec_revno 456>, <RevisionSpec_revno 789>]
 
53
    [<RevisionSpec_dwim 234>, <RevisionSpec_dwim 456>, <RevisionSpec_dwim 789>]
54
54
    >>> _parse_revision_str('234....789') #Error ?
55
 
    [<RevisionSpec_revno 234>, <RevisionSpec None>, <RevisionSpec_revno 789>]
 
55
    [<RevisionSpec_dwim 234>, <RevisionSpec None>, <RevisionSpec_dwim 789>]
56
56
    >>> _parse_revision_str('revid:test@other.com-234234')
57
57
    [<RevisionSpec_revid revid:test@other.com-234234>]
58
58
    >>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')
59
59
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revid revid:test@other.com-234235>]
60
60
    >>> _parse_revision_str('revid:test@other.com-234234..23')
61
 
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_revno 23>]
 
61
    [<RevisionSpec_revid revid:test@other.com-234234>, <RevisionSpec_dwim 23>]
62
62
    >>> _parse_revision_str('date:2005-04-12')
63
63
    [<RevisionSpec_date date:2005-04-12>]
64
64
    >>> _parse_revision_str('date:2005-04-12 12:24:33')
68
68
    >>> _parse_revision_str('date:2005-04-12,12:24:33')
69
69
    [<RevisionSpec_date date:2005-04-12,12:24:33>]
70
70
    >>> _parse_revision_str('-5..23')
71
 
    [<RevisionSpec_revno -5>, <RevisionSpec_revno 23>]
 
71
    [<RevisionSpec_dwim -5>, <RevisionSpec_dwim 23>]
72
72
    >>> _parse_revision_str('-5')
73
 
    [<RevisionSpec_revno -5>]
 
73
    [<RevisionSpec_dwim -5>]
74
74
    >>> _parse_revision_str('123a')
75
 
    Traceback (most recent call last):
76
 
      ...
77
 
    NoSuchRevisionSpec: No namespace registered for string: '123a'
 
75
    [<RevisionSpec_dwim 123a>]
78
76
    >>> _parse_revision_str('abc')
79
 
    Traceback (most recent call last):
80
 
      ...
81
 
    NoSuchRevisionSpec: No namespace registered for string: 'abc'
 
77
    [<RevisionSpec_dwim abc>]
82
78
    >>> _parse_revision_str('branch:../branch2')
83
79
    [<RevisionSpec_branch branch:../branch2>]
84
80
    >>> _parse_revision_str('branch:../../branch2')
85
81
    [<RevisionSpec_branch branch:../../branch2>]
86
82
    >>> _parse_revision_str('branch:../../branch2..23')
87
 
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_revno 23>]
 
83
    [<RevisionSpec_branch branch:../../branch2>, <RevisionSpec_dwim 23>]
88
84
    >>> _parse_revision_str('branch:..\\\\branch2')
89
85
    [<RevisionSpec_branch branch:..\\branch2>]
90
86
    >>> _parse_revision_str('branch:..\\\\..\\\\branch2..23')
91
 
    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_revno 23>]
 
87
    [<RevisionSpec_branch branch:..\\..\\branch2>, <RevisionSpec_dwim 23>]
92
88
    """
93
89
    # TODO: Maybe move this into revisionspec.py
94
90
    revs = []
104
100
    parent of the revision.
105
101
 
106
102
    >>> _parse_change_str('123')
107
 
    (<RevisionSpec_before before:123>, <RevisionSpec_revno 123>)
 
103
    (<RevisionSpec_before before:123>, <RevisionSpec_dwim 123>)
108
104
    >>> _parse_change_str('123..124')
109
105
    Traceback (most recent call last):
110
106
      ...
280
276
        parser.add_option(action='callback',
281
277
                          callback=self._optparse_callback,
282
278
                          type='string', metavar=self.argname.upper(),
283
 
                          help=self.help, default=[],
 
279
                          help=self.help, dest=self._param_name, default=[],
284
280
                          *option_strings)
285
281
 
286
282
    def _optparse_callback(self, option, opt, value, parser):
316
312
 
317
313
    def __init__(self, name, help, registry=None, converter=None,
318
314
        value_switches=False, title=None, enum_switch=True,
319
 
        lazy_registry=None):
 
315
        lazy_registry=None, short_name=None, short_value_switches=None):
320
316
        """
321
317
        Constructor.
322
318
 
332
328
            which takes a value.
333
329
        :param lazy_registry: A tuple of (module name, attribute name) for a
334
330
            registry to be lazily loaded.
 
331
        :param short_name: The short name for the enum switch, if any
 
332
        :param short_value_switches: A dict mapping values to short names
335
333
        """
336
 
        Option.__init__(self, name, help, type=self.convert)
 
334
        Option.__init__(self, name, help, type=self.convert, short_name=short_name)
337
335
        self._registry = registry
338
336
        if registry is None:
339
337
            if lazy_registry is None:
348
346
        self.converter = converter
349
347
        self.value_switches = value_switches
350
348
        self.enum_switch = enum_switch
 
349
        self.short_value_switches = short_value_switches
351
350
        self.title = title
352
351
        if self.title is None:
353
352
            self.title = name
365
364
 
366
365
        name, help, value_switches and enum_switch are passed to the
367
366
        RegistryOption constructor.  Any other keyword arguments are treated
368
 
        as values for the option, and they value is treated as the help.
 
367
        as values for the option, and their value is treated as the help.
369
368
        """
370
369
        reg = _mod_registry.Registry()
371
 
        for name, switch_help in kwargs.iteritems():
 
370
        for name, switch_help in sorted(kwargs.items()):
372
371
            name = name.replace('_', '-')
373
372
            reg.register(name, name, help=switch_help)
374
373
            if not value_switches:
391
390
                    help = optparse.SUPPRESS_HELP
392
391
                else:
393
392
                    help = self.registry.get_help(key)
 
393
                if (self.short_value_switches and
 
394
                    key in self.short_value_switches):
 
395
                    option_strings.append('-%s' %
 
396
                                          self.short_value_switches[key])
394
397
                parser.add_option(action='callback',
395
398
                              callback=self._optparse_value_callback(key),
396
399
                                  help=help,
534
537
               short_name='m',
535
538
               help='Message string.')
536
539
_global_option('no-recurse')
 
540
_global_option('null', short_name='0',
 
541
                 help='Use an ASCII NUL (\\0) separator rather than '
 
542
                      'a newline.')
537
543
_global_option('profile',
538
544
               help='Show performance profiling information.')
539
545
_global_option('revision',
556
562
_global_option('update')
557
563
_global_registry_option('log-format', "Use specified log format.",
558
564
                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),
559
 
                        value_switches=True, title='Log format')
 
565
                        value_switches=True, title='Log format',
 
566
                        short_value_switches={'short': 'S'})
560
567
_global_option('long', help='Use detailed log format. Same as --log-format long',
561
568
               short_name='l')
562
569
_global_option('short', help='Use moderately short log format. Same as --log-format short')
574
581
_global_option('dry-run',
575
582
               help="Show what would be done, but don't actually do anything.")
576
583
_global_option('name-from-revision', help='The path name in the old tree.')
 
584
_global_option('directory', short_name='d', type=unicode,
 
585
               help='Branch to operate on, instead of working directory')
577
586
 
578
587
diff_writer_registry = _mod_registry.Registry()
579
588
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')