Merge lp:~allenap/launchpad/bug-subscription-filter-models-bug-639749 into lp:launchpad/db-devel

[Gavin Panella]

Add Storm model classes for BugSubscriptionFilter* tables.

- Add Storm model classes for BugSubscriptionFilter* tables (which
  already exist),

- Add database permissions for the aforementioned tables,

- Clean up some of the code in StructuralSubscriptionTargetMixin.

[Edwin Grubbs (edwin-grubbs)]

Hi Gavin,

This branch looks good, but I have a few comments below.

-Edwin

>=== modified file 'lib/lp/bugs/model/bugsubscription.py'
>--- lib/lp/bugs/model/bugsubscription.py 2010-09-09 21:00:54 +0000
>+++ lib/lp/bugs/model/bugsubscription.py 2010-09-15 18:09:22 +0000
>@@ -66,3 +80,63 @@
> if self.person.is_team:
> return user.inTeam(self.person)
> return user == self.person

Unless something has changed, each model class with its own table
needs to have its own file.

>+class BugSubscriptionFilter(Storm):
>+ """A filter to specialize a *structural* subscription."""
>+
>+ __storm_table__ = "BugSubscriptionFilter"
>+
>+ id = Int(primary=True)
>+
>+ structural_subscription_id = Int("structuralsubscription", allow_none=False)

Long line.

>+ structural_subscription = Reference(
>+ structural_subscription_id, "StructuralSubscription.id")
>+
>+ find_all_tags = Bool(allow_none=False, default=False)
>+ include_any_tags = Bool(allow_none=False, default=False)
>+ exclude_any_tags = Bool(allow_none=False, default=False)
>+
>+ other_parameters = Unicode()
>+
>+ description = Unicode()
>+
>+
>+class BugSubscriptionFilterStatus(Storm):
>+ """Statuses to filter."""
>+
>+ __storm_table__ = "BugSubscriptionFilterStatus"
>+
>+ id = Int(primary=True)
>+
>+ filter_id = Int("filter", allow_none=False)
>+ filter = Reference(filter_id, "BugSubscriptionFilter.id")
>+
>+ status = DBEnum(enum=BugTaskStatus, allow_none=False)
>+
>+
>+class BugSubscriptionFilterImportance(Storm):
>+ """Importances to filter."""
>+
>+ __storm_table__ = "BugSubscriptionFilterImportance"
>+
>+ id = Int(primary=True)
>+
>+ filter_id = Int("filter", allow_none=False)
>+ filter = Reference(filter_id, "BugSubscriptionFilter.id")
>+
>+ importance = DBEnum(enum=BugTaskImportance, allow_none=False)
>+
>+
>+class BugSubscriptionFilterTag(Storm):
>+ """Tags to filter."""
>+
>+ __storm_table__ = "BugSubscriptionFilterTag"
>+
>+ id = Int(primary=True)
>+
>+ filter_id = Int("filter", allow_none=False)
>+ filter = Reference(filter_id, "BugSubscriptionFilter.id")
>+
>+ include = Bool(allow_none=False)
>+ tag = Unicode(allow_none=False)
>
>=== added directory 'lib/lp/bugs/model/tests'
>=== added file 'lib/lp/bugs/model/tests/__init__.py'
>=== added file 'lib/lp/bugs/model/tests/test_bugsubscription.py'
>--- lib/lp/bugs/model/tests/test_bugsubscription.py 1970-01-01 00:00:00 +0000
>+++ lib/lp/bugs/model/tests/test_bugsubscription.py 2010-09-15 18:09:22 +0000
>@@ -0,0 +1,182 @@
>+# Copyright 2010 Canonical Ltd. This software is licensed under the
>+# GNU Affero General Public License version 3 (see the file LICENSE).
>+
>+"""Tests for the bugsubscription module."""
>+
>+__metaclass__ = type
>+
>+from canonical.launchpad.interfaces.lpstorm import IStore
>+from canonical.testing import DatabaseFunctionalLayer
>+from lp.bugs.interfaces.bugtask import (
>+ BugTaskImportance,
>+ BugTaskStatus,
>+ )
>+from lp.bugs.model.bugsubscription import (
>+ BugSubscriptionFilter,
>+ BugSubscriptionFilterImportance,
>+ BugSubscriptionFilterStatus,
>+ BugSubscriptionFilterTa...

review: Approve (code)

[Gavin Panella (allenap)]

> Unless something has changed, each model class with its own table
> needs to have its own file.

There are at least a couple of other places in bugs/model where more
than one model class is in the same module. Like these new classes,
they're all supporting classes for the first model class in the
module. These BugSubscriptionFilter* classes will almost certainly not
be exposed to browser code (and if they are then I'll move them to
their own modules anyway).

I'll gamble and land this branch as-is, but if you object I'll knock
up another branch to split them up.

Thanks for the review!

[Edwin Grubbs (edwin-grubbs)]

Having separate files for separate database classes is still listed in the CodeReviewChecklist, so this should probably be brought up at the reviewers meeting if you think this should be changed.

Here is the reason that I have vivid memories of this rule.
https://lists.ubuntu.com/mailman/private/launchpad-reviews/2007-November/008416.html

[Gavin Panella (allenap)]

Okay, I'll split them out anyway. My branch didn't land because of some test failures anyway, so I can do it before landing.

BTW, I can't get see that thread. I suspect I unsubscribed from launchpad-reviews; even though I just changed my password globally on that Mailman I can't authorization is denied for that archive.

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-09-22 07:12:37 +0000
+++ database/schema/security.cfg	2010-09-23 11:12:49 +0000
@@ -539,6 +539,10 @@
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationrecipient         = SELECT, INSERT
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugtask                          = SELECT, INSERT, UPDATE
 public.bugtracker                       = SELECT, INSERT
 public.bugtrackeralias                  = SELECT
@@ -618,6 +622,10 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationrecipient         = SELECT, INSERT
 public.structuralsubscription           = SELECT
@@ -630,6 +638,7 @@
 [branch-distro]
 type=user
 public.branch                    = SELECT, INSERT, UPDATE
+public.branchrevision            = SELECT, INSERT
 public.branchsubscription        = SELECT, INSERT
 public.distribution              = SELECT
 public.distroseries              = SELECT
@@ -637,6 +646,7 @@
 public.karmaaction               = SELECT
 public.person                    = SELECT
 public.product                   = SELECT
+public.revision                  = SELECT
 public.seriessourcepackagebranch = SELECT, INSERT, DELETE
 public.sourcepackagename         = SELECT
 public.teamparticipation         = SELECT
@@ -804,6 +814,10 @@
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationrecipient         = SELECT, INSERT
 public.bugnomination                    = SELECT
@@ -928,6 +942,10 @@
 public.bugpackageinfestation            = SELECT, INSERT, UPDATE
 public.bugproductinfestation            = SELECT, INSERT, UPDATE
 public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilter            = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilterstatus      = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilterimportance  = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfiltertag         = SELECT, INSERT, UPDATE, DELETE
 public.bugtask                          = SELECT, INSERT, UPDATE, DELETE
 public.bugtracker                       = SELECT, INSERT, UPDATE, DELETE
 public.bugtrackeralias                  = SELECT, INSERT, UPDATE, DELETE
@@ -1156,6 +1174,10 @@
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugjob                           = SELECT, INSERT
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationrecipient         = SELECT, INSERT
 public.bugnomination                    = SELECT
@@ -1258,6 +1280,10 @@
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugjob                           = SELECT, INSERT
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationrecipient         = SELECT, INSERT
 public.bugnomination                    = SELECT
@@ -1325,6 +1351,10 @@
 public.bugnotification                  = SELECT, INSERT, UPDATE
 public.bugnotificationrecipient         = SELECT, INSERT, UPDATE
 public.bugsubscription                  = SELECT, INSERT
+public.bugsubscriptionfilter            = SELECT, INSERT
+public.bugsubscriptionfilterstatus      = SELECT, INSERT
+public.bugsubscriptionfilterimportance  = SELECT, INSERT
+public.bugsubscriptionfiltertag         = SELECT, INSERT
 public.bugnomination                    = SELECT
 public.bug                              = SELECT, INSERT, UPDATE
 public.bugactivity                      = SELECT, INSERT
@@ -1545,6 +1575,10 @@
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
 public.bugjob                           = SELECT, INSERT
 public.bugsubscription                  = SELECT, INSERT
+public.bugsubscriptionfilter            = SELECT, INSERT
+public.bugsubscriptionfilterstatus      = SELECT, INSERT
+public.bugsubscriptionfilterimportance  = SELECT, INSERT
+public.bugsubscriptionfiltertag         = SELECT, INSERT
 public.bugnotification                  = SELECT, INSERT
 public.bugnotificationattachment        = SELECT
 public.bugnotificationrecipient         = SELECT, INSERT
@@ -1553,6 +1587,10 @@
 public.bugtask                          = SELECT, INSERT, UPDATE
 public.bugmessage                       = SELECT, INSERT
 public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilter            = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilterstatus      = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfilterimportance  = SELECT, INSERT, UPDATE, DELETE
+public.bugsubscriptionfiltertag         = SELECT, INSERT, UPDATE, DELETE
 public.bugtracker                       = SELECT, INSERT
 public.bugtrackeralias                  = SELECT, INSERT
 public.bugwatch                         = SELECT, INSERT
@@ -1812,6 +1850,10 @@
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
 public.bugsubscription                  = SELECT, INSERT
+public.bugsubscriptionfilter            = SELECT, INSERT
+public.bugsubscriptionfilterstatus      = SELECT, INSERT
+public.bugsubscriptionfilterimportance  = SELECT, INSERT
+public.bugsubscriptionfiltertag         = SELECT, INSERT
 public.bugmessage                       = SELECT, INSERT
 public.sourcepackagename                = SELECT
 public.job                              = SELECT, INSERT, UPDATE
@@ -1839,6 +1881,10 @@
 public.bug                              = SELECT, UPDATE
 public.bugattachment                    = SELECT, DELETE
 public.bugsubscription                  = SELECT
+public.bugsubscriptionfilter            = SELECT
+public.bugsubscriptionfilterstatus      = SELECT
+public.bugsubscriptionfilterimportance  = SELECT
+public.bugsubscriptionfiltertag         = SELECT
 public.bugaffectsperson                 = SELECT
 public.bugnotification                  = SELECT, DELETE
 public.bugnotificationrecipientarchive  = SELECT

=== modified file 'lib/canonical/launchpad/emailtemplates/build-request.txt'
--- lib/canonical/launchpad/emailtemplates/build-request.txt	2010-07-30 16:24:59 +0000
+++ lib/canonical/launchpad/emailtemplates/build-request.txt	2010-09-23 11:12:49 +0000
@@ -4,4 +4,5 @@
  * Distroseries: %(distroseries)s
  * Duration: %(duration)s
  * Build Log: %(log_url)s
+ * Upload Log: %(upload_log_url)s
  * Builder: %(builder_url)s

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-08-31 11:11:09 +0000
+++ lib/lp/bugs/browser/bug.py	2010-09-23 11:12:49 +0000
@@ -299,7 +299,7 @@
 
     def unlinkcve(self):
         """Return 'Remove CVE link' Link."""
-        enabled = bool(self.context.bug.cves)
+        enabled = self.context.bug.has_cves
         text = 'Remove CVE link'
         return Link('+unlinkcve', text, icon='remove', enabled=enabled)
 
@@ -307,31 +307,30 @@
         """Return the 'Offer mentorship' Link."""
         text = 'Offer mentorship'
         user = getUtility(ILaunchBag).user
-        enabled = self.context.bug.canMentor(user)
+        enabled = False
         return Link('+mentor', text, icon='add', enabled=enabled)
 
     def retractmentoring(self):
         """Return the 'Retract mentorship' Link."""
         text = 'Retract mentorship'
         user = getUtility(ILaunchBag).user
-        # We should really only allow people to retract mentoring if the
-        # bug's open and the user's already a mentor.
-        if user and not self.context.bug.is_complete:
-            enabled = self.context.bug.isMentor(user)
-        else:
-            enabled = False
+        enabled = False
         return Link('+retractmentoring', text, icon='remove', enabled=enabled)
 
+    @property
+    def _bug_question(self):
+        return self.context.bug.getQuestionCreatedFromBug()
+
     def createquestion(self):
         """Create a question from this bug."""
         text = 'Convert to a question'
-        enabled = self.context.bug.getQuestionCreatedFromBug() is None
+        enabled = self._bug_question is None
         return Link('+create-question', text, enabled=enabled, icon='add')
 
     def removequestion(self):
         """Remove the created question from this bug."""
         text = 'Convert back to a bug'
-        enabled = self.context.bug.getQuestionCreatedFromBug() is not None
+        enabled = self._bug_question is not None
         return Link('+remove-question', text, enabled=enabled, icon='remove')
 
     def activitylog(self):
@@ -510,29 +509,36 @@
         else:
             return 'subscribed-false %s' % dup_class
 
+    @cachedproperty
+    def _bug_attachments(self):
+        """Get a dict of attachment type -> attachments list."""
+        # Note that this is duplicated with get_comments_for_bugtask
+        # if you are looking to consolidate things.
+        result = {BugAttachmentType.PATCH: [],
+                  'other': []
+        }
+        for attachment in self.context.attachments_unpopulated:
+            info = {
+                'attachment': attachment,
+                'file': ProxiedLibraryFileAlias(
+                    attachment.libraryfile, attachment),
+                }
+            if attachment.type == BugAttachmentType.PATCH:
+                key = attachment.type
+            else:
+                key = 'other'
+            result[key].append(info)
+        return result
+
     @property
     def regular_attachments(self):
         """The list of bug attachments that are not patches."""
-        return [
-            {
-                'attachment': attachment,
-                'file': ProxiedLibraryFileAlias(
-                    attachment.libraryfile, attachment),
-                }
-            for attachment in self.context.attachments_unpopulated
-            if attachment.type != BugAttachmentType.PATCH]
+        return self._bug_attachments['other']
 
     @property
     def patches(self):
         """The list of bug attachments that are patches."""
-        return [
-            {
-                'attachment': attachment,
-                'file': ProxiedLibraryFileAlias(
-                    attachment.libraryfile, attachment),
-                }
-            for attachment in self.context.attachments_unpopulated
-            if attachment.type == BugAttachmentType.PATCH]
+        return self._bug_attachments[BugAttachmentType.PATCH]
 
 
 class BugView(LaunchpadView, BugViewMixin):

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-09-09 17:02:33 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-09-23 11:12:49 +0000
@@ -921,6 +921,9 @@
         This is particularly useful for views that may render a
         NullBugTask.
         """
+        if self.context.id is not None:
+            # Fast path for real bugtasks: they have a DB id.
+            return True
         params = BugTaskSearchParams(user=self.user, bug=self.context.bug)
         matching_bugtasks = self.context.target.searchTasks(params)
         if self.context.productseries is not None:
@@ -1194,14 +1197,14 @@
     @property
     def official_tags(self):
         """The list of official tags for this bug."""
-        target_official_tags = self.context.target.official_bug_tags
+        target_official_tags = set(self.context.bug.official_tags)
         return [tag for tag in self.context.bug.tags
                 if tag in target_official_tags]
 
     @property
     def unofficial_tags(self):
         """The list of unofficial tags for this bug."""
-        target_official_tags = self.context.target.official_bug_tags
+        target_official_tags = set(self.context.bug.official_tags)
         return [tag for tag in self.context.bug.tags
                 if tag not in target_official_tags]
 
@@ -1213,11 +1216,10 @@
         bug has a task. It is returned as Javascript snippet, to be embedded
         in the bug page.
         """
-        available_tags = set()
-        for task in self.context.bug.bugtasks:
-            available_tags.update(task.target.official_bug_tags)
-        return 'var available_official_tags = %s;' % dumps(list(sorted(
-            available_tags)))
+        # Unwrap the security proxy. - official_tags is a security proxy
+        # wrapped list.
+        available_tags = list(self.context.bug.official_tags)
+        return 'var available_official_tags = %s;' % dumps(available_tags)
 
     @property
     def user_is_admin(self):
@@ -3247,6 +3249,7 @@
         """Cache the list of bugtasks and set up the release mapping."""
         # Cache some values, so that we don't have to recalculate them
         # for each bug task.
+        # This query is redundant: the publisher also queries all the bugtasks.
         self.bugtasks = list(self.context.bugtasks)
         self.many_bugtasks = len(self.bugtasks) >= 10
         self.cached_milestone_source = CachedMilestoneSourceFactory()
@@ -3338,7 +3341,6 @@
 
         upstream_tasks.sort(key=_by_targetname)
         distro_tasks.sort(key=_by_targetname)
-
         all_bugtasks = upstream_tasks + distro_tasks
 
         # Cache whether the bug was converted to a question, since
@@ -3402,7 +3404,7 @@
         # Hide the links when the bug is viewed in a CVE context
         return self.request.getNearest(ICveSet) == (None, None)
 
-    @property
+    @cachedproperty
     def current_user_affected_status(self):
         """Is the current user marked as affected by this bug?"""
         return self.context.isUserAffected(self.user)
@@ -3623,10 +3625,11 @@
 
         return items
 
-    @property
+    @cachedproperty
     def target_has_milestones(self):
         """Are there any milestones we can target?"""
-        return list(MilestoneVocabulary(self.context)) != []
+        return MilestoneVocabulary.getMilestoneTarget(
+            self.context).has_milestones
 
     def bugtask_canonical_url(self):
         """Return the canonical url for the bugtask."""

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2010-09-06 15:14:17 +0000
+++ lib/lp/bugs/browser/configure.zcml	2010-09-23 11:12:49 +0000
@@ -531,6 +531,11 @@
             permission="launchpad.View"
             name="+activity"
             template="../templates/bug-activity.pt"/>
+        <browser:url
+            for="lp.bugs.interfaces.bugactivity.IBugActivity"
+            path_expression="string:activity"
+            attribute_to_parent="bug"
+            rootsite="bugs"/>
         <browser:page
             for="lp.bugs.interfaces.bugtask.IBugTask"
             class="lp.bugs.browser.bugtask.BugTaskTableRowView"

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2010-09-01 01:57:37 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-09-23 11:12:49 +0000
@@ -28,6 +28,7 @@
     setUp,
     tearDown,
     )
