Merge lp:~jelmer/bzr/more-config-stack-usage into lp:bzr

[Jelmer Vernooij]

Use config stacks in a few more places.

Use config stacks in a few more places.

[Martin Pool (mbp)]

review: Approve

=== modified file 'bzrlib/add.py'
--- bzrlib/add.py	2011-12-19 16:41:49 +0000
+++ bzrlib/add.py	2012-02-06 12:06:21 +0000
@@ -82,9 +82,7 @@
             return False
         opt_name = 'add.maximum_file_size'
         if self._maxSize is None:
-            # FIXME: We use the branch config as there is no tree config
-            # -- vila 2011-12-16
-            config = tree.branch.get_config_stack()
+            config = tree.get_config_stack()
             self._maxSize = config.get(opt_name)
         if stat_value is None:
             file_size = os.path.getsize(path);

=== modified file 'bzrlib/commit.py'
--- bzrlib/commit.py	2011-12-18 12:46:49 +0000
+++ bzrlib/commit.py	2012-02-06 12:06:21 +0000
@@ -372,7 +372,7 @@
         elif self.reporter is None:
             self.reporter = self._select_reporter()
         if self.config_stack is None:
-            self.config_stack = self.branch.get_config_stack()
+            self.config_stack = self.work_tree.get_config_stack()
 
         self._set_specific_file_ids()
 

=== modified file 'bzrlib/commit_signature_commands.py'
--- bzrlib/commit_signature_commands.py	2011-12-19 13:23:58 +0000
+++ bzrlib/commit_signature_commands.py	2012-02-06 12:06:21 +0000
@@ -59,11 +59,11 @@
             bzrdir = controldir.ControlDir.open(location)
         branch = bzrdir.open_branch()
         repo = branch.repository
-        branch_config = branch.get_config()
+        branch_config = branch.get_config_stack()
 
         if committer is None:
-            committer = branch_config.username()
-        gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
+            committer = branch_config.get('email')
+        gpg_strategy = gpg.GPGStrategy(branch_config)
 
         count = 0
         repo.lock_write()

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2012-02-03 10:28:47 +0000
+++ bzrlib/config.py	2012-02-06 12:06:21 +0000
@@ -55,7 +55,7 @@
                    turns on create_signatures.
 create_signatures - this option controls whether bzr will always create
                     gpg signatures or not on commits.  There is an unused
-                    option which in future is expected to work if               
+                    option which in future is expected to work if
                     branch settings require signatures.
 log_format - this option sets the default log format.  Possible values are
              long, short, line, or a plugin can register new formats.
@@ -2658,6 +2658,8 @@
            help="""\
 Whether revisions associated with tags should be fetched.
 """))
