Rev 6096: Use unicode strings to make it clear default values must comply to Store API. in file:///home/vila/src/bzr/experimental/convert-default-values/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/convert-default-values/

------------------------------------------------------------
revno: 6096
revision-id: v.ladeuil+lp at free.fr-20110824185559-e9wx4bkl64xxgbd2
parent: v.ladeuil+lp at free.fr-20110822161530-0fjr0b9ddioyru26
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: convert-default-values
timestamp: Wed 2011-08-24 20:55:59 +0200
message:
  Use unicode strings to make it clear default values must comply to Store API.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-08-22 16:15:30 +0000
+++ b/bzrlib/config.py	2011-08-24 18:55:59 +0000
@@ -2322,7 +2322,8 @@
         :param name: the name used to refer to the option.
 
         :param default: the default value to use when none exist in the config
-            stores. This must be a string as it appears in the config stores.
+            stores. This must be a unicode string as provided by the config
+            stores.
 
         :param default_from_env: A list of environment variables which can
            provide a default value. 'default' will be used only if none of the
@@ -2463,7 +2464,7 @@
 # Registered options in lexicographical order
 
 option_registry.register(
-    Option('bzr.workingtree.worth_saving_limit', default='10',
+    Option('bzr.workingtree.worth_saving_limit', default=u'10',
            from_unicode=int_from_store,  invalid='warning',
            help='''\
 How many changes before saving the dirstate.
@@ -2475,7 +2476,7 @@
 a file has been touched.
 '''))
 option_registry.register(
-    Option('dirstate.fdatasync', default='True',
+    Option('dirstate.fdatasync', default=u'True',
            from_unicode=bool_from_store,
            help='''\
 Flush dirstate changes onto physical disk?
@@ -2485,16 +2486,16 @@
 should not be lost if the machine crashes.  See also repository.fdatasync.
 '''))
 option_registry.register(
-    Option('debug_flags', default='', from_unicode=list_from_store,
+    Option('debug_flags', default=u'', from_unicode=list_from_store,
            help='Debug flags to activate.'))
 option_registry.register(
-    Option('default_format', default='2a',
+    Option('default_format', default=u'2a',
            help='Format used when creating branches.'))
 option_registry.register(
     Option('editor',
            help='The command called to launch an editor to enter a message.'))
 option_registry.register(
-    Option('ignore_missing_extensions', default='False',
+    Option('ignore_missing_extensions', default=u'False',
            from_unicode=bool_from_store,
            help='''\
 Control the missing extensions warning display.
@@ -2505,7 +2506,7 @@
     Option('language',
            help='Language to translate messages into.'))
 option_registry.register(
-    Option('locks.steal_dead', default='False', from_unicode=bool_from_store,
+    Option('locks.steal_dead', default=u'False', from_unicode=bool_from_store,
            help='''\
 Steal locks that appears to be dead.
 
@@ -2521,7 +2522,8 @@
            help= 'Unicode encoding for output'
            ' (terminal encoding if not specified).'))
 option_registry.register(
-    Option('repository.fdatasync', default='True', from_unicode=bool_from_store,
+    Option('repository.fdatasync', default=u'True',
+           from_unicode=bool_from_store,
            help='''\
 Flush repository changes onto physical disk?