Rev 6176: Migrate log_format to the config stacks. in file:///home/vila/src/bzr/861472-migrate-log-format/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/861472-migrate-log-format/

------------------------------------------------------------
revno: 6176
revision-id: v.ladeuil+lp at free.fr-20110929154326-hmpczhbxoywtxcn3
parent: pqm at pqm.ubuntu.com-20110928153255-zb9flucmyyducc0m
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 861472-migrate-log-format
timestamp: Thu 2011-09-29 17:43:26 +0200
message:
  Migrate log_format to the config stacks.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-09-26 07:56:05 +0000
+++ b/bzrlib/config.py	2011-09-29 15:43:26 +0000
@@ -2569,6 +2569,14 @@
 Otherwise, bzr will prompt as normal to break the lock.
 '''))
 option_registry.register(
+    Option('log_format', default='long',
+           help= '''\
+Log format to use when displaying revisions.
+
+Standard log formats are ``long``, ``short`` and ``line``. Additional formats
+may be provided by plugins.
+'''))
+option_registry.register(
     Option('output_encoding',
            help= 'Unicode encoding for output'
            ' (terminal encoding if not specified).'))

=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2011-09-19 15:22:23 +0000
+++ b/bzrlib/log.py	2011-09-29 15:43:26 +0000
@@ -1796,7 +1796,8 @@
         return self.get(name)(*args, **kwargs)
 
     def get_default(self, branch):
-        return self.get(branch.get_config().log_format())
+        c = branch.get_config_stack()
+        return self.get(c.get('log_format'))
 
 
 log_formatter_registry = LogFormatterRegistry()