← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

(jelmer) Fix bug #1010339,
 use encoding_type='exact' for bzr testament (John A Meinel)

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
 
from __future__ import absolute_import
21
 
 
22
20
import optparse
23
21
import re
24
22
 
27
25
from bzrlib import (
28
26
    errors,
29
27
    revisionspec,
30
 
    i18n,
31
28
    )
32
29
""")
33
30
 
334
331
        :param short_name: The short name for the enum switch, if any
335
332
        :param short_value_switches: A dict mapping values to short names
336
333
        """
337
 
        Option.__init__(self, name, help, type=self.convert,
338
 
                        short_name=short_name)
 
334
        Option.__init__(self, name, help, type=self.convert, short_name=short_name)
339
335
        self._registry = registry
340
336
        if registry is None:
341
337
            if lazy_registry is None:
433
429
 
434
430
    DEFAULT_VALUE = object()
435
431
 
436
 
    def __init__(self):
437
 
        optparse.OptionParser.__init__(self)
438
 
        self.formatter = GettextIndentedHelpFormatter()
439
 
 
440
432
    def error(self, message):
441
433
        raise errors.BzrCommandError(message)
442
434
 
443
435
 
444
 
class GettextIndentedHelpFormatter(optparse.IndentedHelpFormatter):
445
 
    """Adds gettext() call to format_option()"""
446
 
    def __init__(self):
447
 
        optparse.IndentedHelpFormatter.__init__(self)
448
 
 
449
 
    def format_option(self, option):
450
 
        """code taken from Python's optparse.py"""
451
 
        if option.help:
452
 
            option.help = i18n.gettext(option.help)
453
 
        return optparse.IndentedHelpFormatter.format_option(self, option)
454
 
 
455
 
 
456
436
def get_optparser(options):
457
437
    """Generate an optparse parser for bzrlib-style options"""
458
438
 
477
457
    Option.STD_OPTIONS[name] = Option(name, **kwargs)
478
458
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
479
459
 
480
 
def _standard_list_option(name, **kwargs):
481
 
    """Register a standard option."""
482
 
    # All standard options are implicitly 'global' ones
483
 
    Option.STD_OPTIONS[name] = ListOption(name, **kwargs)
484
 
    Option.OPTIONS[name] = Option.STD_OPTIONS[name]
485
 
 
486
460
 
487
461
def _global_option(name, **kwargs):
488
462
    """Register a global option."""
521
495
            _verbosity_level = -1
522
496
 
523
497
 
 
498
class MergeTypeRegistry(_mod_registry.Registry):
 
499
 
 
500
    pass
 
501
 
 
502
 
 
503
_merge_type_registry = MergeTypeRegistry()
 
504
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
 
505
                                   "Native diff3-style merge")
 
506
_merge_type_registry.register_lazy('diff3', 'bzrlib.merge', 'Diff3Merger',
 
507
                                   "Merge using external diff3")
 
508
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
 
509
                                   "Weave-based merge")
 
510
_merge_type_registry.register_lazy('lca', 'bzrlib.merge', 'LCAMerger',
 
511
                                   "LCA-newness merge")
 
512
 
524
513
# Declare the standard options
525
514
_standard_option('help', short_name='h',
526
515
                 help='Show help message.')
527
 
_standard_option('quiet', short_name='q',
528
 
                 help="Only display errors and warnings.",
529
 
                 custom_callback=_verbosity_level_callback)
530
516
_standard_option('usage',
531
517
                 help='Show usage message and options.')
532
518
_standard_option('verbose', short_name='v',
533
519
                 help='Display more information.',
534
520
                 custom_callback=_verbosity_level_callback)
 
521
_standard_option('quiet', short_name='q',
 
522
                 help="Only display errors and warnings.",
 
523
                 custom_callback=_verbosity_level_callback)
535
524
 
536
525
# Declare commonly used options
537
 
_global_option('change',
538
 
               type=_parse_change_str,
539
 
               short_name='c',
540
 
               param_name='revision',
541
 
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
542
 
_global_option('directory', short_name='d', type=unicode,
543
 
               help='Branch to operate on, instead of working directory.')
 
526
_global_option('all')
 
527
_global_option('overwrite', help='Ignore differences between branches and '
 
528
               'overwrite unconditionally.')
 
529
_global_option('basis', type=str)
 
530
_global_option('bound')
 
531
_global_option('diff-options', type=str)
544
532
_global_option('file', type=unicode, short_name='F')
545
 
_global_registry_option('log-format', "Use specified log format.",
546
 
                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),
547
 
                        value_switches=True, title='Log format',
548
 
                        short_value_switches={'short': 'S'})
549
 
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
550
 
                        lazy_registry=('bzrlib.merge', 'merge_type_registry'),
551
 
                        value_switches=True, title='Merge algorithm')
 
533
_global_option('force')
 
534
_global_option('format', type=unicode)
 
535
_global_option('forward')
552
536
_global_option('message', type=unicode,
553
537
               short_name='m',
554
538
               help='Message string.')
 
539
_global_option('no-recurse')
555
540
_global_option('null', short_name='0',
556
541
                 help='Use an ASCII NUL (\\0) separator rather than '
557
542
                      'a newline.')
558
 
_global_option('overwrite', help='Ignore differences between branches and '
559
 
               'overwrite unconditionally.')
560
 
_global_option('remember', help='Remember the specified location as a'
561
 
               ' default.')
562
 
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
 
543
_global_option('profile',
 
544
               help='Show performance profiling information.')
563
545
_global_option('revision',
564
546
               type=_parse_revision_str,
565
547
               short_name='r',
566
548
               help='See "help revisionspec" for details.')
 
549
_global_option('change',
 
550
               type=_parse_change_str,
 
551
               short_name='c',
 
552
               param_name='revision',
 
553
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
567
554
_global_option('show-ids',
568
555
               help='Show internal object ids.')
569
556
_global_option('timezone',
570
557
               type=str,
571
558
               help='Display timezone as local, original, or utc.')
 
559
_global_option('unbound')
 
560
_global_option('version')
 
561
_global_option('email')
 
562
_global_option('update')
 
563
_global_registry_option('log-format', "Use specified log format.",
 
564
                        lazy_registry=('bzrlib.log', 'log_formatter_registry'),
 
565
                        value_switches=True, title='Log format',
 
566
                        short_value_switches={'short': 'S'})
 
567
_global_option('long', help='Use detailed log format. Same as --log-format long',
 
568
               short_name='l')
 
569
_global_option('short', help='Use moderately short log format. Same as --log-format short')
 
570
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
 
571
_global_option('root', type=str)
 
572
_global_option('no-backup')
 
573
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
 
574
                        _merge_type_registry, value_switches=True,
 
575
                        title='Merge algorithm')
 
576
_global_option('pattern', type=str)
 
577
_global_option('remember', help='Remember the specified location as a'
 
578
               ' default.')
 
579
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
 
580
_global_option('kind', type=str)
 
581
_global_option('dry-run',
 
582
               help="Show what would be done, but don't actually do anything.")
 
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')
572
586
 
573
587
diff_writer_registry = _mod_registry.Registry()
574
588
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')