← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
2555
2555
class RegistryOption(Option):
2556
2556
    """Option for a choice from a registry."""
2557
2557
 
2558
 
    def __init__(self, name, registry, default=None, default_from_env=None,
 
2558
    def __init__(self, name, registry, default_from_env=None,
2559
2559
                 help=None, invalid=None):
2560
2560
        """A registry based Option definition.
2561
2561
 
2563
2563
        can take quoting into account.
2564
2564
        """
2565
2565
        super(RegistryOption, self).__init__(
2566
 
            name, default=default, default_from_env=default_from_env,
 
2566
            name, default=lambda: unicode(registry.default_key),
 
2567
            default_from_env=default_from_env,
2567
2568
            from_unicode=self.from_unicode, help=help,
2568
2569
            invalid=invalid, unquote=False)
2569
2570
        self.registry = registry
2906
2907
option_registry.register(
2907
2908
    Option('submit_to',
2908
2909
           help='''Where submissions from this branch are mailed to.'''))
2909
 
 
 
2910
option_registry.register(
 
2911
    ListOption('suppress_warnings',
 
2912
           default=[],
 
2913
           help="List of warning classes to suppress."))
 
2914
option_registry.register(
 
2915
    Option('validate_signatures_in_log', default=False,
 
2916
           from_unicode=bool_from_store, invalid='warning',
 
2917
           help='''Whether to validate signatures in bzr log.'''))
2910
2918
option_registry.register_lazy('ssl.ca_certs',
2911
2919
    'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')
2912
2920