+from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import LaunchpadFunctionalLayer
 from lp.bugs.browser import bugtask
@@ -37,11 +38,8 @@
     BugTasksAndNominationsView,
     )
 from lp.bugs.interfaces.bugtask import BugTaskStatus
-from lp.testing import (
-    person_logged_in,
-    StormStatementRecorder,
-    TestCaseWithFactory,
-    )
+from lp.testing import TestCaseWithFactory
+from lp.testing._webservice import QueryCollector
 from lp.testing.matchers import HasQueryCount
 from lp.testing.sampledata import (
     ADMIN_EMAIL,
@@ -54,16 +52,6 @@
 
     layer = LaunchpadFunctionalLayer
 
-    def record_view_initialization(self, bugtask, person):
-        self.invalidate_caches(bugtask)
-        # Login first because logging in triggers queries.
-        with nested(person_logged_in(person), StormStatementRecorder()) as (
-            _,
-            recorder):
-            view = BugTaskView(bugtask, LaunchpadTestRequest())
-            view.initialize()
-        return recorder
-
     def invalidate_caches(self, obj):
         store = Store.of(obj)
         # Make sure everything is in the database.
@@ -72,24 +60,31 @@
         # the domain objects)
         store.invalidate()
 
-    def test_query_counts_constant_with_team_memberships(self):
+    def test_rendered_query_counts_constant_with_team_memberships(self):
         login(ADMIN_EMAIL)
         bugtask = self.factory.makeBugTask()
-        person_no_teams = self.factory.makePerson()
-        person_with_teams = self.factory.makePerson()
+        person_no_teams = self.factory.makePerson(password='test')
+        person_with_teams = self.factory.makePerson(password='test')
         for _ in range(10):
             self.factory.makeTeam(members=[person_with_teams])
         # count with no teams
-        recorder = self.record_view_initialization(bugtask, person_no_teams)
-        self.assertThat(recorder, HasQueryCount(LessThan(14)))
+        url = canonical_url(bugtask)
+        recorder = QueryCollector()
+        recorder.register()
+        self.addCleanup(recorder.unregister)
+        self.invalidate_caches(bugtask)
+        self.getUserBrowser(url, person_no_teams)
+        # This may seem large: it is; there is easily another 30% fat in there.
+        self.assertThat(recorder, HasQueryCount(LessThan(64)))
         count_with_no_teams = recorder.count
         # count with many teams
-        recorder2 = self.record_view_initialization(bugtask, person_with_teams)
+        self.invalidate_caches(bugtask)
+        self.getUserBrowser(url, person_with_teams)
         # Allow an increase of one because storm bug 619017 causes additional
         # queries, revalidating things unnecessarily. An increase which is
         # less than the number of new teams shows it is definitely not
         # growing per-team.
-        self.assertThat(recorder2, HasQueryCount(
+        self.assertThat(recorder, HasQueryCount(
             LessThan(count_with_no_teams + 3),
             ))
 
@@ -105,23 +100,32 @@
         self.view = BugTasksAndNominationsView(
             self.bug, LaunchpadTestRequest())
 
+    def refresh(self):
+        # The view caches, to see different scenarios, a refresh is needed.
+        self.view = BugTasksAndNominationsView(
+            self.bug, LaunchpadTestRequest())
+
     def test_current_user_affected_status(self):
         self.failUnlessEqual(
             None, self.view.current_user_affected_status)
-        self.view.context.markUserAffected(self.view.user, True)
+        self.bug.markUserAffected(self.view.user, True)
+        self.refresh()
         self.failUnlessEqual(
             True, self.view.current_user_affected_status)
-        self.view.context.markUserAffected(self.view.user, False)
+        self.bug.markUserAffected(self.view.user, False)
+        self.refresh()
         self.failUnlessEqual(
             False, self.view.current_user_affected_status)
 
     def test_current_user_affected_js_status(self):
         self.failUnlessEqual(
             'null', self.view.current_user_affected_js_status)
-        self.view.context.markUserAffected(self.view.user, True)
+        self.bug.markUserAffected(self.view.user, True)
+        self.refresh()
         self.failUnlessEqual(
             'true', self.view.current_user_affected_js_status)
-        self.view.context.markUserAffected(self.view.user, False)
+        self.bug.markUserAffected(self.view.user, False)
+        self.refresh()
         self.failUnlessEqual(
             'false', self.view.current_user_affected_js_status)
 
@@ -148,10 +152,12 @@
         # logged-in user marked him or herself as affected or not.
         self.failUnlessEqual(
             1, self.view.other_users_affected_count)
-        self.view.context.markUserAffected(self.view.user, True)
+        self.bug.markUserAffected(self.view.user, True)
+        self.refresh()
         self.failUnlessEqual(
             1, self.view.other_users_affected_count)
-        self.view.context.markUserAffected(self.view.user, False)
+        self.bug.markUserAffected(self.view.user, False)
+        self.refresh()
         self.failUnlessEqual(
             1, self.view.other_users_affected_count)
 
@@ -161,17 +167,18 @@
         self.failUnlessEqual(
             1, self.view.other_users_affected_count)
         other_user_1 = self.factory.makePerson()
-        self.view.context.markUserAffected(other_user_1, True)
+        self.bug.markUserAffected(other_user_1, True)
         self.failUnlessEqual(
             2, self.view.other_users_affected_count)
         other_user_2 = self.factory.makePerson()
-        self.view.context.markUserAffected(other_user_2, True)
+        self.bug.markUserAffected(other_user_2, True)
         self.failUnlessEqual(
             3, self.view.other_users_affected_count)
-        self.view.context.markUserAffected(other_user_1, False)
+        self.bug.markUserAffected(other_user_1, False)
         self.failUnlessEqual(
             2, self.view.other_users_affected_count)
-        self.view.context.markUserAffected(self.view.user, True)
+        self.bug.markUserAffected(self.view.user, True)
+        self.refresh()
         self.failUnlessEqual(
             2, self.view.other_users_affected_count)
 

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-09-10 16:21:21 +0000
+++ lib/lp/bugs/configure.zcml	2010-09-23 11:12:49 +0000
@@ -191,6 +191,7 @@
                     date_fix_released
                     date_left_closed
                     date_closed
+                    productseriesID
                     task_age
                     bug_subscribers
                     is_complete
@@ -592,6 +593,7 @@
                     isMentor
                     getNullBugTask
                     is_complete
+                    official_tags
                     who_made_private
                     date_made_private
                     userCanView
@@ -624,6 +626,7 @@
                     initial_message
                     linked_branches
                     watches
+                    has_cves
                     cves
                     cve_links
                     duplicates

=== modified file 'lib/lp/bugs/doc/bugsubscription.txt'
--- lib/lp/bugs/doc/bugsubscription.txt	2010-09-09 21:00:54 +0000
+++ lib/lp/bugs/doc/bugsubscription.txt	2010-09-23 11:12:49 +0000
@@ -49,7 +49,7 @@
     >>> personset = getUtility(IPersonSet)
 
     >>> linux_source = ubuntu.getSourcePackage("linux-source-2.6.15")
-    >>> linux_source.bug_subscriptions
+    >>> list(linux_source.bug_subscriptions)
     []
     >>> print linux_source.distribution.bug_supervisor
     None
@@ -781,7 +781,7 @@
 contacts:
 
     >>> evolution = ubuntu.getSourcePackage("evolution")
-    >>> evolution.bug_subscriptions
+    >>> list(evolution.bug_subscriptions)
     []
 
     >>> params = CreateBugParams(

=== modified file 'lib/lp/bugs/doc/initial-bug-contacts.txt'
--- lib/lp/bugs/doc/initial-bug-contacts.txt	2010-08-20 01:29:08 +0000
+++ lib/lp/bugs/doc/initial-bug-contacts.txt	2010-09-23 11:12:49 +0000
@@ -16,7 +16,7 @@
     >>> debian = getUtility(IDistributionSet).getByName("debian")
     >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")
 
-    >>> debian_firefox.bug_subscriptions
+    >>> list(debian_firefox.bug_subscriptions)
     []
 
 Adding a package subscription is done with the

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2010-08-30 23:50:41 +0000
+++ lib/lp/bugs/interfaces/bug.py	2010-09-23 11:12:49 +0000
@@ -70,6 +70,7 @@
     )
 from canonical.launchpad.validators.name import name_validator
 from lp.app.errors import NotFoundError
+from lp.bugs.interfaces.bugactivity import IBugActivity
 from lp.bugs.interfaces.bugattachment import IBugAttachment
 from lp.bugs.interfaces.bugbranch import IBugBranch
 from lp.bugs.interfaces.bugtask import (
@@ -243,7 +244,11 @@
              required=False, default=False, readonly=True))
     displayname = TextLine(title=_("Text of the form 'Bug #X"),
         readonly=True)
-    activity = Attribute('SQLObject.Multijoin of IBugActivity')
+    activity = exported(
+        CollectionField(
+            title=_('Log of activity that has occurred on this bug.'),
+            value_type=Reference(schema=IBugActivity),
+            readonly=True))
     initial_message = Attribute(
         "The message that was specified when creating the bug")
     bugtasks = exported(
@@ -269,6 +274,7 @@
             title=_('CVE entries related to this bug.'),
             value_type=Reference(schema=ICve),
             readonly=True))
+    has_cves = Bool(title=u"True if the bug has cve entries.")
     cve_links = Attribute('Links between this bug and CVE entries.')
     subscriptions = exported(
         doNotSnapshot(CollectionField(
@@ -406,6 +412,8 @@
 
     latest_patch = Attribute("The most recent patch of this bug.")
 
+    official_tags = Attribute("The official bug tags relevant to this bug.")
+
     @operation_parameters(
         subject=optional_message_subject_field(),
         content=copy_field(IMessage['content']))

=== modified file 'lib/lp/bugs/interfaces/bugactivity.py'
--- lib/lp/bugs/interfaces/bugactivity.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/interfaces/bugactivity.py	2010-09-23 11:12:49 +0000
@@ -15,24 +15,59 @@
 from zope.interface import Interface
 from zope.schema import (
     Datetime,
-    Int,
     Text,
     TextLine,
     )
 
+from lazr.restful.declarations import (
+    export_as_webservice_entry,
+    exported,
+    )
+
+from lp.services.fields import (
+    BugField,
+    PersonChoice,
+    )
+
 from canonical.launchpad import _
 
 
 class IBugActivity(Interface):
     """A log of all things that have happened to a bug."""
-
-    bug = Int(title=_('Bug ID'))
-    datechanged = Datetime(title=_('Date Changed'))
-    person = Int(title=_('Person'))
-    whatchanged = TextLine(title=_('What Changed'))
-    oldvalue = TextLine(title=_('Old Value'))
-    newvalue = TextLine(title=_('New Value'))
-    message = Text(title=_('Message'))
+    export_as_webservice_entry()
+
+    bug = exported(
+        BugField(title=_('Bug'), readonly=True))
+
+    datechanged = exported(
+        Datetime(title=_('Date Changed'),
+                 description=_("The date on which this activity occurred."),
+                 readonly=True))
+
+    person = exported(PersonChoice(
+        title=_('Person'), required=True, vocabulary='ValidPersonOrTeam',
+        readonly=True, description=_("The person's Launchpad ID or "
+        "e-mail address.")))
+
+    whatchanged = exported(
+        TextLine(title=_('What Changed'),
+                 description=_("The property of the bug that changed."),
+                 readonly=True))
+
+    oldvalue = exported(
+        TextLine(title=_('Old Value'),
+                 description=_("The value before the change."),
+                 readonly=True))
+
+    newvalue = exported(
+        TextLine(title=_('New Value'),
+                 description=_("The value after the change."),
+                 readonly=True))
+
+    message = exported(
+        Text(title=_('Message'),
+             description=_("Additional information about what changed."),
+             readonly=True))
 
 
 class IBugActivitySet(Interface):

=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
--- lib/lp/bugs/interfaces/bugtarget.py	2010-08-26 20:22:48 +0000
+++ lib/lp/bugs/interfaces/bugtarget.py	2010-09-23 11:12:49 +0000
@@ -363,6 +363,9 @@
         bugs will be returned.
         """
 
+    def _getOfficialTagClause():
+        """Get the storm clause for finding this targets tags."""
+
 
 class IOfficialBugTagTargetPublic(IHasOfficialBugTags):
     """Public attributes for `IOfficialBugTagTarget`."""

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-08-30 19:30:45 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-09-23 11:12:49 +0000
@@ -454,6 +454,7 @@
         title=_('Project'), required=False, vocabulary='Product')
     productseries = Choice(
         title=_('Series'), required=False, vocabulary='ProductSeries')
+    productseriesID = Attribute('The product series ID')
     sourcepackagename = Choice(
         title=_("Package"), required=False,
         vocabulary='SourcePackageName')

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2010-09-15 23:40:13 +0000
+++ lib/lp/bugs/model/bug.py	2010-09-23 11:12:49 +0000
@@ -70,6 +70,7 @@
     implements,
     providedBy,
     )
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
@@ -161,6 +162,7 @@
     get_bug_privacy_filter,
     NullBugTask,
     )
+from lp.bugs.model.bugtarget import OfficialBugTag
 from lp.bugs.model.bugwatch import BugWatch
 from lp.hardwaredb.interfaces.hwdb import IHWSubmissionBugSet
 from lp.registry.enum import BugNotificationLevel
@@ -191,6 +193,7 @@
 from lp.services.propertycache import (
     cachedproperty,
     IPropertyCache,
+    IPropertyCacheManager,
     )
 
 
@@ -348,6 +351,21 @@
     heat_last_updated = UtcDateTimeCol(default=None)
     latest_patch_uploaded = UtcDateTimeCol(default=None)
 
+    @cachedproperty
+    def _subscriber_cache(self):
+        """Caches known subscribers."""
+        return set()
+
+    @cachedproperty
+    def _subscriber_dups_cache(self):
+        """Caches known subscribers to dupes."""
+        return set()
+
+    @cachedproperty
+    def _unsubscribed_cache(self):
+        """Cache known non-subscribers."""
+        return set()
+
     @property
     def latest_patch(self):
         """See `IBug`."""
@@ -531,7 +549,7 @@
             dn += ' ('+self.name+')'
         return dn
 
-    @property
+    @cachedproperty
     def bugtasks(self):
         """See `IBug`."""
         result = BugTask.select('BugTask.bug = %s' % sqlvalues(self.id))
@@ -541,7 +559,8 @@
         # Do not use the default orderBy as the prejoins cause ambiguities
         # across the tables.
         result = result.orderBy("id")
-        return sorted(result, key=bugtask_sort_key)
+        result = sorted(result, key=bugtask_sort_key)
+        return result
 
     @property
     def default_bugtask(self):
@@ -665,6 +684,33 @@
             BugMessage.message == Message.id).order_by('id')
         return messages.first()
 
+    @cachedproperty
+    def official_tags(self):
+        """See `IBug`."""
+        # Da circle of imports forces the locals.
+        from lp.registry.model.distribution import Distribution
+        from lp.registry.model.product import Product
+        table = OfficialBugTag
+        table = LeftJoin(
+            table,
+            Distribution,
+            OfficialBugTag.distribution_id==Distribution.id)
+        table = LeftJoin(
+            table,
+            Product,
+            OfficialBugTag.product_id==Product.id)
+        # When this method is typically called it already has the necessary
+        # info in memory, so rather than rejoin with Product etc, we do this
+        # bit in Python. If reviewing performance here feel free to change.
+        clauses = []
+        for task in self.bugtasks:
+            clauses.append(
+                # Storm cannot compile proxied objects.
+                removeSecurityProxy(task.target._getOfficialTagClause()))
+        clause = Or(*clauses)
+        return list(Store.of(self).using(table).find(OfficialBugTag.tag,
+            clause).order_by(OfficialBugTag.tag).config(distinct=True))
+
     def followup_subject(self):
         """See `IBug`."""
         return 'Re: '+ self.title
@@ -698,6 +744,8 @@
 
     def unsubscribe(self, person, unsubscribed_by):
         """See `IBug`."""
+        # Drop cached subscription info.
+        IPropertyCacheManager(self).clear()
         if person is None:
             person = unsubscribed_by
 
@@ -737,21 +785,11 @@
 
     def isSubscribed(self, person):
         """See `IBug`."""
-        if person is None:
-            return False
-
-        bs = BugSubscription.selectBy(bug=self, person=person)
-        return bool(bs)
+        return self.personIsDirectSubscriber(person)
 
     def isSubscribedToDupes(self, person):
         """See `IBug`."""
-        if person is None:
-            return False
-
-        return bool(
-            BugSubscription.select("""
-                bug IN (SELECT id FROM Bug WHERE duplicateof = %d) AND
-                person = %d""" % (self.id, person.id)))
+        return self.personIsSubscribedToDuplicate(person)
 
     def getDirectSubscriptions(self):
         """See `IBug`."""
@@ -868,9 +906,23 @@
     def getSubscribersForPerson(self, person):
         """See `IBug."""
         assert person is not None
-        return Store.of(self).find(
-            # return people
-            Person,
+        def cache_unsubscribed(rows):
+            if not rows:
+                self._unsubscribed_cache.add(person)
+        def cache_subscriber(row):
+            _, subscriber, subscription = row
+            if subscription.bugID == self.id:
+                self._subscriber_cache.add(subscriber)
+            else:
+                self._subscriber_dups_cache.add(subscriber)
+            return subscriber
+        return DecoratedResultSet(Store.of(self).find(
+            # XXX: RobertCollins 2010-09-22 bug=374777: This SQL(...) is a
+            # hack; it does not seem to be possible to express DISTINCT ON
+            # with Storm.
+            (SQL("DISTINCT ON (Person.name, BugSubscription.person) 0 AS ignore"),
+             # return people and subscribptions
+             Person, BugSubscription),
             # For this bug or its duplicates
             Or(
                 Bug.id == self.id,
@@ -890,7 +942,8 @@
             # bug=https://bugs.edge.launchpad.net/storm/+bug/627137
             # RBC 20100831
             SQL("""Person.id = TeamParticipation.team"""),
-            ).order_by(Person.name).config(distinct=True)
+            ).order_by(Person.name),
+            cache_subscriber, pre_iter_hook=cache_unsubscribed)
 
     def getAlsoNotifiedSubscribers(self, recipients=None, level=None):
         """See `IBug`.
@@ -1216,6 +1269,11 @@
             notify(ObjectDeletedEvent(bug_branch, user=user))
             bug_branch.destroySelf()
 
+    @cachedproperty
+    def has_cves(self):
+        """See `IBug`."""
+        return bool(self.cves)
+
     def linkCVE(self, cve, user):
         """See `IBug`."""
         if cve not in self.cves:
@@ -1314,18 +1372,23 @@
         question_target = IQuestionTarget(bugtask.target)
         question = question_target.createQuestionFromBug(self)
         self.addChange(BugConvertedToQuestion(UTC_NOW, person, question))
+        IPropertyCache(self)._question_from_bug = question
 
         notify(BugBecameQuestionEvent(self, question, person))
         return question
 
-    def getQuestionCreatedFromBug(self):
-        """See `IBug`."""
+    @cachedproperty
+    def _question_from_bug(self):
         for question in self.questions:
-            if (question.owner == self.owner
+            if (question.ownerID == self.ownerID
                 and question.datecreated == self.datecreated):
                 return question
         return None
 
+    def getQuestionCreatedFromBug(self):
+        """See `IBug`."""
+        return self._question_from_bug
+
     def canMentor(self, user):
         """See `ICanBeMentored`."""
         if user is None:
@@ -1624,10 +1687,13 @@
 
     def _getTags(self):
         """Get the tags as a sorted list of strings."""
-        tags = [
-            bugtag.tag
-            for bugtag in BugTag.selectBy(bug=self, orderBy='tag')]
-        return tags
+        return self._cached_tags
+
+    @cachedproperty
+    def _cached_tags(self):
+        return list(Store.of(self).find(
+            BugTag.tag,
+            BugTag.bugID==self.id).order_by(BugTag.tag))
 
     def _setTags(self, tags):
         """Set the tags from a list of strings."""
@@ -1635,6 +1701,7 @@
         # and insert the new ones.
         new_tags = set([tag.lower() for tag in tags])
         old_tags = set(self.tags)
+        del IPropertyCache(self)._cached_tags
         added_tags = new_tags.difference(old_tags)
         removed_tags = old_tags.difference(new_tags)
         for removed_tag in removed_tags:
@@ -1782,12 +1849,17 @@
 
     def personIsDirectSubscriber(self, person):
         """See `IBug`."""
+        if person in self._subscriber_cache:
+            return True
+        if person in self._unsubscribed_cache:
+            return False
+        if person is None:
+            return False
         store = Store.of(self)
         subscriptions = store.find(
             BugSubscription,
             BugSubscription.bug == self,
             BugSubscription.person == person)
-
         return not subscriptions.is_empty()
 
     def personIsAlsoNotifiedSubscriber(self, person):
@@ -1803,6 +1875,12 @@
 
     def personIsSubscribedToDuplicate(self, person):
         """See `IBug`."""
+        if person in self._subscriber_dups_cache:
+            return True
+        if person in self._unsubscribed_cache:
+            return False
+        if person is None:
+            return False
         store = Store.of(self)
         subscriptions_from_dupes = store.find(
             BugSubscription,
@@ -2012,13 +2090,13 @@
 
         # Create the task on a product if one was passed.
         if params.product:
-            BugTaskSet().createTask(
+            getUtility(IBugTaskSet).createTask(
                 bug=bug, product=params.product, owner=params.owner,
                 status=params.status)
 
         # Create the task on a source package name if one was passed.
         if params.distribution:
-            BugTaskSet().createTask(
+            getUtility(IBugTaskSet).createTask(
                 bug=bug, distribution=params.distribution,
                 sourcepackagename=params.sourcepackagename,
                 owner=params.owner, status=params.status)

=== added file 'lib/lp/bugs/model/bugsubscriptionfilter.py'
--- lib/lp/bugs/model/bugsubscriptionfilter.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilter.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,36 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0611,W0212
+
+__metaclass__ = type
+__all__ = ['BugSubscriptionFilter']
+
+from storm.base import Storm
+from storm.locals import (
+    Bool,
+    Int,
+    Reference,
+    Unicode,
+    )
+
+
+class BugSubscriptionFilter(Storm):
+    """A filter to specialize a *structural* subscription."""
+
+    __storm_table__ = "BugSubscriptionFilter"
+
+    id = Int(primary=True)
+
+    structural_subscription_id = Int(
+        "structuralsubscription", allow_none=False)
+    structural_subscription = Reference(
+        structural_subscription_id, "StructuralSubscription.id")
+
+    find_all_tags = Bool(allow_none=False, default=False)
+    include_any_tags = Bool(allow_none=False, default=False)
+    exclude_any_tags = Bool(allow_none=False, default=False)
+
+    other_parameters = Unicode()
+
+    description = Unicode()

=== added file 'lib/lp/bugs/model/bugsubscriptionfilterimportance.py'
--- lib/lp/bugs/model/bugsubscriptionfilterimportance.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilterimportance.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,29 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0611,W0212
+
+__metaclass__ = type
+__all__ = ['BugSubscriptionFilterImportance']
+
+from storm.base import Storm
+from storm.locals import (
+    Int,
+    Reference,
+    )
+
+from canonical.database.enumcol import DBEnum
+from lp.bugs.interfaces.bugtask import BugTaskImportance
+
+
+class BugSubscriptionFilterImportance(Storm):
+    """Importances to filter."""
+
+    __storm_table__ = "BugSubscriptionFilterImportance"
+
+    id = Int(primary=True)
+
+    filter_id = Int("filter", allow_none=False)
+    filter = Reference(filter_id, "BugSubscriptionFilter.id")
+
+    importance = DBEnum(enum=BugTaskImportance, allow_none=False)

=== added file 'lib/lp/bugs/model/bugsubscriptionfilterstatus.py'
--- lib/lp/bugs/model/bugsubscriptionfilterstatus.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilterstatus.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,29 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0611,W0212
+
+__metaclass__ = type
+__all__ = ['BugSubscriptionFilterStatus']
+
+from storm.base import Storm
+from storm.locals import (
+    Int,
+    Reference,
+    )
+
+from canonical.database.enumcol import DBEnum
+from lp.bugs.interfaces.bugtask import BugTaskStatus
+
+
+class BugSubscriptionFilterStatus(Storm):
+    """Statuses to filter."""
+
+    __storm_table__ = "BugSubscriptionFilterStatus"
+
+    id = Int(primary=True)
+
+    filter_id = Int("filter", allow_none=False)
+    filter = Reference(filter_id, "BugSubscriptionFilter.id")
+
+    status = DBEnum(enum=BugTaskStatus, allow_none=False)

=== added file 'lib/lp/bugs/model/bugsubscriptionfiltertag.py'
--- lib/lp/bugs/model/bugsubscriptionfiltertag.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/bugsubscriptionfiltertag.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,29 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0611,W0212
+
+__metaclass__ = type
+__all__ = ['BugSubscriptionFilterTag']
+
+from storm.base import Storm
+from storm.locals import (
+    Bool,
+    Int,
+    Reference,
+    Unicode,
+    )
+
+
+class BugSubscriptionFilterTag(Storm):
+    """Tags to filter."""
+
+    __storm_table__ = "BugSubscriptionFilterTag"
+
+    id = Int(primary=True)
+
+    filter_id = Int("filter", allow_none=False)
+    filter = Reference(filter_id, "BugSubscriptionFilter.id")
+
+    include = Bool(allow_none=False)
+    tag = Unicode(allow_none=False)

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2010-09-02 22:08:12 +0000
+++ lib/lp/bugs/model/bugtarget.py	2010-09-23 11:12:49 +0000
@@ -338,22 +338,26 @@
 
     Using this call in ProjectGroup requires a fix of bug 341203, see
     below, class OfficialBugTag.
+
+    See also `Bug.official_bug_tags` which calculates this efficiently for
+    a single bug.
     """
 
+    def _getOfficialTagClause(self):
+        if IDistribution.providedBy(self):
+            return (OfficialBugTag.distribution == self)
+        elif IProduct.providedBy(self):
+            return (OfficialBugTag.product == self)
+        else:
+            raise AssertionError(
+                '%s is not a valid official bug target' % self)
+
     def _getOfficialTags(self):
         """Get the official bug tags as a sorted list of strings."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        if IDistribution.providedBy(self):
-            target_clause = (OfficialBugTag.distribution == self)
-        elif IProduct.providedBy(self):
-            target_clause = (OfficialBugTag.product == self)
-        else:
-            raise AssertionError(
-                '%s is not a valid official bug target' % self)
-        tags = [
-            obt.tag for obt
-            in store.find(OfficialBugTag, target_clause).order_by('tag')]
-        return tags
+        target_clause = self._getOfficialTagClause()
+        return list(store.find(
+            OfficialBugTag.tag, target_clause).order_by(OfficialBugTag.tag))
 
     def _setOfficialTags(self, tags):
         """Set the official bug tags from a list of strings."""
@@ -374,10 +378,7 @@
         If the tag is not defined for this target, None is returned.
         """
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        if IDistribution.providedBy(self):
-            target_clause = (OfficialBugTag.distribution == self)
-        else:
-            target_clause = (OfficialBugTag.product == self)
+        target_clause = self._getOfficialTagClause()
         return store.find(
             OfficialBugTag, OfficialBugTag.tag==tag, target_clause).one()
 

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-09-09 17:02:33 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-09-23 11:12:49 +0000
@@ -43,7 +43,10 @@
     Or,
     SQL,
     )
-from storm.store import EmptyResultSet
+from storm.store import (
+    EmptyResultSet,
+    Store,
+    )
 from storm.zope.interfaces import (
     IResultSet,
     ISQLObjectResultSet,
@@ -399,6 +402,7 @@
                  sourcepackagename=None, distribution=None,
                  distroseries=None):
         """Initialize a NullBugTask."""
+        self.id = None
         self.bug = bug
         self.product = product
         self.productseries = productseries
@@ -756,11 +760,11 @@
                     conjoined_master = bugtask
                     break
         elif IUpstreamBugTask.providedBy(self):
-            assert self.product.development_focus is not None, (
+            assert self.product.development_focusID is not None, (
                 'A product should always have a development series.')
-            devel_focus = self.product.development_focus
+            devel_focusID = self.product.development_focusID
             for bugtask in bugtasks:
-                if bugtask.productseries == devel_focus:
+                if bugtask.productseriesID == devel_focusID:
                     conjoined_master = bugtask
                     break
 
@@ -2367,7 +2371,11 @@
             bugtask._syncFromConjoinedSlave()
 
         bugtask.updateTargetNameCache()
-
+        del IPropertyCache(bug).bugtasks
+        # Because of block_implicit_flushes, it is possible for a new bugtask
+        # to be queued in appropriately, which leads to Bug.bugtasks not
+        # finding the bugtask.
+        Store.of(bugtask).flush()
         return bugtask
 
     def getStatusCountsForProductSeries(self, user, product_series):

=== added directory 'lib/lp/bugs/model/tests'
=== added file 'lib/lp/bugs/model/tests/__init__.py'
=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,66 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the bugsubscription module."""
+
+__metaclass__ = type
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.testing import DatabaseFunctionalLayer
+from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
+from lp.testing import (
+    login_person,
+    TestCaseWithFactory,
+    )
+
+
+class TestBugSubscriptionFilter(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBugSubscriptionFilter, self).setUp()
+        self.target = self.factory.makeProduct()
+        self.subscriber = self.target.owner
+        login_person(self.subscriber)
+        self.subscription = self.target.addBugSubscription(
+            self.subscriber, self.subscriber)
+
+    def test_basics(self):
+        """Test the basic operation of `BugSubscriptionFilter` objects."""
+        # Create.
+        bug_subscription_filter = BugSubscriptionFilter()
+        bug_subscription_filter.structural_subscription = self.subscription
+        bug_subscription_filter.find_all_tags = True
+        bug_subscription_filter.include_any_tags = True
+        bug_subscription_filter.exclude_any_tags = True
+        bug_subscription_filter.other_parameters = u"foo"
+        bug_subscription_filter.description = u"bar"
+        # Flush and reload.
+        IStore(bug_subscription_filter).flush()
+        IStore(bug_subscription_filter).reload(bug_subscription_filter)
+        # Check.
+        self.assertIsNot(None, bug_subscription_filter.id)
+        self.assertEqual(
+            self.subscription.id,
+            bug_subscription_filter.structural_subscription_id)
+        self.assertEqual(
+            self.subscription,
+            bug_subscription_filter.structural_subscription)
+        self.assertIs(True, bug_subscription_filter.find_all_tags)
+        self.assertIs(True, bug_subscription_filter.include_any_tags)
+        self.assertIs(True, bug_subscription_filter.exclude_any_tags)
+        self.assertEqual(u"foo", bug_subscription_filter.other_parameters)
+        self.assertEqual(u"bar", bug_subscription_filter.description)
+
+    def test_defaults(self):
+        """Test the default values of `BugSubscriptionFilter` objects."""
+        # Create.
+        bug_subscription_filter = BugSubscriptionFilter()
+        bug_subscription_filter.structural_subscription = self.subscription
+        # Check.
+        self.assertIs(False, bug_subscription_filter.find_all_tags)
+        self.assertIs(False, bug_subscription_filter.include_any_tags)
+        self.assertIs(False, bug_subscription_filter.exclude_any_tags)
+        self.assertIs(None, bug_subscription_filter.other_parameters)
+        self.assertIs(None, bug_subscription_filter.description)

=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,54 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the bugsubscription module."""
+
+__metaclass__ = type
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.testing import DatabaseFunctionalLayer
+from lp.bugs.interfaces.bugtask import BugTaskImportance
+from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
+from lp.bugs.model.bugsubscriptionfilterimportance import (
+    BugSubscriptionFilterImportance,
+    )
+from lp.testing import (
+    login_person,
+    TestCaseWithFactory,
+    )
+
+
+class TestBugSubscriptionFilterImportance(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBugSubscriptionFilterImportance, self).setUp()
+        self.target = self.factory.makeProduct()
+        self.subscriber = self.target.owner
+        login_person(self.subscriber)
+        self.subscription = self.target.addBugSubscription(
+            self.subscriber, self.subscriber)
+        self.subscription_filter = BugSubscriptionFilter()
+        self.subscription_filter.structural_subscription = self.subscription
+
+    def test_basics(self):
+        """Test the basics of `BugSubscriptionFilterImportance` objects."""
+        # Create.
+        bug_sub_filter_importance = BugSubscriptionFilterImportance()
+        bug_sub_filter_importance.filter = self.subscription_filter
+        bug_sub_filter_importance.importance = BugTaskImportance.HIGH
+        # Flush and reload.
+        IStore(bug_sub_filter_importance).flush()
+        IStore(bug_sub_filter_importance).reload(bug_sub_filter_importance)
+        # Check.
+        self.assertIsNot(None, bug_sub_filter_importance.id)
+        self.assertEqual(
+            self.subscription_filter.id,
+            bug_sub_filter_importance.filter_id)
+        self.assertEqual(
+            self.subscription_filter,
+            bug_sub_filter_importance.filter)
+        self.assertEqual(
+            BugTaskImportance.HIGH,
+            bug_sub_filter_importance.importance)

=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,52 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the bugsubscription module."""
+
+__metaclass__ = type
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.testing import DatabaseFunctionalLayer
+from lp.bugs.interfaces.bugtask import BugTaskStatus
+from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
+from lp.bugs.model.bugsubscriptionfilterstatus import (
+    BugSubscriptionFilterStatus,
+    )
+from lp.testing import (
+    login_person,
+    TestCaseWithFactory,
+    )
+
+
+class TestBugSubscriptionFilterStatus(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBugSubscriptionFilterStatus, self).setUp()
+        self.target = self.factory.makeProduct()
+        self.subscriber = self.target.owner
+        login_person(self.subscriber)
+        self.subscription = self.target.addBugSubscription(
+            self.subscriber, self.subscriber)
+        self.subscription_filter = BugSubscriptionFilter()
+        self.subscription_filter.structural_subscription = self.subscription
+
+    def test_basics(self):
+        """Test the basics of `BugSubscriptionFilterStatus` objects."""
+        # Create.
+        bug_sub_filter_status = BugSubscriptionFilterStatus()
+        bug_sub_filter_status.filter = self.subscription_filter
+        bug_sub_filter_status.status = BugTaskStatus.NEW
+        # Flush and reload.
+        IStore(bug_sub_filter_status).flush()
+        IStore(bug_sub_filter_status).reload(bug_sub_filter_status)
+        # Check.
+        self.assertIsNot(None, bug_sub_filter_status.id)
+        self.assertEqual(
+            self.subscription_filter.id,
+            bug_sub_filter_status.filter_id)
+        self.assertEqual(
+            self.subscription_filter,
+            bug_sub_filter_status.filter)
+        self.assertEqual(BugTaskStatus.NEW, bug_sub_filter_status.status)

=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py	2010-09-23 11:12:49 +0000
@@ -0,0 +1,51 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the bugsubscription module."""
+
+__metaclass__ = type
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.testing import DatabaseFunctionalLayer
+from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
+from lp.bugs.model.bugsubscriptionfiltertag import BugSubscriptionFilterTag
+from lp.testing import (
+    login_person,
+    TestCaseWithFactory,
+    )
+
+
+class TestBugSubscriptionFilterTag(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBugSubscriptionFilterTag, self).setUp()
+        self.target = self.factory.makeProduct()
+        self.subscriber = self.target.owner
+        login_person(self.subscriber)
+        self.subscription = self.target.addBugSubscription(
+            self.subscriber, self.subscriber)
+        self.subscription_filter = BugSubscriptionFilter()
+        self.subscription_filter.structural_subscription = self.subscription
+
+    def test_basics(self):
+        """Test the basics of `BugSubscriptionFilterTag` objects."""
+        # Create.
+        bug_sub_filter_tag = BugSubscriptionFilterTag()
+        bug_sub_filter_tag.filter = self.subscription_filter
+        bug_sub_filter_tag.include = True
+        bug_sub_filter_tag.tag = u"foo"
+        # Flush and reload.
+        IStore(bug_sub_filter_tag).flush()
+        IStore(bug_sub_filter_tag).reload(bug_sub_filter_tag)
+        # Check.
+        self.assertIsNot(None, bug_sub_filter_tag.id)
+        self.assertEqual(
+            self.subscription_filter.id,
+            bug_sub_filter_tag.filter_id)
+        self.assertEqual(
+            self.subscription_filter,
+            bug_sub_filter_tag.filter)
+        self.assertIs(True, bug_sub_filter_tag.include)
+        self.assertEqual(u"foo", bug_sub_filter_tag.tag)

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-09-03 20:28:36 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-09-23 11:12:49 +0000
@@ -18,6 +18,7 @@
   15
   >>> bug_entries = sorted(bugs['entries'], key=itemgetter('id'))
   >>> pprint_entry(bug_entries[0])
+  activity_collection_link: u'http://.../bugs/11/activity'
   attachments_collection_link: u'http://.../bugs/11/attachments'
   bug_tasks_collection_link: u'http://.../bugs/11/bug_tasks'
   bug_watches_collection_link: u'http://.../bugs/11/bug_watches'
@@ -2084,3 +2085,33 @@
     Traceback (most recent call last):
     ...
     NameError: name 'can_expire' is not defined
+
+
+Bug activity
+------------
+
+Each bug has a collection of activities that have taken place with it.
+
+  >>> from lazr.restful.testing.webservice import (
+  ...     pprint_collection, pprint_entry)
+  >>> activity = webservice.get(
+  ...     bug_one['activity_collection_link']).jsonBody()
+  >>> pprint_collection(activity)
+  next_collection_link: u'http://.../bugs/1/activity?ws.start=5&ws.size=5'
+  resource_type_link: u'http://.../#bug_activity-page-resource'
+  start: 0
+  total_size: 26
+  ...
+
+  >>> bug_nine_activity = webservice.get(
+  ...   "/bugs/9/activity").jsonBody()
+  >>> pprint_entry(bug_nine_activity['entries'][1])
+  bug_link: u'http://.../bugs/9'
+  datechanged: u'2006-02-23T16:42:40.288553+00:00'
+  message: None
+  newvalue: u'Confirmed'
+  oldvalue: u'Unconfirmed'
+  person_link: u'http://.../~name12'
+  resource_type_link: u'http://.../#bug_activity'
+  self_link: u'http://.../bugs/9/activity'
+  whatchanged: u'thunderbird: status'

=== modified file 'lib/lp/bugs/templates/bug-portlet-actions.pt'
--- lib/lp/bugs/templates/bug-portlet-actions.pt	2010-08-02 17:49:45 +0000
+++ lib/lp/bugs/templates/bug-portlet-actions.pt	2010-09-23 11:12:49 +0000
@@ -18,8 +18,8 @@
       class="menu-link-mark-dupe">Mark as duplicate</a>
     </span>
     <tal:block
-      tal:condition="context/duplicates"
-      tal:define="number_of_dupes context/duplicates/count"
+      tal:condition="context/number_of_duplicates"
+      tal:define="number_of_dupes context/number_of_duplicates"
     >
     </tal:block>
     <tal:block

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2010-09-22 19:35:18 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2010-09-23 11:12:49 +0000
@@ -195,7 +195,7 @@
           </tal:branches>
         </div><!-- bug-branch-container -->
 
-        <div tal:condition="context/bug/cves" class="cves">
+        <div tal:condition="context/bug/has_cves" class="cves">
           <h2>CVE References</h2>
           <ul>
             <li class="sprite cve" tal:repeat="cve context/bug/cves">

=== modified file 'lib/lp/bugs/tests/has-bug-supervisor.txt'
--- lib/lp/bugs/tests/has-bug-supervisor.txt	2009-08-25 11:21:05 +0000
+++ lib/lp/bugs/tests/has-bug-supervisor.txt	2010-09-23 11:12:49 +0000
@@ -5,7 +5,7 @@
 structural subscription targets. When the bug supervisor for such an object
 is set, a new bug subscription is created as well.
 
-    >>> target.bug_subscriptions
+    >>> list(target.bug_subscriptions)
     []
 
     >>> print target.bug_supervisor

=== modified file 'lib/lp/buildmaster/tests/mock_slaves.py'
--- lib/lp/buildmaster/tests/mock_slaves.py	2010-09-22 11:27:40 +0000
+++ lib/lp/buildmaster/tests/mock_slaves.py	2010-09-23 11:12:49 +0000
@@ -122,13 +122,11 @@
         return ('1.0', self.arch_tag, 'debian')
 
     def sendFileToSlave(self, sha1, url, username="", password=""):
-        self.call_log.append('sendFileToSlave')
         present, info = self.ensurepresent(sha1, url, username, password)
         if not present:
             raise CannotFetchFile(url, info)
 
     def cacheFile(self, logger, libraryfilealias):
-        self.call_log.append('cacheFile')
         return self.sendFileToSlave(
             libraryfilealias.content.sha1, libraryfilealias.http_url)
 

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-09-02 14:28:57 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-09-23 11:12:49 +0000
@@ -60,6 +60,7 @@
     BuildAlreadyPending,
     NoSuchBranch,
     PrivateBranchRecipe,
+    TooNewRecipeFormat
     )
 from lp.code.interfaces.sourcepackagerecipe import (
     ISourcePackageRecipe,
@@ -333,6 +334,11 @@
                     data['recipe_text'], data['description'], data['distros'],
                     data['daily_build_archive'], data['build_daily'])
             Store.of(source_package_recipe).flush()
+        except TooNewRecipeFormat:
+            self.setFieldError(
+                'recipe_text',
+                'The recipe format version specified is not available.')
+            return
         except ForbiddenInstructionError:
             # XXX: bug=592513 We shouldn't be hardcoding "run" here.
             self.setFieldError(

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-09-20 19:12:35 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-09-23 11:12:49 +0000
@@ -40,6 +40,7 @@
     SourcePackageRecipeBuildView,
     )
 from lp.code.interfaces.sourcepackagerecipe import MINIMAL_RECIPE_TEXT
+from lp.code.tests.helpers import recipe_parser_newest_version
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import (
@@ -304,6 +305,24 @@
         self.assertEqual(
             get_message_text(browser, 2), 'foo is not a branch on Launchpad.')
 
+    def test_create_recipe_format_too_new(self):
+        # If the recipe's format version is too new, we should notify the
+        # user.
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        branch = self.factory.makeBranch(
+            owner=self.chef, product=product, name='veggies')
+
+        with recipe_parser_newest_version(145.115):
+            recipe = dedent(u'''\
+                # bzr-builder format 145.115 deb-version 0+{revno}
+                %s
+                ''') % branch.bzr_identity
+            browser = self.createRecipe(recipe, branch)
+            self.assertEqual(
+                get_message_text(browser, 2),
+                'The recipe format version specified is not available.')
+
     def test_create_dupe_recipe(self):
         # You shouldn't be able to create a duplicate recipe owned by the same
         # person with the same name.

=== modified file 'lib/lp/code/mail/sourcepackagerecipebuild.py'
--- lib/lp/code/mail/sourcepackagerecipebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/mail/sourcepackagerecipebuild.py	2010-09-23 11:12:49 +0000
@@ -67,6 +67,7 @@
             'duration': '',
             'builder_url': '',
             'build_url': canonical_url(self.build),
+            'upload_log_url': '',
         })
         if self.build.builder is not None:
             params['builder_url'] = canonical_url(self.build.builder)
@@ -75,6 +76,8 @@
             params['duration'] = duration_formatter.approximateduration()
         if self.build.log is not None:
             params['log_url'] = self.build.log.getURL()
+        if self.build.upload_log is not None:
+            params['upload_log_url'] = self.build.upload_log_url
         return params
 
     def _getFooter(self, params):

=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2010-08-27 11:19:54 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2010-09-23 11:12:49 +0000
@@ -27,6 +27,7 @@
  * Distroseries: distroseries
  * Duration: five minutes
  * Build Log: %s
+ * Upload Log: 
  * Builder: http://launchpad.dev/builders/bob
 """
 
@@ -37,6 +38,7 @@
  * Distroseries: distroseries
  * Duration: 
  * Build Log: 
+ * Upload Log: 
  * Builder: 
 """
 
@@ -44,6 +46,11 @@
 
     layer = LaunchpadFunctionalLayer
 
+    def makeStatusEmail(self, build):
+        mailer = SourcePackageRecipeBuildMailer.forStatus(build)
+        email = build.requester.preferredemail.email
+        return mailer.generateEmail(email, build.requester)
+
     def test_generateEmail(self):
         """GenerateEmail produces the right headers and body."""
         person = self.factory.makePerson(name='person')
@@ -59,9 +66,7 @@
         naked_build.builder = self.factory.makeBuilder(name='bob')
         naked_build.log = self.factory.makeLibraryFileAlias()
         Store.of(build).flush()
-        mailer = SourcePackageRecipeBuildMailer.forStatus(build)
-        email = build.requester.preferredemail.email
-        ctrl = mailer.generateEmail(email, build.requester)
+        ctrl = self.makeStatusEmail(build)
         self.assertEqual(
             u'[recipe build #%d] of ~person recipe in distroseries: '
             'Successfully built' % (build.id), ctrl.subject)
@@ -93,9 +98,7 @@
             recipe=cake, distroseries=secret, archive=pantry,
             status=BuildStatus.SUPERSEDED)
         Store.of(build).flush()
-        mailer = SourcePackageRecipeBuildMailer.forStatus(build)
-        email = build.requester.preferredemail.email
-        ctrl = mailer.generateEmail(email, build.requester)
+        ctrl = self.makeStatusEmail(build)
         self.assertEqual(
             u'[recipe build #%d] of ~person recipe in distroseries: '
             'Build for superseded Source' % (build.id), ctrl.subject)
@@ -114,6 +117,15 @@
         self.assertEqual(
             'SUPERSEDED', ctrl.headers['X-Launchpad-Build-State'])
 
+    def test_generateEmail_upload_failure(self):
+        """GenerateEmail works when many fields are NULL."""
+        build = self.factory.makeSourcePackageRecipeBuild()
+        removeSecurityProxy(build).upload_log = (
+            self.factory.makeLibraryFileAlias())
+        upload_log_fragment = 'Upload Log: %s' % build.upload_log_url
+        ctrl = self.makeStatusEmail(build)
+        self.assertTrue(upload_log_fragment in ctrl.body)
+
 
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2010-09-22 11:26:19 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2010-09-23 11:12:49 +0000
@@ -12,16 +12,20 @@
 import unittest
 
 import transaction
+from twisted.internet import defer
+from twisted.trial.unittest import TestCase as TrialTestCase
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.scripts.logger import BufferLogger
-from canonical.testing import LaunchpadFunctionalLayer
+from canonical.testing import (
+    LaunchpadFunctionalLayer,
+    TwistedLaunchpadZopelessLayer,
+    )
 from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import CannotBuild
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior,
     )
-from lp.buildmaster.manager import RecordingSlave
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.buildmaster.tests.mock_slaves import (
     MockBuilder,
@@ -36,25 +40,16 @@
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import (
+    ANONYMOUS,
+    login_as,
+    logout,
     person_logged_in,
     TestCaseWithFactory,
     )
-
-
-class TestRecipeBuilder(TestCaseWithFactory):
-
-    layer = LaunchpadFunctionalLayer
-
-    def test_providesInterface(self):
-        # RecipeBuildBehavior provides IBuildFarmJobBehavior.
-        recipe_builder = RecipeBuildBehavior(None)
-        self.assertProvides(recipe_builder, IBuildFarmJobBehavior)
-
-    def test_adapts_ISourcePackageRecipeBuildJob(self):
-        # IBuildFarmJobBehavior adapts a ISourcePackageRecipeBuildJob
-        job = self.factory.makeSourcePackageRecipeBuild().makeJob()
-        job = IBuildFarmJobBehavior(job)
-        self.assertProvides(job, IBuildFarmJobBehavior)
+from lp.testing.factory import LaunchpadObjectFactory
+
+
+class RecipeBuilderTestsMixin:
 
     def makeJob(self, recipe_registrant=None, recipe_owner=None):
         """Create a sample `ISourcePackageRecipeBuildJob`."""
@@ -87,6 +82,22 @@
         job = IBuildFarmJobBehavior(job)
         return job
 
+
+class TestRecipeBuilder(TestCaseWithFactory, RecipeBuilderTestsMixin):
+
+    layer = LaunchpadFunctionalLayer
+
+    def test_providesInterface(self):
+        # RecipeBuildBehavior provides IBuildFarmJobBehavior.
+        recipe_builder = RecipeBuildBehavior(None)
+        self.assertProvides(recipe_builder, IBuildFarmJobBehavior)
+
+    def test_adapts_ISourcePackageRecipeBuildJob(self):
+        # IBuildFarmJobBehavior adapts a ISourcePackageRecipeBuildJob
+        job = self.factory.makeSourcePackageRecipeBuild().makeJob()
+        job = IBuildFarmJobBehavior(job)
+        self.assertProvides(job, IBuildFarmJobBehavior)
+
     def test_display_name(self):
         # display_name contains a sane description of the job
         job = self.makeJob()
@@ -241,32 +252,51 @@
             job.build, distroarchseries, None)
         self.assertEqual(args["archives"], expected_archives)
 
+    def test_getById(self):
+        job = self.makeJob()
+        transaction.commit()
+        self.assertEquals(
+            job.build, SourcePackageRecipeBuild.getById(job.build.id))
+
+
+class TestDispatchBuildToSlave(TrialTestCase, RecipeBuilderTestsMixin):
+
+    layer = TwistedLaunchpadZopelessLayer
+
+    def setUp(self):
+        super(TestDispatchBuildToSlave, self).setUp()
+        self.factory = LaunchpadObjectFactory()
+        login_as(ANONYMOUS)
+        self.addCleanup(logout)
+        self.layer.switchDbUser('testadmin')
 
     def test_dispatchBuildToSlave(self):
         # Ensure dispatchBuildToSlave will make the right calls to the slave
         job = self.makeJob()
         test_publisher = SoyuzTestPublisher()
         test_publisher.addFakeChroots(job.build.distroseries)
-        slave = RecordingSlave("i386-slave-1", "http://myurl", "vmhost")
+        slave = OkSlave()
         builder = MockBuilder("bob-de-bouwer", slave)
         processorfamily = ProcessorFamilySet().getByProcessorName('386')
         builder.processor = processorfamily.processors[0]
         job.setBuilder(builder)
         logger = BufferLogger()
-        job.dispatchBuildToSlave("someid", logger)
-        logger.buffer.seek(0)
-        self.assertEquals(
-            "DEBUG: Initiating build 1-someid on http://fake:0000\n",
-            logger.buffer.readline())
-        self.assertEquals(["ensurepresent", "build"],
-                          [call[0] for call in slave.calls])
-        build_args = slave.calls[1][1]
-        self.assertEquals(
-            build_args[0], job.buildfarmjob.generateSlaveBuildCookie())
-        self.assertEquals(build_args[1], "sourcepackagerecipe")
-        self.assertEquals(build_args[3], {})
-        distroarchseries = job.build.distroseries.architectures[0]
-        self.assertEqual(build_args[4], job._extraBuildArgs(distroarchseries))
+        d = defer.maybeDeferred(job.dispatchBuildToSlave, "someid", logger)
+        def check_dispatch(ignored):
+            logger.buffer.seek(0)
+            self.assertEquals(
+                "DEBUG: Initiating build 1-someid on http://fake:0000\n",
+                logger.buffer.readline())
+            self.assertEquals(["ensurepresent", "build"],
+                              [call[0] for call in slave.call_log])
+            build_args = slave.call_log[1][1:]
+            self.assertEquals(
+                build_args[0], job.buildfarmjob.generateSlaveBuildCookie())
+            self.assertEquals(build_args[1], "sourcepackagerecipe")
+            self.assertEquals(build_args[3], [])
+            distroarchseries = job.build.distroseries.architectures[0]
+            self.assertEqual(build_args[4], job._extraBuildArgs(distroarchseries))
+        return d.addCallback(check_dispatch)
 
     def test_dispatchBuildToSlave_nochroot(self):
         # dispatchBuildToSlave will fail when there is not chroot tarball
@@ -277,14 +307,8 @@
         builder.processor = processorfamily.processors[0]
         job.setBuilder(builder)
         logger = BufferLogger()
-        self.assertRaises(CannotBuild, job.dispatchBuildToSlave,
-            "someid", logger)
-
-    def test_getById(self):
-        job = self.makeJob()
-        transaction.commit()
-        self.assertEquals(
-            job.build, SourcePackageRecipeBuild.getById(job.build.id))
+        d = defer.maybeDeferred(job.dispatchBuildToSlave, "someid", logger)
+        return self.assertFailure(d, CannotBuild)
 
 
 def test_suite():

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-09-21 19:02:44 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-09-23 11:12:49 +0000
@@ -53,6 +53,7 @@
     SourcePackageRecipe,
     )
 from lp.code.model.sourcepackagerecipebuild import SourcePackageRecipeBuildJob
+from lp.code.tests.helpers import recipe_parser_newest_version
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.interfaces.job import (
     IJob,
@@ -246,11 +247,13 @@
             old_branches, list(sp_recipe.getReferencedBranches()))
 
     def test_reject_newer_formats(self):
-        builder_recipe = self.factory.makeRecipe()
-        builder_recipe.format = 0.3
-        self.assertRaises(
-            TooNewRecipeFormat,
-            self.factory.makeSourcePackageRecipe, recipe=str(builder_recipe))
+        with recipe_parser_newest_version(145.115):
+            builder_recipe = self.factory.makeRecipe()
+            builder_recipe.format = 145.115
+            self.assertRaises(
+                TooNewRecipeFormat,
+                self.factory.makeSourcePackageRecipe,
+                recipe=str(builder_recipe))
 
     def test_requestBuild(self):
         recipe = self.factory.makeSourcePackageRecipe()

=== modified file 'lib/lp/code/tests/helpers.py'
--- lib/lp/code/tests/helpers.py	2010-09-15 20:41:46 +0000
+++ lib/lp/code/tests/helpers.py	2010-09-23 11:12:49 +0000
@@ -14,11 +14,13 @@
     ]
 
 
+from contextlib import contextmanager
 from datetime import timedelta
 from difflib import unified_diff
 from itertools import count
 import transaction
 
+from bzrlib.plugins.builder.recipe import RecipeParser
 from zope.component import getUtility
 from zope.security.proxy import (
     isinstance as zisinstance,
@@ -301,3 +303,13 @@
         make_project_branch_with_revisions(
             factory, gen, project, revision_count=num_commits)
     transaction.commit()
+
+
+@contextmanager
+def recipe_parser_newest_version(version):
+    old_version = RecipeParser.NEWEST_VERSION
+    RecipeParser.NEWEST_VERSION = version
+    try:
+        yield
+    finally:
+        RecipeParser.NEWEST_VERSION = old_version

=== modified file 'lib/lp/codehosting/branchdistro.py'
--- lib/lp/codehosting/branchdistro.py	2010-09-21 03:47:19 +0000
+++ lib/lp/codehosting/branchdistro.py	2010-09-23 11:12:49 +0000
@@ -27,7 +27,7 @@
 from zope.component import getUtility
 
 from canonical.config import config
-from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from canonical.launchpad.interfaces import ILaunchpadCelebrities, IMasterStore
 from lp.code.enums import BranchLifecycleStatus, BranchType
 from lp.code.errors import BranchExists
 from lp.code.interfaces.branchcollection import IAllBranches
@@ -35,6 +35,7 @@
 from lp.code.interfaces.seriessourcepackagebranch import (
     IFindOfficialBranchLinks,
     )
+from lp.code.model.branchrevision import BranchRevision
 from lp.codehosting.vfs import branch_id_to_path
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -350,4 +351,25 @@
         switch_branches(
             config.codehosting.mirrored_branches_root,
             'lp-internal', old_db_branch, new_db_branch)
+        # Directly copy the branch revisions from the old branch to the new branch.
+        store = IMasterStore(BranchRevision)
+        store.execute(
+            """
+            INSERT INTO BranchRevision (branch, revision, sequence)
+            SELECT %s, BranchRevision.revision, BranchRevision.sequence
+            FROM BranchRevision
+            WHERE branch = %s
+            """ % (new_db_branch.id, old_db_branch.id))
+
+        # Update the scanned details first, that way when hooking into
+        # branchChanged, it won't try to create a new scan job.
+        tip_revision = old_db_branch.getTipRevision()
+        new_db_branch.updateScannedDetails(
+            tip_revision, old_db_branch.revision_count)
+        new_db_branch.branchChanged(
+            '', tip_revision.revision_id,
+            old_db_branch.control_format,
+            old_db_branch.branch_format,
+            old_db_branch.repository_format)
+        transaction.commit()
         return new_db_branch

=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2010-09-20 04:32:49 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-09-23 11:12:49 +0000
@@ -27,6 +27,8 @@
 from bzrlib.transport.chroot import ChrootServer
 from lazr.uri import URI
 import transaction
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
 from canonical.launchpad.scripts.logger import (
@@ -35,6 +37,7 @@
     )
 from canonical.testing.layers import LaunchpadZopelessLayer
 from lp.code.enums import BranchLifecycleStatus
+from lp.code.interfaces.branchjob import IBranchScanJobSource
 from lp.codehosting.branchdistro import (
     DistroBrancher,
     switch_branches,
@@ -127,6 +130,7 @@
         """Make an official package branch with an underlying bzr branch."""
         db_branch = self.factory.makePackageBranch(distroseries=distroseries)
         db_branch.sourcepackage.setBranch(RELEASE, db_branch, db_branch.owner)
+        self.factory.makeRevisionsForBranch(db_branch, count=1)
 
         transaction.commit()
 
@@ -241,6 +245,42 @@
         self.assertEqual(
             BranchLifecycleStatus.MATURE, db_branch.lifecycle_status)
 
+    def test_makeOneNewBranch_avoids_need_for_scan(self):
+        # makeOneNewBranch sets the appropriate properties of the new branch
+        # so a scan is unnecessary.  This can be done because we are making a
+        # copy of the source branch.
+        db_branch = self.makeOfficialPackageBranch()
+        self.factory.makeRevisionsForBranch(db_branch, count=10)
+        tip_revision_id = db_branch.last_mirrored_id
+        self.assertIsNot(None, tip_revision_id)
+        # The makeRevisionsForBranch will create a scan job for the db_branch.
+        # We don't really care about that, but what we do care about is that
+        # no new jobs are created.
+        existing_scan_job_count = len(
+            list(getUtility(IBranchScanJobSource).iterReady()))
+
+        brancher = self.makeNewSeriesAndBrancher(db_branch.distroseries)
+        brancher.makeOneNewBranch(db_branch)
+        new_branch = brancher.new_distroseries.getSourcePackage(
+            db_branch.sourcepackage.name).getBranch(RELEASE)
+
+        self.assertEqual(tip_revision_id, new_branch.last_mirrored_id)
+        self.assertEqual(tip_revision_id, new_branch.last_scanned_id)
+        # Make sure that the branch revisions have been copied.
+        old_ancestry, old_history = removeSecurityProxy(
+            db_branch).getScannerData()
+        new_ancestry, new_history = removeSecurityProxy(
+            new_branch).getScannerData()
+        self.assertEqual(old_ancestry, new_ancestry)
+        self.assertEqual(old_history, new_history)
+        self.assertFalse(new_branch.pending_writes)
+        # The script doesn't have permission to create branch jobs, but just
+        # to be insanely paradoid.
+        transaction.commit()
+        self.layer.switchDbUser('launchpad')
+        scan_jobs = list(getUtility(IBranchScanJobSource).iterReady())
+        self.assertEqual(existing_scan_job_count, len(scan_jobs))
+
     def test_makeOneNewBranch_inconsistent_branch(self):
         # makeOneNewBranch skips over an inconsistent official package branch
         # (see `checkConsistentOfficialPackageBranch` for precisely what an

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-09-15 16:03:14 +0000
+++ lib/lp/registry/browser/product.py	2010-09-23 11:12:49 +0000
@@ -468,6 +468,7 @@
         # Add the branch configuration in separately.
         set_branch = series_menu['set_branch']
         set_branch.text = 'Configure project branch'
+        set_branch.summary = "Specify the location of this projects code."
         set_branch.configured = (
             )
         config_list.append(

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-09-23 02:15:42 +0000
+++ lib/lp/registry/configure.zcml	2010-09-23 11:12:49 +0000
@@ -453,6 +453,7 @@
                 getReleasesAndPublishingHistory
                 upstream_product
                 target_type_display
+                _getOfficialTagClause
                 official_bug_tags
                 findRelatedArchives
                 findRelatedArchivePublications

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2010-09-09 17:02:33 +0000
+++ lib/lp/registry/interfaces/product.py	2010-09-23 11:12:49 +0000
@@ -660,6 +660,7 @@
                 'The series that represents the master or trunk branch. '
                 'The Bazaar URL lp:<project> points to the development focus '
                 'series branch.')))
+    development_focusID = Attribute("The development focus ID.")
 
     name_with_project = Attribute(_("Returns the product name prefixed "
         "by the project name, if a project is associated with this "

=== modified file 'lib/lp/registry/interfaces/projectgroup.py'
--- lib/lp/registry/interfaces/projectgroup.py	2010-08-21 18:41:57 +0000
+++ lib/lp/registry/interfaces/projectgroup.py	2010-09-23 11:12:49 +0000
@@ -328,6 +328,8 @@
     def getSeries(series_name):
         """Return a ProjectGroupSeries object with name `series_name`."""
 
+    product_milestones = Attribute('all the milestones for all the products.')
+
 
 class IProjectGroup(IProjectGroupPublic,
                     IProjectGroupModerate,

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2010-09-12 17:43:49 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2010-09-23 11:12:49 +0000
@@ -494,6 +494,9 @@
                 BugTask.sourcepackagename == self.sourcepackagename),
             user)
 
+    def _getOfficialTagClause(self):
+        return self.distribution._getOfficialTagClause()
+
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-09-21 19:34:45 +0000
+++ lib/lp/registry/model/distroseries.py	2010-09-23 11:12:49 +0000
@@ -743,6 +743,9 @@
         """Customize `search_params` for this distribution series."""
         search_params.setDistroSeries(self)
 
+    def _getOfficialTagClause(self):
+        return self.distribution._getOfficialTagClause()
+
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""

=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py	2010-09-14 15:04:06 +0000
+++ lib/lp/registry/model/milestone.py	2010-09-23 11:12:49 +0000
@@ -15,6 +15,7 @@
 
 import datetime
 
+from lazr.restful.error import expose
 from sqlobject import (
     AND,
     BoolCol,
@@ -28,6 +29,7 @@
     And,
     Store,
     )
+from storm.zope import IResultSet
 from zope.component import getUtility
 from zope.interface import implements
 
@@ -36,7 +38,6 @@
     sqlvalues,
     )
 from canonical.launchpad.webapp.sorting import expand_numbers
-from lazr.restful.error import expose
 from lp.app.errors import NotFoundError
 from lp.blueprints.model.specification import Specification
 from lp.bugs.interfaces.bugtarget import IHasBugs
@@ -107,8 +108,7 @@
         result = store.find(Milestone, self._getMilestoneCondition())
         return result.order_by(self._milestone_order)
 
-    @property
-    def milestones(self):
+    def _get_milestones(self):
         """See `IHasMilestones`."""
         store = Store.of(self)
         result = store.find(Milestone,
@@ -116,6 +116,8 @@
                                 Milestone.active == True))
         return result.order_by(self._milestone_order)
 
+    milestones = property(_get_milestones)
+
 
 class MultipleProductReleases(Exception):
     """Raised when a second ProductRelease is created for a milestone."""
@@ -229,7 +231,8 @@
         """See `IMilestone`."""
         params = BugTaskSearchParams(milestone=self, user=None)
         bugtasks = getUtility(IBugTaskSet).search(params)
-        assert len(self.getSubscriptions()) == 0, (
+        subscriptions = IResultSet(self.getSubscriptions())
+        assert subscriptions.is_empty(), (
             "You cannot delete a milestone which has structural "
             "subscriptions.")
         assert bugtasks.count() == 0, (
@@ -256,7 +259,7 @@
         """See lp.registry.interfaces.milestone.IMilestoneSet."""
         try:
             return Milestone.get(milestoneid)
-        except SQLObjectNotFound, err:
+        except SQLObjectNotFound:
             raise NotFoundError(
                 "Milestone with ID %d does not exist" % milestoneid)
 

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2010-09-10 20:27:19 +0000
+++ lib/lp/registry/model/person.py	2010-09-23 11:12:49 +0000
@@ -1265,6 +1265,8 @@
             # The owner is not a member but must retain his rights over
             # this team. This person may be a member of the owner, and in this
             # case it'll also have rights over this team.
+            # Note that this query and the tp query above can be consolidated
+            # when we get to a finer grained level of optimisations.
             in_team = self.inTeam(team.teamowner)
         else:
             in_team = False

=== modified file 'lib/lp/registry/model/productseries.py'
--- lib/lp/registry/model/productseries.py	2010-09-21 19:34:45 +0000
+++ lib/lp/registry/model/productseries.py	2010-09-23 11:12:49 +0000
@@ -423,6 +423,9 @@
         """Customize `search_params` for this product series."""
         search_params.setProductSeries(self)
 
+    def _getOfficialTagClause(self):
+        return self.product._getOfficialTagClause()
+
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2010-09-09 15:26:11 +0000
+++ lib/lp/registry/model/projectgroup.py	2010-09-23 11:12:49 +0000
@@ -93,6 +93,7 @@
 from lp.registry.model.karma import KarmaContextMixin
 from lp.registry.model.mentoringoffer import MentoringOffer
 from lp.registry.model.milestone import (
+    HasMilestonesMixin,
     Milestone,
     ProjectMilestone,
     )
@@ -110,7 +111,8 @@
                    MakesAnnouncements, HasSprintsMixin, HasAliasMixin,
                    KarmaContextMixin, BranchVisibilityPolicyMixin,
                    StructuralSubscriptionTargetMixin,
-                   HasBranchesMixin, HasMergeProposalsMixin, HasBugHeatMixin):
+                   HasBranchesMixin, HasMergeProposalsMixin, HasBugHeatMixin,
+                   HasMilestonesMixin):
     """A ProjectGroup"""
 
     implements(IProjectGroup, IFAQCollection, IHasBugHeat, IHasIcon, IHasLogo,
@@ -309,6 +311,11 @@
         """Customize `search_params` for this milestone."""
         search_params.setProject(self)
 
+    def _getOfficialTagClause(self):
+        """See `OfficialBugTagTargetMixin`."""
+        And(ProjectGroup.id == Product.projectID,
+            Product.id == OfficialBugTag.productID)
+
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""
@@ -396,6 +403,11 @@
         """
         return self.products.count() != 0
 
+    def _getMilestoneCondition(self):
+        """See `HasMilestonesMixin`."""
+        return And(Milestone.productID == Product.id,
+                   Product.projectID == self.id)
+
     def _getMilestones(self, only_active):
         """Return a list of milestones for this project group.
 
@@ -445,6 +457,13 @@
         return self._getMilestones(True)
 
     @property
+    def product_milestones(self):
+        """Hack to avoid the ProjectMilestone in MilestoneVocabulary."""
+        # XXX: bug=644977 Robert Collins - this is a workaround for
+        # insconsistency in project group milestone use.
+        return self._get_milestones()
+
+    @property
     def all_milestones(self):
         """See `IProjectGroup`."""
         return self._getMilestones(False)

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-09-07 00:51:44 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-09-23 11:12:49 +0000
@@ -481,6 +481,9 @@
         """Customize `search_params` for this source package."""
         search_params.setSourcePackage(self)
 
+    def _getOfficialTagClause(self):
+        return self.distroseries._getOfficialTagClause()
+
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""

=== modified file 'lib/lp/registry/model/structuralsubscription.py'
--- lib/lp/registry/model/structuralsubscription.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/model/structuralsubscription.py	2010-09-23 11:12:49 +0000
@@ -266,47 +266,36 @@
                          min_blueprint_notification_level=
                          BlueprintNotificationLevel.NOTHING):
         """See `IStructuralSubscriptionTarget`."""
-        target_clause_parts = []
-        for key, value in self._target_args.items():
+        clauses = [
+            "StructuralSubscription.subscriber = Person.id",
+            "StructuralSubscription.bug_notification_level "
+            ">= %s" % quote(min_bug_notification_level),
+            "StructuralSubscription.blueprint_notification_level "
+            ">= %s" % quote(min_blueprint_notification_level),
+            ]
+        for key, value in self._target_args.iteritems():
             if value is None:
-                target_clause_parts.append(
-                    "StructuralSubscription.%s IS NULL " % (key, ))
+                clauses.append(
+                    "StructuralSubscription.%s IS NULL" % (key,))
             else:
-                target_clause_parts.append(
-                    "StructuralSubscription.%s = %s " % (key, quote(value)))
-        target_clause = " AND ".join(target_clause_parts)
-        query = target_clause + """
-            AND StructuralSubscription.subscriber = Person.id
-            """
-        all_subscriptions = StructuralSubscription.select(
-            query,
-            orderBy='Person.displayname',
-            clauseTables=['Person'])
-        subscriptions = [sub for sub
-                         in all_subscriptions
-                         if ((sub.bug_notification_level >=
-                             min_bug_notification_level) and
-                             (sub.blueprint_notification_level >=
-                              min_blueprint_notification_level))]
-        return subscriptions
+                clauses.append(
+                    "StructuralSubscription.%s = %s" % (key, quote(value)))
+        query = " AND ".join(clauses)
+        return StructuralSubscription.select(
+            query, orderBy='Person.displayname', clauseTables=['Person'])
 
     def getBugNotificationsRecipients(self, recipients=None, level=None):
         """See `IStructuralSubscriptionTarget`."""
-        subscribers = set()
         if level is None:
             subscriptions = self.bug_subscriptions
         else:
             subscriptions = self.getSubscriptions(
                 min_bug_notification_level=level)
-        for subscription in subscriptions:
-            if (level is not None and
-                subscription.bug_notification_level < level):
-                continue
-            subscriber = subscription.subscriber
-            subscribers.add(subscriber)
-            if recipients is not None:
-                recipients.addStructuralSubscriber(
-                    subscriber, self)
+        subscribers = set(
+            subscription.subscriber for subscription in subscriptions)
+        if recipients is not None:
+            for subscriber in subscribers:
+                recipients.addStructuralSubscriber(subscriber, self)
         parent = self.parent_subscription_target
         if parent is not None:
             subscribers.update(

=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2010-08-31 11:11:09 +0000
+++ lib/lp/registry/vocabularies.py	2010-09-23 11:12:49 +0000
@@ -1161,16 +1161,18 @@
         elif IDistroSeriesBugTask.providedBy(milestone_context):
             target = milestone_context.distroseries
         elif IProductSeriesBugTask.providedBy(milestone_context):
-            target = milestone_context.productseries
+            target = milestone_context.productseries.product
         elif IDistributionSourcePackage.providedBy(milestone_context):
             target = milestone_context.distribution
         elif ISourcePackage.providedBy(milestone_context):
             target = milestone_context.distroseries
         elif ISpecification.providedBy(milestone_context):
             target = milestone_context.target
+        elif IProductSeries.providedBy(milestone_context):
+            # Show all the milestones of the product for a product series.
+            target = milestone_context.product
         elif (IProjectGroup.providedBy(milestone_context) or
               IProduct.providedBy(milestone_context) or
-              IProductSeries.providedBy(milestone_context) or
               IDistribution.providedBy(milestone_context) or
               IDistroSeries.providedBy(milestone_context)):
             target = milestone_context
@@ -1196,23 +1198,10 @@
         # should be revisited after we've unblocked users.
         if target is not None:
             if IProjectGroup.providedBy(target):
-                milestones = shortlist(
-                    (milestone for product in target.products
-                     for milestone in product.milestones),
-                    longest_expected=40)
-            elif IProductSeries.providedBy(target):
-                # While some milestones may be associated with a
-                # productseries, we want to show all milestones for
-                # the product. Since the database constraint
-                # "valid_target" ensures that a milestone associated
-                # with a series is also associated with the product
-                # itself, we don't need to look up series-related
-                # milestones.
-                milestones = shortlist(target.product.milestones,
-                                       longest_expected=40)
+                milestones_source = target.product_milestones
             else:
-                milestones = shortlist(
-                    target.milestones, longest_expected=40)
+                milestones_source = target.milestones
+            milestones = shortlist(milestones_source, longest_expected=40)
         else:
             # We can't use context to reasonably filter the
             # milestones, so let's either just grab all of them,
@@ -1249,9 +1238,11 @@
         product_ids = set(
             removeSecurityProxy(milestone).productID
             for milestone in milestones)
+        product_ids.discard(None)
         distro_ids = set(
             removeSecurityProxy(milestone).distributionID
             for milestone in milestones)
+        distro_ids.discard(None)
         if len(product_ids) > 0:
             list(Product.select("id IN %s" % sqlvalues(product_ids)))
         if len(distro_ids) > 0:

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py'
--- lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py	2010-09-22 11:29:08 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py	2010-09-23 11:12:49 +0000
@@ -94,7 +94,7 @@
             extra_urls = []
 
         upload_logs = [
-            ['cacheFile', 'sendFileToSlave', ('ensurepresent', url, '', '')]
+            ('ensurepresent', url, '', '')
             for url in [chroot.http_url] + extra_urls]
 
         extra_args = {
@@ -110,7 +110,7 @@
         build_log = [
             ('build', build_id, 'binarypackage', chroot.content.sha1,
              filemap_names, extra_args)]
-        return sum(upload_logs, []) + build_log
+        return upload_logs + build_log
 
     def startBuild(self, builder, candidate):
         builder = removeSecurityProxy(builder)