Rev 6455: (jelmer) Use config stacks for ``bzr.transform.orphan_policy``. (Jelmer in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6455 [merge]
revision-id: pqm at pqm.ubuntu.com-20120128175244-so96t76vjz017btm
parent: pqm at pqm.ubuntu.com-20120128172434-05d2rvoz1p92d6zi
parent: jelmer at samba.org-20120127214858-vs7t4lpmqxl2t32y
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2012-01-28 17:52:44 +0000
message:
  (jelmer) Use config stacks for ``bzr.transform.orphan_policy``. (Jelmer
   Vernooij)
modified:
  bzrlib/tests/per_workingtree/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
=== modified file 'bzrlib/tests/per_workingtree/test_pull.py'
--- a/bzrlib/tests/per_workingtree/test_pull.py	2011-11-08 12:49:00 +0000
+++ b/bzrlib/tests/per_workingtree/test_pull.py	2012-01-27 21:48:58 +0000
@@ -97,7 +97,7 @@
                     self.workingtree_format)
         trunk = self.make_branch_deleting_dir('trunk')
         work = trunk.bzrdir.sprout('work', revision_id='2').open_workingtree()
-        work.branch.get_config().set_user_option(
+        work.branch.get_config_stack().set(
             'bzr.transform.orphan_policy', 'move')
         # Add some unversioned files in dir
         self.build_tree(['work/dir/foo',

=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py	2012-01-28 12:47:17 +0000
+++ b/bzrlib/tests/test_bzrdir.py	2012-01-28 17:52:44 +0000
@@ -857,7 +857,7 @@
         sub_tree.add('file')
         tree.commit('Initial commit')
         # The following line force the orhaning to reveal bug #634470
-        tree.branch.get_config().set_user_option(
+        tree.branch.get_config_stack().set(
             'bzr.transform.orphan_policy', 'move')
         tree.bzrdir.destroy_workingtree()
         # FIXME: subtree/.bzr is left here which allows the test to pass (or

=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2012-01-28 16:56:12 +0000
+++ b/bzrlib/tests/test_transform.py	2012-01-28 17:52:44 +0000
@@ -3634,7 +3634,7 @@
         self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
     def _set_orphan_policy(self, wt, policy):
-        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
+        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
                                                policy)
 
     def _prepare_orphan(self, wt):