Rev 6456: (jelmer) Migrate 'validate_signatures_in_log' to config stacks. (Jelmer in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6456 [merge]
revision-id: pqm at pqm.ubuntu.com-20120130131130-1hrkn77z7bcls6w9
parent: pqm at pqm.ubuntu.com-20120128175244-so96t76vjz017btm
parent: jelmer at samba.org-20120128175809-u4sf5hw6a25lgaqg
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-01-30 13:11:30 +0000
message:
  (jelmer) Migrate 'validate_signatures_in_log' to config stacks. (Jelmer
   Vernooij)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2012-01-28 12:47:17 +0000
+++ b/bzrlib/builtins.py	2012-01-28 17:58:09 +0000
@@ -2789,7 +2789,7 @@
             self.add_cleanup(b.lock_read().unlock)
             rev1, rev2 = _get_revision_range(revision, b, self.name())
 
-        if b.get_config().validate_signatures_in_log():
+        if b.get_config_stack().get('validate_signatures_in_log'):
             signatures = True
 
         if signatures:

=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-01-28 16:56:12 +0000
+++ b/bzrlib/config.py	2012-01-28 17:58:09 +0000
@@ -2909,6 +2909,10 @@
     ListOption('suppress_warnings',
            default=[],
            help="List of warning classes to suppress."))
+option_registry.register(
+    Option('validate_signatures_in_log', default=False,
+           from_unicode=bool_from_store, invalid='warning',
+           help='''Whether to validate signatures in bzr log.'''))
 option_registry.register_lazy('ssl.ca_certs',
     'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')