Rev 5433: Rename bzrlib.transform.orphan_policy to bzr.transform.orphan_policy. in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5433
revision-id: v.ladeuil+lp at free.fr-20101015142103-xmh9nam9uekj3jq0
parent: v.ladeuil+lp at free.fr-20101015111034-2nyx66ypbgar0tx7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-config-option
timestamp: Fri 2010-10-15 16:21:03 +0200
message:
  Rename bzrlib.transform.orphan_policy to bzr.transform.orphan_policy.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/test_pull.py'
--- a/bzrlib/tests/per_workingtree/test_pull.py	2010-09-21 16:58:50 +0000
+++ b/bzrlib/tests/per_workingtree/test_pull.py	2010-10-15 14:21:03 +0000
@@ -92,7 +92,7 @@
         trunk = self.make_branch_deleting_dir('trunk')
         work = trunk.bzrdir.sprout('work', revision_id='2').open_workingtree()
         work.branch.get_config().set_user_option(
-            'bzrlib.transform.orphan_policy', 'move')
+            'bzr.transform.orphan_policy', 'move')
         # Add some unversioned files in dir
         self.build_tree(['work/dir/foo',
                          'work/dir/subdir/',

=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py	2010-09-21 16:58:50 +0000
+++ b/bzrlib/tests/test_bzrdir.py	2010-10-15 14:21:03 +0000
@@ -793,7 +793,7 @@
         tree.commit('Initial commit')
         # The following line force the orhaning to reveal bug #634470
         tree.branch.get_config().set_user_option(
-            'bzrlib.transform.orphan_policy', 'move')
+            'bzr.transform.orphan_policy', 'move')
         tree.bzrdir.destroy_workingtree()
         # FIXME: subtree/.bzr is left here which allows the test to pass (or
         # fail :-( ) -- vila 20100909

=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-10-15 09:56:29 +0000
+++ b/bzrlib/tests/test_transform.py	2010-10-15 14:21:03 +0000
@@ -3268,7 +3268,7 @@
         self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
 
     def _set_orphan_policy(self, wt, policy):
-        wt.branch.get_config().set_user_option('bzrlib.transform.orphan_policy',
+        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
                                                policy)
 
     def _prepare_orphan(self, wt):

=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-10-15 11:10:34 +0000
+++ b/bzrlib/transform.py	2010-10-15 14:21:03 +0000
@@ -1343,7 +1343,7 @@
         # 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 = 'bzrlib.transform.orphan_policy'
+        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:

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-10-15 11:10:34 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-10-15 14:21:03 +0000
@@ -166,8 +166,8 @@
 
 * It's now possible to request orphan creation when a versioned directory
   should be deleted (when doing a pull, a merge or switch) via the
-  ``bzrlib.transform.orphan_policy`` configuration variable. Acceptable
-  values are ``conflict`` (the default behaviour that refuse to delete the
+  ``bzr.transform.orphan_policy`` configuration variable. Acceptable values
+  are ``conflict`` (the default behaviour that refuse to delete the
   directory) or ``move`` to create orphans (the unversioned files present
   in the directory). The orphans will be named ``<file>.~#~``.
   (Vincent Ladeuil, #323111)