Rev 6381: No matter how weird BranchOnlyStack is, it's public, the FIXMEs should be enough for devs to notice. in file:///home/vila/src/bzr/experimental/config-location-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config-location-options/

------------------------------------------------------------
revno: 6381
revision-id: v.ladeuil+lp at free.fr-20111221101230-tou59k82ca7931uc
parent: v.ladeuil+lp at free.fr-20111220140421-8fkarrusrynweiah
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-location-options
timestamp: Wed 2011-12-21 11:12:30 +0100
message:
  No matter how weird BranchOnlyStack is, it's public, the FIXMEs should be enough for devs to notice.
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2011-12-20 14:04:21 +0000
+++ b/bzrlib/branch.py	2011-12-21 10:12:30 +0000
@@ -2999,7 +2999,7 @@
         ## self._check_stackable_repo()
         # stacked_on_location is only ever defined in branch.conf, so don't
         # waste effort reading the whole stack of config files.
-        conf = _mod_config._BranchOnlyStack(self)
+        conf = _mod_config.BranchOnlyStack(self)
         stacked_url = self._get_config_location('stacked_on_location',
                                                 config=conf)
         if stacked_url is None:

=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-12-20 14:04:21 +0000
+++ b/bzrlib/config.py	2011-12-21 10:12:30 +0000
@@ -3638,7 +3638,7 @@
         self.bzrdir = bzrdir
 
 
-class _BranchOnlyStack(_CompatibleStack):
+class BranchOnlyStack(_CompatibleStack):
     """Branch-only options stack."""
 
     # FIXME: _BranchOnlyStack only uses branch.conf and is used only for the
@@ -3647,7 +3647,7 @@
 
     def __init__(self, branch):
         bstore = branch._get_config_store()
-        super(_BranchOnlyStack, self).__init__(
+        super(BranchOnlyStack, self).__init__(
             [NameMatcher(bstore, None).get_sections],
             bstore)
         self.branch = branch

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-12-20 14:04:21 +0000
+++ b/bzrlib/tests/test_config.py	2011-12-21 10:12:30 +0000
@@ -151,7 +151,7 @@
      server_class) = transport_remote.get_test_permutations()[0]
     build_backing_branch(test, 'branch', transport_class, server_class)
     b = branch.Branch.open(test.get_url('branch'))
-    return config._BranchOnlyStack(b)
+    return config.BranchOnlyStack(b)
 config.test_stack_builder_registry.register('branch_only',
                                             build_branch_only_stack)