+option_registry.register_lazy(
+    'bzr.transform.orphan_policy', 'bzrlib.transform', 'opt_transform_orphan')
 option_registry.register(
     Option('bzr.workingtree.worth_saving_limit', default=10,
            from_unicode=int_from_store,  invalid='warning',

=== modified file 'bzrlib/memorytree.py'
--- bzrlib/memorytree.py	2011-12-19 13:23:58 +0000
+++ bzrlib/memorytree.py	2012-02-06 12:06:21 +0000
@@ -51,6 +51,9 @@
         self._locks = 0
         self._lock_mode = None
 
+    def get_config_stack(self):
+        return self.branch.get_config_stack()
+
     def is_control_filename(self, filename):
         # Memory tree doesn't have any control filenames
         return False

=== modified file 'bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py'
--- bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py	2011-12-21 14:43:39 +0000
+++ bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py	2012-02-06 12:06:21 +0000
@@ -186,7 +186,7 @@
             base_text, True)
         builder.change_contents('clog-id', other=other_text, this=this_text)
         merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
-        merger.this_branch.get_config().set_user_option(
+        merger.this_branch.get_config_stack().set(
             'changelog_merge_files', 'ChangeLog')
         merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
             'file', 'file', 'conflict')

=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- bzrlib/plugins/launchpad/test_register.py	2011-03-14 10:11:58 +0000
+++ bzrlib/plugins/launchpad/test_register.py	2012-02-06 12:06:21 +0000
@@ -329,8 +329,8 @@
     def test_gather_user_credentials_from_auth_conf(self):
         auth_path = config.authentication_config_filename()
         service = LaunchpadService()
-        g_conf = config.GlobalConfig()
-        g_conf.set_user_option('email', 'Test User <[e-mail]>')
+        g_conf = config.GlobalStack()
+        g_conf.set('email', 'Test User <[e-mail]>')
         f = open(auth_path, 'wb')
         try:
             scheme, hostinfo = urlparse.urlsplit(service.service_url)[:2]
@@ -350,8 +350,8 @@
     def test_gather_user_credentials_prompts(self):
         service = LaunchpadService()
         self.assertIs(None, service.registrant_password)
-        g_conf = config.GlobalConfig()
-        g_conf.set_user_option('email', 'Test User <[e-mail]>')
+        g_conf = config.GlobalStack()
+        g_conf.set('email', 'Test User <[e-mail]>')
         stdout = tests.StringIOWrapper()
         stderr = tests.StringIOWrapper()
         ui.ui_factory = tests.TestUIFactory(stdin='userpass\n',

=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- bzrlib/tests/blackbox/test_add.py	2012-01-05 17:46:44 +0000
+++ bzrlib/tests/blackbox/test_add.py	2012-02-06 12:06:21 +0000
@@ -247,7 +247,7 @@
         self.build_tree_contents([('small.txt', '0\n')])
         self.build_tree_contents([('big.txt', '01234567890123456789\n')])
         self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
-        tree.branch.get_config().set_user_option('add.maximum_file_size', 5)
+        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
         out = self.run_bzr('add')[0]
         results = sorted(out.rstrip('\n').split('\n'))
         self.assertEquals(['adding small.txt'], results)

=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- bzrlib/tests/blackbox/test_annotate.py	2012-01-05 09:17:34 +0000
+++ bzrlib/tests/blackbox/test_annotate.py	2012-02-06 12:06:21 +0000
@@ -233,7 +233,8 @@
     def test_annotated_edited_merged_file_revnos(self):
         wt = self._create_merged_file()
         out, err = self.run_bzr(['annotate', 'file'])
-        email = config.extract_email_address(wt.branch.get_config().username())
+        email = config.extract_email_address(
+            wt.branch.get_config_stack().get('email'))
         self.assertEqual(
             '3?    %-7s | local\n'
             '1     test@ho | foo\n'

=== modified file 'bzrlib/tests/test_lockdir.py'
--- bzrlib/tests/test_lockdir.py	2011-12-14 18:27:44 +0000
+++ bzrlib/tests/test_lockdir.py	2012-02-06 12:06:21 +0000
@@ -433,9 +433,9 @@
         self.assertContainsRe(info_list['time_ago'], r'^\d+ seconds? ago$')
 
     def test_lock_without_email(self):
-        global_config = config.GlobalConfig()
+        global_config = config.GlobalStack()
         # Intentionally has no email address
-        global_config.set_user_option('email', 'User Identity')
+        global_config.set('email', 'User Identity')
         ld1 = self.get_lock()
         ld1.create()
         ld1.lock_write()

=== modified file 'bzrlib/tests/test_msgeditor.py'
--- bzrlib/tests/test_msgeditor.py	2011-11-16 17:19:13 +0000
+++ bzrlib/tests/test_msgeditor.py	2012-02-06 12:06:21 +0000
@@ -26,7 +26,6 @@
     errors,
     msgeditor,
     osutils,
-    tests,
     trace,
     )
 from bzrlib.msgeditor import (
@@ -81,9 +80,7 @@
 """)
 
     def make_multiple_pending_tree(self):
-        from bzrlib import config
-        config.GlobalConfig().set_user_option('email',
-                                              'Bilbo Baggins <[e-mail]>')
+        config.GlobalStack().set('email', 'Bilbo Baggins <[e-mail]>')
         tree = self.make_branch_and_tree('a')
         tree.commit('Initial checkin.', timestamp=1230912900, timezone=0)
         tree2 = tree.bzrdir.clone('b').open_workingtree()

=== modified file 'bzrlib/tests/test_status.py'
--- bzrlib/tests/test_status.py	2011-11-21 19:27:55 +0000
+++ bzrlib/tests/test_status.py	2012-02-06 12:06:21 +0000
@@ -46,7 +46,7 @@
         self.assertContainsRe(output.getvalue(), 'empty commit')
 
     def make_multiple_pending_tree(self):
-        config.GlobalConfig().set_user_option('email', 'Joe Foo <[e-mail]>')
+        config.GlobalStack().set('email', 'Joe Foo <[e-mail]>')
         tree = self.make_branch_and_tree('a')
         tree.commit('commit 1', timestamp=1196796819, timezone=0)
         tree2 = tree.bzrdir.clone('b').open_workingtree()
@@ -102,7 +102,7 @@
 
     def test_pending_with_ghosts(self):
         """Test when a pending merge's ancestry includes ghosts."""
-        config.GlobalConfig().set_user_option('email', 'Joe Foo <[e-mail]>')
+        config.GlobalStack().set('email', 'Joe Foo <[e-mail]>')
         tree = self.make_branch_and_tree('a')
         tree.commit('empty commit')
         tree2 = tree.bzrdir.clone('b').open_workingtree()

=== modified file 'bzrlib/tests/test_transform.py'
--- bzrlib/tests/test_transform.py	2012-01-28 17:52:44 +0000
+++ bzrlib/tests/test_transform.py	2012-02-06 12:06:21 +0000
@@ -3713,7 +3713,7 @@
         self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
                          remaining_conflicts.pop())
         self.assertLength(1, warnings)
-        self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
+        self.assertStartsWith(warnings[0], 'Value "donttouchmypreciouuus" ')
 
 
 class TestTransformHooks(tests.TestCaseWithTransport):

=== modified file 'bzrlib/transform.py'
--- bzrlib/transform.py	2012-01-27 21:45:11 +0000
+++ bzrlib/transform.py	2012-02-06 12:06:21 +0000
@@ -22,6 +22,7 @@
 import time
 
 from bzrlib import (
+    config as _mod_config,
     errors,
     lazy_import,
     registry,
@@ -1405,21 +1406,8 @@
         delete_any(self._limbo_name(trans_id))
 
     def new_orphan(self, trans_id, parent_id):
-        # FIXME: There is no tree config, so we use the branch one (it's weird
-        # to define it this way as orphaning can only occur in a working tree,
-        # but that's all we have (for now). It will find the option in
-        # locations.conf or bazaar.conf though) -- vila 20100916
-        conf = self._tree.branch.get_config()
-        conf_var_name = 'bzr.transform.orphan_policy'
-        orphan_policy = conf.get_user_option(conf_var_name)
-        default_policy = orphaning_registry.default_key
-        if orphan_policy is None:
-            orphan_policy = default_policy
-        if orphan_policy not in orphaning_registry:
-            trace.warning('%s (from %s) is not a known policy, defaulting '
-                'to %s' % (orphan_policy, conf_var_name, default_policy))
-            orphan_policy = default_policy
-        handle_orphan = orphaning_registry.get(orphan_policy)
+        conf = self._tree.get_config_stack()
+        handle_orphan = conf.get('bzr.transform.orphan_policy')
         handle_orphan(self, trans_id, parent_id)
 
 
@@ -1488,6 +1476,12 @@
 orphaning_registry._set_default_key('conflict')
 
 
+opt_transform_orphan = _mod_config.RegistryOption(
+    'bzr.transform.orphan_policy', orphaning_registry,
+    help='Policy for orphaned files during transform operations.',
+    invalid='warning')
+
+
 class TreeTransform(DiskTreeTransform):
     """Represent a tree transformation.