Merge lp:~abentley/bzr-pqm/config-stack-fixes into lp:bzr-pqm

[Aaron Bentley]

Fix config use for bzr 2.3-2.6dev

This branch fixes the use of configuration. It restores compatibility with 2.4 and earlier by wrapping config stack access. It restores compatibility with bzr.dev by working around bug #948344.

I've run the test suite with bzr 2.3-bzr.dev r6480

[Martin Packman (gz)]

Extending an using the compat wrapper like this looks fine. Would perhaps be neatest to pull the wrapper logic out of the pqm_submit module but doesn't need to happen here.

review: Approve

=== modified file 'pqm_submit.py'
--- pqm_submit.py	2012-02-22 13:14:40 +0000
+++ pqm_submit.py	2012-03-06 20:34:19 +0000
@@ -217,6 +217,9 @@
                 return value
         return None
 
+    def set(self, name, value):
+        self._sources[0].set_user_option(name, value)
+
 
 def pqm_email(local_config, submit_location):
     """Determine the PQM email address.
@@ -227,7 +230,7 @@
     mail_to = local_config.get('pqm_email')
     if not mail_to:
         submit_branch = Branch.open(submit_location)
-        submit_branch_config = submit_branch.get_config_stack()
+        submit_branch_config = get_stacked_config(submit_branch)
         mail_to = submit_branch_config.get('child_pqm_email')
         if mail_to is None:
             return None

=== modified file 'tests/test_lpland.py'
--- tests/test_lpland.py	2012-02-28 16:57:20 +0000
+++ tests/test_lpland.py	2012-03-06 20:34:19 +0000
@@ -14,6 +14,7 @@
     errors,
     ui,
 )
+from bzrlib.plugins.pqm.pqm_submit import get_stacked_config
 from bzrlib.plugins.pqm.lpland import (
     get_bugs_clause,
     get_email,
@@ -667,7 +668,7 @@
     def make_submitter(self):
         """Return a Submitter for testing."""
         b = self.make_branch('source')
-        b.get_config().set_user_option('pqm_email', 'PQM <[e-mail]>')
+        get_stacked_config(b).set('pqm_email', 'PQM <[e-mail]>')
         lp_source = self.make_branch('lp_source')
         mp = MergeProposal(FakeLPMergeProposal())
         return Submitter(b, mp)

=== modified file 'tests/test_pqm_submit.py'
--- tests/test_pqm_submit.py	2012-02-22 13:14:40 +0000
+++ tests/test_pqm_submit.py	2012-03-06 20:34:19 +0000
@@ -440,7 +440,7 @@
 
     def test_child_pqm_email(self):
         local_branch = self.make_branch('local')
-        local_config = local_branch.get_config_stack()
+        local_config = pqm_submit.get_stacked_config(local_branch)
         submit_branch = self.make_branch('submit')
         submit_config = submit_branch.get_config()
         submit_config.set_user_option('child_pqm_email', '[e-mail]')