Merge lp:~stevenk/launchpad/db-add-distro-parent into lp:launchpad/db-devel

[Steve Kowalik]

[lp:~stevenk/launchpad/db-add-distro-parent]

9533. By Steve Kowalik on 2010-11-25

Twiddle text in the doctest

Unmerged revisions

9533. By Steve Kowalik on 2010-11-25

Twiddle text in the doctest

9532. By Steve Kowalik on 2010-11-22

Stop dropping .parent

9531. By Steve Kowalik on 2010-11-22

Merge db-devel

9530. By Steve Kowalik on 2010-11-22

First shot at adding a derived_from column

=== added file 'database/schema/patch-2207-99-0.sql'
--- database/schema/patch-2207-99-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-99-0.sql	2010-11-25 08:00:42 +0000
@@ -0,0 +1,7 @@
+SET client_min_messages=ERROR;
+
+ALTER TABLE DistroSeries
+    ADD COLUMN derived_from INTEGER REFERENCES DistroSeries;
+CREATE INDEX distroseries__derived_from__idx ON DistroSeries(derived_from);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 99, 0);

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-11-17 22:18:34 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-11-25 08:00:42 +0000
@@ -375,6 +375,8 @@
     IDistroSeries, 'main_archive', IArchive)
 patch_reference_property(
     IDistroSeries, 'distribution', IDistribution)
+patch_reference_property(
+    IDistroSeries, 'derived_from', IDistroSeries)
 patch_choice_parameter_type(
     IDistroSeries, 'getPackageUploads', 'status', PackageUploadStatus)
 patch_choice_parameter_type(

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-11-11 03:19:18 +0000
+++ lib/lp/registry/configure.zcml	2010-11-25 08:00:42 +0000
@@ -209,6 +209,10 @@
             permission="launchpad.Moderate"
             set_attributes="version name status owner nominatedarchindep                                                                                                 changeslist datereleased"/>
 
+        <require
+            permission="launchpad.Commercial"
+            set_attributes="derived_from"/>
+
         <!-- IStructuralSubscriptionTarget -->
 
         <allow

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-11-02 05:48:54 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-11-25 08:00:42 +0000
@@ -402,6 +402,26 @@
     mozilla-firefox
     netapplet
 
+Derived Distroseries
+--------------------
+
+Distroseries can be marked as deriving from another distroseries. This is
+useful for Ubuntu, in as such that Ubuntu can be marked as deriving from
+Debian sid, and distribution contributors can easily see the differences
+between the latest packages in Ubuntu and Debian.
+
+Distroseries can not be marked in such a way, except if you are an admin.
+
+    >>> joe = factory.makePerson(name='joe')
+    >>> login_person(joe)
+    >>> bumpy.derived_from = warty
+    Traceback (most recent call last):
+    ...
+    Unauthorized: (<DistroSeries ...>, 'derived_from', 'launchpad.Commercial')
+    >>> logout()
+    >>> login('[e-mail]')
+    >>> bumpy.derived_from = warty
+    >>> logout()
 
 Translatable Packages and Packaging
 -----------------------------------
@@ -477,6 +497,7 @@
 list of up to five packages that are the most recently linked to an
 upstream.
 
+    >>> login("[e-mail]")
     >>> distribution = factory.makeDistribution()
     >>> distroseries = factory.makeDistroRelease(distribution=distribution)
     >>> pkgs = distroseries.getMostRecentlyLinkedPackagings()

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2010-11-08 12:09:21 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2010-11-25 08:00:42 +0000
@@ -354,6 +354,11 @@
             description=_(
                 "Whether or not this series is currently supported.")))
 
+    derived_from = exported(
+        Reference(
+            Interface, # Really IDistroSeries
+            title=_('Parent Distroseries')))
+
     def isUnstable():
         """Whether or not a distroseries is unstable.
 

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-11-12 20:04:22 +0000
+++ lib/lp/registry/model/distroseries.py	2010-11-25 08:00:42 +0000
@@ -256,6 +256,7 @@
     sections = SQLRelatedJoin(
         'Section', joinColumn='distroseries', otherColumn='section',
         intermediateTable='SectionSelection')
+    derived_from = ForeignKey(foreignKey='DistroSeries', notNull=False)
 
     @property
     def named_version(self):

=== modified file 'lib/lp/registry/stories/webservice/xx-distroseries.txt'
--- lib/lp/registry/stories/webservice/xx-distroseries.txt	2010-06-09 08:26:26 +0000
+++ lib/lp/registry/stories/webservice/xx-distroseries.txt	2010-11-25 08:00:42 +0000
@@ -66,6 +66,7 @@
     changeslist: u'[e-mail]'
     date_created: u'2006-10-16T18:31:43.483559+00:00'
     datereleased: None
+    derived_from_link: None
     description: u'Hoary is the ...
     displayname: u'Hoary'
     distribution_link: u'http://.../ubuntu'