Merge lp:~nmb/bzr/484101-default-format into lp:bzr

[Neil Martinsen-Burrell]

Add a ``default_format`` configuration option.

This branch fixes bug 484101 by creating a "default_format" option that can be set in bazaar.conf. When given a format name, this option makes that format the default for any new branches that are created. Tests are provided for "bzr init" and one particular format.

[Alexander Belchenko (bialix)]

Neil Martinsen-Burrell пишет:
> This branch fixes bug 484101 by creating a "default_format" option that can be set in bazaar.conf. When given a format name, this option makes that format the default for any new branches that are created. Tests are provided for "bzr init" and one particular format.

God bless you! Thank you for this.

[Martin Pool (mbp)]

I think ideally it would be able to be configured by location, but this is a huge improvement. Thanks.

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

[Vincent Ladeuil (vila)]

@Neil: Just noticed while landing:

68 + def _restore_config(self):
69 + conf = _mod_config.GlobalConfig.from_string('', save=True)
70 +

77 + self.addCleanup(self._restore_config)

This is exactly how it should be done.
But it's useless :)

Your test class is already using TestCaseWithTransport and is executed in a temporary directory with BZR_HOME pointing there.

So you start with no config file and they will be deleted after the test.

=== modified file 'NEWS'
--- NEWS	2010-09-27 19:31:45 +0000
+++ NEWS	2010-09-29 05:49:43 +0000
@@ -27,8 +27,13 @@
   hook.
   (Parth Malwankar, #403687)
 
+* Provide a configuration option "default_format" that controls the
+  default format for new branches created with ``bzr init``.
+  (Neil Martinsen-Burrell, #484101)
+
 Bug Fixes
 *********
+  
 * Skip tests that needs a bzr source tree when there isn't one. This is
   needed to succesfully run the test suite for installed versions.
   (Vincent Ladeuil, #644855).

=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2010-09-10 09:46:15 +0000
+++ bzrlib/bzrdir.py	2010-09-29 05:49:43 +0000
@@ -3345,7 +3345,11 @@
     help='Same as 2a.')
 
 # The current format that is made on 'bzr init'.
-controldir.format_registry.set_default('2a')
+format_name = config.GlobalConfig().get_user_option('default_format')
+if format_name is None:
+    controldir.format_registry.set_default('2a')
+else:
+    controldir.format_registry.set_default(format_name)
 
 # XXX 2010-08-20 JRV: There is still a lot of code relying on
 # bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc

=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- bzrlib/help_topics/en/configuration.txt	2010-07-06 01:26:59 +0000
+++ bzrlib/help_topics/en/configuration.txt	2010-09-29 05:49:43 +0000
@@ -504,6 +504,12 @@
     whether the format deprecation warning is shown on repositories that are
     using deprecated formats.
 
+default_format
+~~~~~~~~~~~~~~
+
+A format name for the default format used when creating branches.  See ``bzr
+help formats`` for possible values.
+
 
 Unicode options
 ---------------

=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- bzrlib/tests/blackbox/test_init.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_init.py	2010-09-29 05:49:43 +0000
@@ -22,6 +22,7 @@
 
 from bzrlib import (
     branch as _mod_branch,
+    config as _mod_config,
     osutils,
     urlutils,
     )
@@ -163,6 +164,19 @@
         self.run_bzr('init ../new/tree --create-prefix', working_dir='tree')
         self.failUnlessExists('new/tree/.bzr')
 
+    def _restore_config(self):
+        conf = _mod_config.GlobalConfig.from_string('', save=True)
+
+    def test_init_default_format_option(self):
+        """bzr init should read default format from option default_format"""
+        conf = _mod_config.GlobalConfig.from_string('''
+[DEFAULT]
+default_format = 1.9
+''', save=True)
+        self.addCleanup(self._restore_config)
+        out, err = self.run_bzr_subprocess('init')
+        self.assertContainsRe(out, '1.9')
+
 
 class TestSFTPInit(TestCaseWithSFTPServer):