Merge lp:~vila/bzr/missing-stacks into lp:bzr

[Vincent Ladeuil]

Add missing config store and stacks for control.conf and remote branches.

One store was missing for the stealth 'control.conf'.

This patch adds it as well as the missing stacks:

- control.conf gets its own stack as it seems to me it needs to
  be used in isolation (it contains only default_stacked_on anyway),

- remote branches needs a special stack because they ignore
  bazaar.conf and locations.conf (both locally and remotely).

[Jonathan Riddell (jr)]

Fine but I'd like to see docstrings on the new classes

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/17/2011 6:20 PM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/missing-stacks
> into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/missing-stacks/+merge/71918
>
> One store was missing for the stealth 'control.conf'.
>
> This patch adds it as well as the missing stacks:
>
> - control.conf gets its own stack as it seems to me it needs to be
> used in isolation (it contains only default_stacked_on anyway),
>
> - remote branches needs a special stack because they ignore
> bazaar.conf and locations.conf (both locally and remotely).

How do you mean they ignore bazaar.conf and locations.conf? I've
certainly set

 [bzr+ssh://host/path/to/branch]
 public_location = http://host/branch

In the past. That may not be working now, or whatever. But since
locations.conf exists to be able to override configuration settings
for remote branches, explicitly ignoring them seems really odd.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5Ux2oACgkQJdeBCYSNAAOyGgCeNviSyq0Zn3D0RV3m8tbiRUnV
500An08s/B80abXa55iv32zZ7NE7ILk9
=2d+D
-----END PGP SIGNATURE-----

[Vincent Ladeuil (vila)]

As mentioned on IRC: this reflects actual usage in code not a change in behaviour.

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2011-08-21 15:14:57 +0000
+++ bzrlib/config.py	2011-08-22 07:55:59 +0000
@@ -2812,6 +2812,14 @@
         super(BranchStore, self).save()
 
 
+class ControlStore(LockableIniFileStore):
+
+    def __init__(self, bzrdir):
+        super(ControlStore, self).__init__(bzrdir.transport,
+                                          'control.conf',
+                                           lock_dir_name='branch_lock')
+
+
 class SectionMatcher(object):
     """Select sections into a given Store.
 
@@ -3048,6 +3056,7 @@
 
 
 class GlobalStack(_CompatibleStack):
+    """Global options only stack."""
 
     def __init__(self):
         # Get a GlobalStore
@@ -3056,6 +3065,7 @@
 
 
 class LocationStack(_CompatibleStack):
+    """Per-location options falling back to global options stack."""
 
     def __init__(self, location):
         """Make a new stack for a location and global configuration.
@@ -3067,7 +3077,9 @@
         super(LocationStack, self).__init__(
             [matcher.get_sections, gstore.get_sections], lstore)
 
+
 class BranchStack(_CompatibleStack):
+    """Per-location options falling back to branch then global options stack."""
 
     def __init__(self, branch):
         bstore = BranchStore(branch)
@@ -3080,6 +3092,28 @@
         self.branch = branch
 
 
+class RemoteControlStack(_CompatibleStack):
+    """Remote control-only options stack."""
+
+    def __init__(self, bzrdir):
+        cstore = ControlStore(bzrdir)
+        super(RemoteControlStack, self).__init__(
+            [cstore.get_sections],
+            cstore)
+        self.bzrdir = bzrdir
+
+
+class RemoteBranchStack(_CompatibleStack):
+    """Remote branch-only options stack."""
+
+    def __init__(self, branch):
+        bstore = BranchStore(branch)
+        super(RemoteBranchStack, self).__init__(
+            [bstore.get_sections],
+            bstore)
+        self.branch = branch
+
+
 class cmd_config(commands.Command):
     __doc__ = """Display, set or remove a configuration option.
 

=== modified file 'bzrlib/lock.py'
--- bzrlib/lock.py	2011-06-28 21:47:24 +0000
+++ bzrlib/lock.py	2011-08-22 07:55:59 +0000
@@ -535,7 +535,7 @@
     locked the same way), and -Drelock is set, then this will trace.note a
     message about it.
     """
-    
+
     _prev_lock = None
 
     def _note_lock(self, lock_type):

=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py	2011-08-21 15:14:57 +0000
+++ bzrlib/tests/test_config.py	2011-08-22 07:55:59 +0000
@@ -116,6 +116,13 @@
 config.test_store_builder_registry.register('branch', build_branch_store)
 
 
+def build_control_store(test):
+    build_backing_branch(test, 'branch')
+    b = bzrdir.BzrDir.open('branch')
+    return config.ControlStore(b)
+config.test_store_builder_registry.register('control', build_control_store)
+
+
 def build_remote_branch_store(test):
     # There is only one permutation (but we won't be able to handle more with
     # this design anyway)
@@ -148,10 +155,23 @@
      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.BranchStack(b)
+    return config.RemoteBranchStack(b)
 config.test_stack_builder_registry.register('remote_branch',
                                             build_remote_branch_stack)
 
+def build_remote_control_stack(test):
+    # There is only one permutation (but we won't be able to handle more with
+    # this design anyway)
+    (transport_class,
+     server_class) = transport_remote.get_test_permutations()[0]
+    # We need only a bzrdir for this, not a full branch, but it's not worth
+    # creating a dedicated helper to create only the bzrdir
+    build_backing_branch(test, 'branch', transport_class, server_class)
+    b = branch.Branch.open(test.get_url('branch'))
+    return config.RemoteControlStack(b.bzrdir)
+config.test_stack_builder_registry.register('remote_control',
+                                            build_remote_control_stack)
+
 
 sample_long_alias="log -r-15..-1 --line"
 sample_config_text = u"""