← 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: 2008-10-02 06:54:04 UTC
  • mfrom: (3755.1.2 various)
  • Revision ID: pqm@pqm.ubuntu.com-20081002065404-0sjc6vwukw26m5wo
(vila) Fix --verbose leaking into blackbox tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
456
456
    Option.OPTIONS[name] = RegistryOption(name, help, registry, **kwargs)
457
457
 
458
458
 
459
 
class MergeTypeRegistry(_mod_registry.Registry):
460
 
 
461
 
    pass
462
 
 
463
 
 
464
459
# This is the verbosity level detected during command line parsing.
465
460
# Note that the final value is dependent on the order in which the
466
461
# various flags (verbose, quiet, no-verbose, no-quiet) are given.
489
484
            _verbosity_level = -1
490
485
 
491
486
 
 
487
class MergeTypeRegistry(_mod_registry.Registry):
 
488
 
 
489
    pass
 
490
 
 
491
 
492
492
_merge_type_registry = MergeTypeRegistry()
493
493
_merge_type_registry.register_lazy('merge3', 'bzrlib.merge', 'Merge3Merger',
494
494
                                   "Native diff3-style merge")
537
537
               help='Select changes introduced by the specified revision. See also "help revisionspec".')
538
538
_global_option('show-ids',
539
539
               help='Show internal object ids.')
540
 
_global_option('timezone', 
 
540
_global_option('timezone',
541
541
               type=str,
542
 
               help='display timezone as local, original, or utc')
 
542
               help='Display timezone as local, original, or utc.')
543
543
_global_option('unbound')
544
544
_global_option('version')
545
545
_global_option('email')