Rev 4387: (Jelmer) Add Branch.get_child_submit_format(). in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4387
revision-id: pqm at pqm.ubuntu.com-20090528153456-c5piafs9t37b0nz4
parent: pqm at pqm.ubuntu.com-20090528142500-n7ki7gucmkxzx611
parent: jelmer at samba.org-20090526203234-wzi6as6u4yrrdb4j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-05-28 16:34:56 +0100
message:
  (Jelmer) Add Branch.get_child_submit_format().
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
    ------------------------------------------------------------
    revno: 4382.3.1
    revision-id: jelmer at samba.org-20090526203234-wzi6as6u4yrrdb4j
    parent: pqm at pqm.ubuntu.com-20090526151333-3qckrxykl1x7op09
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: branch-send-format
    timestamp: Tue 2009-05-26 22:32:34 +0200
    message:
      Add Branch.get_child_submit_format(), so particular Branch implementations 
      can use different default submit formats without requiring configuration 
      changes.
    modified:
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2009-05-23 04:55:52 +0000
+++ b/bzrlib/branch.py	2009-05-26 20:32:34 +0000
@@ -932,6 +932,10 @@
             location = None
         return location
 
+    def get_child_submit_format(self):
+        """Return the preferred format of submissions to this branch."""
+        return self.get_config().get_user_option("child_submit_format")
+
     def get_submit_branch(self):
         """Return the submit location of the branch.
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-05-26 08:48:51 +0000
+++ b/bzrlib/builtins.py	2009-05-26 20:32:34 +0000
@@ -4897,11 +4897,12 @@
                         submit_branch)
 
             if mail_to is None or format is None:
-                submit_config = Branch.open(submit_branch).get_config()
+                submit_br = Branch.open(submit_branch)
+                submit_config = submit_br.get_config()
                 if mail_to is None:
                     mail_to = submit_config.get_user_option("child_submit_to")
                 if format is None:
-                    format = submit_config.get_user_option("child_submit_format")
+                    format = submit_br.get_child_submit_format()
 
             stored_public_branch = branch.get_public_branch()
             if public_branch is None:

=== modified file 'bzrlib/tests/branch_implementations/test_branch.py'
--- a/bzrlib/tests/branch_implementations/test_branch.py	2009-04-22 20:08:25 +0000
+++ b/bzrlib/tests/branch_implementations/test_branch.py	2009-05-26 20:32:34 +0000
@@ -625,6 +625,18 @@
         self.assertEqual('foo', branch.get_push_location())
 
 
+class TestChildSubmitFormats(TestCaseWithBranch):
+
+    def test_get_child_submit_format_default(self):
+        self.assertEqual(None, self.get_branch().get_child_submit_format())
+
+    def test_get_child_submit_format(self):
+        branch = self.get_branch()
+        branch.get_config().set_user_option('child_submit_format', '10')
+        branch = self.get_branch()
+        self.assertEqual('10', branch.get_child_submit_format())
+
+
 class TestFormat(TestCaseWithBranch):
     """Tests for the format itself."""