Merge lp:~jelmer/bzr/config-validate-signatures-in-log into lp:bzr

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 6456
Proposed branch: lp:~jelmer/bzr/config-validate-signatures-in-log
Merge into: lp:bzr
Diff against target: 26 lines (+5/-1)
2 files modified
bzrlib/builtins.py (+1/-1)
bzrlib/config.py (+4/-0)
To merge this branch: bzr merge lp:~jelmer/bzr/config-validate-signatures-in-log
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+90581@code.launchpad.net

Commit message

Migrate 'validate_signatures_in_log' to config stacks.

Description of the change

Convert the 'validate_signatures_in_log' configuration option over to
using config stacks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2012-01-28 12:47:17 +0000
3+++ bzrlib/builtins.py 2012-01-28 18:06:24 +0000
4@@ -2789,7 +2789,7 @@
5 self.add_cleanup(b.lock_read().unlock)
6 rev1, rev2 = _get_revision_range(revision, b, self.name())
7
8- if b.get_config().validate_signatures_in_log():
9+ if b.get_config_stack().get('validate_signatures_in_log'):
10 signatures = True
11
12 if signatures:
13
14=== modified file 'bzrlib/config.py'
15--- bzrlib/config.py 2012-01-28 16:56:12 +0000
16+++ bzrlib/config.py 2012-01-28 18:06:24 +0000
17@@ -2909,6 +2909,10 @@
18 ListOption('suppress_warnings',
19 default=[],
20 help="List of warning classes to suppress."))
21+option_registry.register(
22+ Option('validate_signatures_in_log', default=False,
23+ from_unicode=bool_from_store, invalid='warning',
24+ help='''Whether to validate signatures in bzr log.'''))
25 option_registry.register_lazy('ssl.ca_certs',
26 'bzrlib.transport.http._urllib2_wrappers', 'opt_ssl_ca_certs')
27