Merge lp:~thumper/launchpad/branch-api-expose-package-bits into lp:launchpad

[Tim Penhey]

Expose the sourcepackage for a branch over the API.

[Tim Penhey (thumper)]

A simple branch to expose the sourcepackage for a package branch. Exposing the sourcepackage gives the caller access to both the name of the source package and the distro series.

[Michael Hudson-Doyle (mwhudson)]

Woop woop.

review: Approve

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-02-11 00:54:32 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-02-17 22:45:22 +0000
@@ -84,11 +84,13 @@
 IBranch['linkSpecification'].queryTaggedValue(
     LAZR_WEBSERVICE_EXPORTED)['params']['spec'].schema= ISpecification
 IBranch['product'].schema = IProduct
-IBranch['setTarget'].queryTaggedValue(
-    LAZR_WEBSERVICE_EXPORTED)['params']['project'].schema= IProduct
-IBranch['setTarget'].queryTaggedValue(
-    LAZR_WEBSERVICE_EXPORTED)['params']['source_package'].schema= \
-        ISourcePackage
+
+patch_plain_parameter_type(
+    IBranch, 'setTarget', 'project', IProduct)
+patch_plain_parameter_type(
+    IBranch, 'setTarget', 'source_package', ISourcePackage)
+patch_reference_property(IBranch, 'sourcepackage', ISourcePackage)
+
 IBranch['spec_links'].value_type.schema = ISpecificationBranch
 IBranch['subscribe'].queryTaggedValue(
     LAZR_WEBSERVICE_EXPORTED)['return_type'].schema = IBranchSubscription

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2010-01-22 06:03:19 +0000
+++ lib/lp/code/interfaces/branch.py	2010-02-17 22:45:22 +0000
@@ -460,7 +460,8 @@
                           "that is responsible for reviewing proposals and "
                           "merging into this branch.")))
 
-    # XXX: JonathanLange 2008-11-24: Export these.
+    # Distroseries and sourcepackagename are exported together as
+    # the sourcepackage.
     distroseries = Choice(
         title=_("Distribution Series"), required=False,
         vocabulary='DistroSeries',
@@ -480,9 +481,12 @@
         "The IDistribution that this branch belongs to. None if not a "
         "package branch.")
 
-    sourcepackage = Attribute(
-        "The ISourcePackage that this branch belongs to. None if not a "
-        "package branch.")
+    # Really an ISourcePackage.
+    sourcepackage = exported(
+        Reference(
+            title=_("The ISourcePackage that this branch belongs to. "
+                    "None if not a package branch."),
+            schema=Interface, required=False, readonly=True))
 
     code_reviewer = Attribute(
         "The reviewer if set, otherwise the owner of the branch.")

=== modified file 'lib/lp/code/stories/webservice/xx-branch.txt'
--- lib/lp/code/stories/webservice/xx-branch.txt	2010-02-07 23:45:16 +0000
+++ lib/lp/code/stories/webservice/xx-branch.txt	2010-02-17 22:45:22 +0000
@@ -133,6 +133,7 @@
     reviewer_link: None
     revision_count: 0
     self_link: u'.../~eric/fooix/trunk'
+    sourcepackage_link: None
     spec_links_collection_link: u'.../~eric/fooix/trunk/spec_links'
     subscribers_collection_link: u'http://.../~eric/fooix/trunk/subscribers'
     subscriptions_collection_link: u'http://.../~eric/fooix/trunk/subscriptions'