Merge lp:~wallyworld/launchpad/product-mergequeue-listview into lp:launchpad

[Ian Booth]

Add product and person product merge queue listing pages.

= Summary =

Add product and person product merge queue listing pages.

= Implementation =

Extend the Person Merge Queue Listing implementation. Core code changes contained in classes:
  lib/lp/code/model/branchmergequeuecollection.py
  lib/lp/code/browser/branchmergequeuelisting.py

Add menus linking to the branch merge queue listing page to the product code page and person product code page.

= Tests =

Extend tests in
  lib/lp/code/model/tests/test_branchmergequeuecollection.py

to cover new inProduct() filter and other new methods.

Rework implementation of tests in
  lib/lp/code/browser/tests/test_branchmergequeuelisting.p

to provide base classes for the various person, product, and person product tests, which are essentially the same logic but on a different context.

  bin/test -vvt test_branchmergequeuecollection
  bin/test -vvt test_branchmergequeuelisting

= Lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/browser/branchlisting.py
  lib/lp/code/browser/branchmergequeuelisting.py
  lib/lp/code/browser/configure.zcml
  lib/lp/code/browser/tests/test_branchmergequeuelisting.py
  lib/lp/code/interfaces/branchmergequeuecollection.py
  lib/lp/code/model/branchmergequeuecollection.py
  lib/lp/code/model/tests/test_branchmergequeuecollection.py
  lib/lp/code/templates/product-portlet-codestatistics.pt

[Paul Hummer (rockstar)]

Does this still need review? It's more than 6 months old. What's the status of it?

[Ian Booth (wallyworld)]

Hi Paul

I suspect the merge queue work has stalled somewhat but it would be nice
to get this landed so that when it is picked up again everything is in
place to recommence work on it.

On 26/05/11 23:59, Paul Hummer wrote:
> Does this still need review? It's more than 6 months old. What's the status of it?

[Robert Collins (lifeless)]

I'm going to put this in WIP as I suspect it will have conflicts and bitrot by now; if it doesn't thats cool - please put it back to needs review and request an LP reviewer review.

Unmerged revisions

9922. By Ian Booth on 2010-11-22

Add product merge queue listing pages and tests

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2010-11-18 12:05:34 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-11-22 11:58:12 +0000
@@ -94,7 +94,9 @@
     PersonActiveReviewsView,
     PersonProductActiveReviewsView,
     )
-from lp.code.browser.branchmergequeuelisting import HasMergeQueuesMenuMixin
+from lp.code.browser.branchmergequeuelisting import (
+    HasMergeQueuesMenuMixin,
+    )
 from lp.code.browser.branchvisibilitypolicy import BranchVisibilityPolicyMixin
 from lp.code.browser.summary import BranchCountSummaryView
 from lp.code.enums import (
@@ -110,6 +112,9 @@
     IBranchListingQueryOptimiser,
     )
 from lp.code.interfaces.branchcollection import IAllBranches
+from lp.code.interfaces.branchmergequeuecollection import (
+    IAllBranchMergeQueues,
+    )
 from lp.code.interfaces.branchnamespace import IBranchNamespacePolicy
 from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.revision import IRevisionSet
@@ -959,7 +964,8 @@
 class PersonProductBranchesMenu(PersonBranchesMenu):
 
     usedfor = IPersonProduct
-    links = ['registered', 'owned', 'subscribed', 'active_reviews']
+    links = ['registered', 'owned', 'subscribed', 'active_reviews',
+             'mergequeues']
 
     def _getCountCollection(self):
         """See `PersonBranchesMenu`."""
@@ -978,6 +984,11 @@
             self.context, self.request)
         return active_reviews.getProposals().count()
 
+    @cachedproperty
+    def mergequeue_count(self):
+        return getUtility(IAllBranchMergeQueues).ownedBy(
+            self.person).inProduct(self.context.product).count()
+
 
 class PersonBaseBranchListingView(BranchListingView):
     """Base class used for different person listing views."""
@@ -1106,7 +1117,7 @@
         return self.context.person
 
 
-class ProductBranchesMenu(ApplicationMenu):
+class ProductBranchesMenu(ApplicationMenu, HasMergeQueuesMenuMixin):
 
     usedfor = IProduct
     facet = 'branches'
@@ -1114,13 +1125,19 @@
         'branch_add',
         'list_branches',
         'active_reviews',
+        'mergequeues',
         'code_import',
         'branch_visibility',
         ]
     extra_attributes = [
         'active_review_count',
+        'mergequeue_count',
         ]
 
+    @cachedproperty
+    def mergequeue_count(self):
+        return self._getMergeQueueCollection().count()
+
     def branch_add(self):
         text = 'Register a branch'
         summary = 'Register a new Bazaar branch for this project'

=== modified file 'lib/lp/code/browser/branchmergequeuelisting.py'
--- lib/lp/code/browser/branchmergequeuelisting.py	2010-11-02 22:41:11 +0000
+++ lib/lp/code/browser/branchmergequeuelisting.py	2010-11-22 11:58:12 +0000
@@ -28,7 +28,7 @@
 class HasMergeQueuesMenuMixin:
     """A context menus mixin for objects that can own merge queues."""
 
-    def _getCollection(self):
+    def _getMergeQueueCollection(self):
         return getUtility(IAllBranchMergeQueues).visibleByUser(self.user)
 
     @property
@@ -49,7 +49,7 @@
 
     @cachedproperty
     def mergequeue_count(self):
-        return self._getCollection().ownedBy(self.person).count()
+        return self._getMergeQueueCollection().ownedBy(self.person).count()
 
 
 class MergeQueueListingView(LaunchpadView, FeedsMixin):
@@ -103,3 +103,39 @@
 
     def _getCollection(self):
         return getUtility(IAllBranchMergeQueues).ownedBy(self.context)
+
+
+class ProductMergeQueueListingView(MergeQueueListingView):
+
+    label_template = 'Merge Queues for branches of %(displayname)s'
+
+    def _getCollection(self):
+        return getUtility(IAllBranchMergeQueues).inProduct(self.context)
+
+
+class PersonProductMergeQueueListingView(MergeQueueListingView):
+
+    label_template = 'Merge Queues of %(product)s owned by %(person)s'
+    owner_enabled = False
+
+    @property
+    def person(self):
+        """Return the person from the PersonProduct context."""
+        return self.context.person
+
+    @property
+    def label(self):
+        return self.label_template % {
+            'person': self.context.person.displayname,
+            'product': self.context.product.displayname}
+
+    def _getCollection(self):
+        return getUtility(IAllBranchMergeQueues).ownedBy(
+            self.context.person).inProduct(self.context.product)
+
+    @property
+    def no_merge_queue_message(self):
+        """Shown when there is no table to show."""
+        return "%(product)s has no merge queues owned by %(person)s." % {
+            'person': self.context.person.displayname,
+            'product': self.context.product.displayname}

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-11-18 12:05:34 +0000
+++ lib/lp/code/browser/configure.zcml	2010-11-22 11:58:12 +0000
@@ -1327,6 +1327,24 @@
             facet="branches"
             name="+merge-queues"
             template="../templates/branchmergequeue-listing.pt"/>
+        <browser:page
+            for="lp.registry.interfaces.product.IProduct"
+            layer="lp.code.publisher.CodeLayer"
+            class="lp.code.browser.branchmergequeuelisting.ProductMergeQueueListingView"
+            permission="zope.Public"
+            facet="branches"
+            name="+merge-queues"
+            template="../templates/branchmergequeue-listing.pt"
+            />
+        <browser:page
+            for="lp.registry.interfaces.personproduct.IPersonProduct"
+            layer="lp.code.publisher.CodeLayer"
+            class="lp.code.browser.branchmergequeuelisting.PersonProductMergeQueueListingView"
+            permission="zope.Public"
+            facet="branches"
+            name="+merge-queues"
+            template="../templates/branchmergequeue-listing.pt"
+            />
 
         <browser:page
             for="*"

=== modified file 'lib/lp/code/browser/tests/test_branchmergequeuelisting.py'
--- lib/lp/code/browser/tests/test_branchmergequeuelisting.py	2010-11-02 22:41:11 +0000
+++ lib/lp/code/browser/tests/test_branchmergequeuelisting.py	2010-11-22 11:58:12 +0000
@@ -9,6 +9,8 @@
 
 from mechanize import LinkNotFoundError
 import soupmatchers
+
+from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.testing.pages import (
@@ -18,6 +20,8 @@
     )
 from canonical.launchpad.webapp import canonical_url
 from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.code.enums import BranchType
+from lp.registry.interfaces.personproduct import IPersonProductFactory
 from lp.services.features.model import (
     FeatureFlag,
     getFeatureStore,
@@ -34,45 +38,65 @@
 class MergeQueuesTestMixin:
 
     def setUp(self):
-        self.branch_owner = self.factory.makePerson(name='eric')
+        self.branch_owner = removeSecurityProxy(
+            self.factory.makePerson(name='eric'))
+        dev_series_branch = self.factory.makeBranch()
+        productseries = self.factory.makeProductSeries(
+            name="myproduct", branch=dev_series_branch)
+        self.product = removeSecurityProxy(productseries).product
+        removeSecurityProxy(self.product).development_focus = productseries
 
     def enable_queue_flag(self):
         getFeatureStore().add(FeatureFlag(
             scope=u'default', flag=u'code.branchmergequeue',
             value=u'on', priority=1))
 
-    def _makeMergeQueues(self, nr_queues=3, nr_with_private_branches=0):
+    def _makeMergeQueues(
+        self, nr_queues=3, nr_with_private_branches=0,
+        product=None, owner=None):
         # We create nr_queues merge queues in total, and the first
         # nr_with_private_branches of them will have at least one private
         # branch in the queue.
-        with person_logged_in(self.branch_owner):
+        if owner is None:
+            owner = self.branch_owner
+        with person_logged_in(owner):
             mergequeues = [
                 self.factory.makeBranchMergeQueue(
-                    owner=self.branch_owner, branches=self._makeBranches())
+                    owner=owner,
+                    branches=self._makeBranches(product=product, owner=owner))
                 for i in range(nr_queues-nr_with_private_branches)]
             mergequeues_with_private_branches = [
                 self.factory.makeBranchMergeQueue(
-                    owner=self.branch_owner,
-                    branches=self._makeBranches(nr_private=1))
+                    owner=owner,
+                    branches=self._makeBranches(
+                        nr_private=1, product=product, owner=owner))
                 for i in range(nr_with_private_branches)]
 
             return mergequeues, mergequeues_with_private_branches
 
-    def _makeBranches(self, nr_public=3, nr_private=0):
+    def _makeBranches(
+        self, nr_public=3, nr_private=0, product=None, owner=None):
+        if product is None:
+            product = self.product
+        if owner is None:
+            owner = self.branch_owner
         branches = [
-            self.factory.makeProductBranch(owner=self.branch_owner)
+            self.factory.makeProductBranch(
+                owner=owner, product=product, branch_type=BranchType.HOSTED)
             for i in range(nr_public)]
 
         private_branches = [
             self.factory.makeProductBranch(
-                owner=self.branch_owner, private=True)
+                owner=owner, product=product, private=True,
+                branch_type=BranchType.HOSTED)
             for i in range(nr_private)]
 
         branches.extend(private_branches)
         return branches
 
 
-class TestPersonMergeQueuesView(TestCaseWithFactory, MergeQueuesTestMixin):
+class BaseTestMergeQueuesView(TestCaseWithFactory, MergeQueuesTestMixin):
+    """ Base class for person, product, personproduct view tests."""
 
     layer = DatabaseFunctionalLayer
 
@@ -81,73 +105,38 @@
         MergeQueuesTestMixin.setUp(self)
         self.user = self.factory.makePerson()
 
-    def test_mergequeues_with_all_public_branches(self):
+    def _test_mergequeues_with_all_public_branches(self):
         # Anyone can see mergequeues containing all public branches.
         mq, mq_with_private = self._makeMergeQueues()
         login_person(self.user)
         view = create_initialized_view(
-            self.branch_owner, name="+merge-queues", rootsite='code')
+            self.context, name="+merge-queues", rootsite='code')
         self.assertEqual(set(mq), set(view.mergequeues))
 
-    def test_mergequeues_with_a_private_branch_for_owner(self):
+    def _test_mergequeues_with_a_private_branch_for_owner(self):
         # Only users with access to private branches can see any queues
         # containing such branches.
         mq, mq_with_private = (
             self._makeMergeQueues(nr_with_private_branches=1))
         login_person(self.branch_owner)
         view = create_initialized_view(
-            self.branch_owner, name="+merge-queues", rootsite='code')
+            self.context, name="+merge-queues", rootsite='code')
         mq.extend(mq_with_private)
         self.assertEqual(set(mq), set(view.mergequeues))
 
-    def test_mergequeues_with_a_private_branch_for_other_user(self):
+    def _test_mergequeues_with_a_private_branch_for_other_user(self):
         # Only users with access to private branches can see any queues
         # containing such branches.
         mq, mq_with_private = (
             self._makeMergeQueues(nr_with_private_branches=1))
         login_person(self.user)
         view = create_initialized_view(
-            self.branch_owner, name="+merge-queues", rootsite='code')
+            self.context, name="+merge-queues", rootsite='code')
         self.assertEqual(set(mq), set(view.mergequeues))
 
 
-class TestPersonCodePage(BrowserTestCase, MergeQueuesTestMixin):
-    """Tests for the person code homepage.
-
-    This is the default page shown for a person on the code subdomain.
-    """
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        BrowserTestCase.setUp(self)
-        MergeQueuesTestMixin.setUp(self)
-        self._makeMergeQueues()
-
-    def test_merge_queue_menu_link_without_feature_flag(self):
-        login_person(self.branch_owner)
-        browser = self.getUserBrowser(
-            canonical_url(self.branch_owner, rootsite='code'),
-            self.branch_owner)
-        self.assertRaises(
-            LinkNotFoundError,
-            browser.getLink,
-            url='+merge-queues')
-
-    def test_merge_queue_menu_link(self):
-        self.enable_queue_flag()
-        login_person(self.branch_owner)
-        browser = self.getUserBrowser(
-            canonical_url(self.branch_owner, rootsite='code'),
-            self.branch_owner)
-        browser.getLink(url='+merge-queues').click()
-        self.assertEqual(
-            'http://code.launchpad.dev/~eric/+merge-queues',
-            browser.url)
-
-
-class TestPersonMergeQueuesListPage(BrowserTestCase, MergeQueuesTestMixin):
-    """Tests for the person merge queue list page."""
+class BaseTestMergeQueuesListPage(BrowserTestCase, MergeQueuesTestMixin):
+    """ Base class for person, product, personproduct list page tests."""
 
     layer = DatabaseFunctionalLayer
 
@@ -158,10 +147,10 @@
         self.merge_queues = mq
         self.merge_queues.extend(mq_with_private)
 
-    def test_merge_queue_list_contents_without_feature_flag(self):
+    def _test_merge_queue_list_contents_without_feature_flag(self):
         login_person(self.branch_owner)
         browser = self.getUserBrowser(
-            canonical_url(self.branch_owner, rootsite='code',
+            canonical_url(self.context, rootsite='code',
                           view_name='+merge-queues'), self.branch_owner)
         table = find_tag_by_id(browser.contents, 'mergequeuetable')
         self.assertIs(None, table)
@@ -172,37 +161,30 @@
                     '\w*No merge queues\w*')))
         self.assertThat(browser.contents, noqueue_matcher)
 
-    def test_merge_queue_list_contents(self):
+    def _test_merge_queue_list_contents(self):
         self.enable_queue_flag()
         login_person(self.branch_owner)
         browser = self.getUserBrowser(
-            canonical_url(self.branch_owner, rootsite='code',
+            canonical_url(self.context, rootsite='code',
                           view_name='+merge-queues'), self.branch_owner)
 
         table = find_tag_by_id(browser.contents, 'mergequeuetable')
-
-        merge_queue_info = {}
-        for row in table.tbody.fetch('tr'):
-            cells = row('td')
-            row_info = {}
-            queue_name = extract_text(cells[0])
-            if not queue_name.startswith('queue'):
-                continue
-            qlink = extract_link_from_tag(cells[0].find('a'))
-            row_info['queue_link'] = qlink
-            queue_size = extract_text(cells[1])
-            row_info['queue_size'] = queue_size
-            queue_branches = cells[2]('a')
-            branch_links = set()
-            for branch_tag in queue_branches:
-                branch_links.add(extract_link_from_tag(branch_tag))
-            row_info['branch_links'] = branch_links
-            merge_queue_info[queue_name] = row_info
+        merge_queue_info = self.extract_merge_queue_info(table)
 
         expected_queue_names = [queue.name for queue in self.merge_queues]
         self.assertEqual(
             set(expected_queue_names), set(merge_queue_info.keys()))
 
+        if self.check_queue_owner:
+            # All queues are created with self.branch_owner as the owner.
+            expected_queue_owners = [
+                'Eric' for queue in self.merge_queues]
+            observed_queue_owners = (
+                    [merge_queue_info[queue.name]['queue_owner']
+                     for queue in self.merge_queues])
+            self.assertEqual(
+                expected_queue_owners, observed_queue_owners)
+
         #TODO: when IBranchMergeQueue API is available remove '4'
         expected_queue_sizes = dict(
             [(queue.name, '4') for queue in self.merge_queues])
@@ -225,3 +207,294 @@
              for queue in self.merge_queues])
         self.assertEqual(
             expected_queue_branches, observed_queue_branches)
+
+
+class TestPersonMergeQueuesView(BaseTestMergeQueuesView):
+    """Tests for the person merge queue view.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesView.setUp(self)
+        self.context = self.branch_owner
+
+    def test_mergequeues_with_all_public_branches(self):
+        self._test_mergequeues_with_all_public_branches()
+
+    def test_mergequeues_with_a_private_branch_for_owner(self):
+        self._test_mergequeues_with_a_private_branch_for_owner()
+
+    def test_mergequeues_with_a_private_branch_for_other_user(self):
+        self._test_mergequeues_with_a_private_branch_for_other_user()
+
+
+class TestPersonMergeQueuesListPage(BaseTestMergeQueuesListPage):
+    """Tests for the person merge queue list page.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesListPage.setUp(self)
+        self.context = self.branch_owner
+        self.check_queue_owner = False
+
+    def extract_merge_queue_info(self, table):
+        merge_queue_info = {}
+        for row in table.tbody.fetch('tr'):
+            cells = row('td')
+            row_info = {}
+            queue_name = extract_text(cells[0])
+            if not queue_name.startswith('queue'):
+                continue
+            qlink = extract_link_from_tag(cells[0].find('a'))
+            row_info['queue_link'] = qlink
+            queue_size = extract_text(cells[1])
+            row_info['queue_size'] = queue_size
+            queue_branches = cells[2]('a')
+            branch_links = set()
+            for branch_tag in queue_branches:
+                branch_links.add(extract_link_from_tag(branch_tag))
+            row_info['branch_links'] = branch_links
+            merge_queue_info[queue_name] = row_info
+        return merge_queue_info
+
+    def test_merge_queue_list_contents_without_feature_flag(self):
+        self._test_merge_queue_list_contents_without_feature_flag()
+
+    def test_merge_queue_list_contents(self):
+        self._test_merge_queue_list_contents()
+
+
+class TestPersonCodePage(BrowserTestCase, MergeQueuesTestMixin):
+    """Tests for the person code homepage.
+
+    This is the default page shown for a person on the code subdomain.
+    """
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        BrowserTestCase.setUp(self)
+        MergeQueuesTestMixin.setUp(self)
+        self._makeMergeQueues()
+
+    def test_merge_queue_menu_link_without_feature_flag(self):
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.branch_owner, rootsite='code'),
+            self.branch_owner)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink,
+            url='+merge-queues')
+
+    def test_merge_queue_menu_link(self):
+        self.enable_queue_flag()
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.branch_owner, rootsite='code'),
+            self.branch_owner)
+        browser.getLink(url='+merge-queues').click()
+        self.assertEqual(
+            '%s/+merge-queues' % canonical_url(
+                self.branch_owner, rootsite='code'), browser.url)
+
+
+class TestProductMergeQueuesView(BaseTestMergeQueuesView):
+    """Tests for the product merge queue view.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesView.setUp(self)
+        self.context = self.product
+        # Make some other merge queues for a different product.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        self._makeMergeQueues(nr_queues=2, product=product, owner=person)
+
+    def test_mergequeues_with_all_public_branches(self):
+        self._test_mergequeues_with_all_public_branches()
+
+    def test_mergequeues_with_a_private_branch_for_owner(self):
+        self._test_mergequeues_with_a_private_branch_for_owner()
+
+    def test_mergequeues_with_a_private_branch_for_other_user(self):
+        self._test_mergequeues_with_a_private_branch_for_other_user()
+
+
+class TestProductMergeQueuesListPage(BaseTestMergeQueuesListPage):
+    """Tests for the product merge queue list page.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesListPage.setUp(self)
+        self.context = self.product
+        self.check_queue_owner = True
+        # Make some other merge queues for a different product.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        self._makeMergeQueues(nr_queues=2, product=product, owner=person)
+
+    def extract_merge_queue_info(self, table):
+        merge_queue_info = {}
+        for row in table.tbody.fetch('tr'):
+            cells = row('td')
+            row_info = {}
+            queue_name = extract_text(cells[0])
+            if not queue_name.startswith('queue'):
+                continue
+            qlink = extract_link_from_tag(cells[0].find('a'))
+            row_info['queue_link'] = qlink
+            queue_owner = extract_text(cells[1])
+            row_info['queue_owner'] = queue_owner
+            queue_size = extract_text(cells[2])
+            row_info['queue_size'] = queue_size
+            queue_branches = cells[3]('a')
+            branch_links = set()
+            for branch_tag in queue_branches:
+                branch_links.add(extract_link_from_tag(branch_tag))
+            row_info['branch_links'] = branch_links
+            merge_queue_info[queue_name] = row_info
+        return merge_queue_info
+
+    def test_merge_queue_list_contents_without_feature_flag(self):
+        self._test_merge_queue_list_contents_without_feature_flag()
+
+    def test_merge_queue_list_contents(self):
+        self._test_merge_queue_list_contents()
+
+
+class TestProductCodePage(BrowserTestCase, MergeQueuesTestMixin):
+    """Tests for the product code homepage.
+
+    This is the default page shown for a product on the code subdomain.
+    """
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        BrowserTestCase.setUp(self)
+        MergeQueuesTestMixin.setUp(self)
+        self._makeMergeQueues()
+
+    def test_merge_queue_menu_link_without_feature_flag(self):
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.product, rootsite='code'),
+            self.branch_owner)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink,
+            url='+merge-queues')
+
+    def test_merge_queue_menu_link(self):
+        self.enable_queue_flag()
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.product, rootsite='code'),
+            self.branch_owner)
+        browser.getLink(url='+merge-queues').click()
+        self.assertEqual(
+            '%s/+merge-queues' % canonical_url(self.product, rootsite='code'),
+            browser.url)
+
+
+class TestPersonProductMergeQueuesView(BaseTestMergeQueuesView):
+    """Tests for the person merge queue view.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesView.setUp(self)
+        self.context = getUtility(IPersonProductFactory).create(
+            self.branch_owner, self.product)
+        # Make some other merge queues for a different product.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        self._makeMergeQueues(nr_queues=2, product=product, owner=person)
+
+    def test_mergequeues_with_all_public_branches(self):
+        self._test_mergequeues_with_all_public_branches()
+
+    def test_mergequeues_with_a_private_branch_for_owner(self):
+        self._test_mergequeues_with_a_private_branch_for_owner()
+
+    def test_mergequeues_with_a_private_branch_for_other_user(self):
+        self._test_mergequeues_with_a_private_branch_for_other_user()
+
+
+class TestPersonProductMergeQueuesListPage(TestPersonMergeQueuesListPage):
+    """Tests for the person merge queue list page.
+
+    The tests are all defined on the base class. This class sets up the
+    context and provides helper method(s) for the tests.
+    """
+
+    def setUp(self):
+        BaseTestMergeQueuesListPage.setUp(self)
+        self.context = getUtility(IPersonProductFactory).create(
+            self.branch_owner, self.product)
+        self.check_queue_owner = False
+        self.context = getUtility(IPersonProductFactory).create(
+            self.branch_owner, self.product)
+        # Make some other merge queues for a different product.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        self._makeMergeQueues(nr_queues=2, product=product, owner=person)
+
+    def test_merge_queue_list_contents_without_feature_flag(self):
+        self._test_merge_queue_list_contents_without_feature_flag()
+
+    def test_merge_queue_list_contents(self):
+        self._test_merge_queue_list_contents()
+
+
+class TestPersonProductCodePage(BrowserTestCase, MergeQueuesTestMixin):
+    """Tests for the person product code homepage.
+
+    This is the default page shown for a person product on the code
+    subdomain.
+    """
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        BrowserTestCase.setUp(self)
+        MergeQueuesTestMixin.setUp(self)
+        self.context = getUtility(IPersonProductFactory).create(
+            self.branch_owner, self.product)
+        self._makeMergeQueues()
+
+    def test_merge_queue_menu_link_without_feature_flag(self):
+
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.branch_owner, rootsite='code'),
+            self.branch_owner)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink,
+            url='+merge-queues')
+
+    def test_merge_queue_menu_link(self):
+        self.enable_queue_flag()
+        login_person(self.branch_owner)
+        browser = self.getUserBrowser(
+            canonical_url(self.branch_owner, rootsite='code'),
+            self.branch_owner)
+        browser.getLink(url='+merge-queues').click()
+        self.assertEqual(
+            '%s/+merge-queues' % canonical_url(
+                self.branch_owner, rootsite='code'), browser.url)

=== modified file 'lib/lp/code/interfaces/branchmergequeuecollection.py'
--- lib/lp/code/interfaces/branchmergequeuecollection.py	2010-11-01 12:41:14 +0000
+++ lib/lp/code/interfaces/branchmergequeuecollection.py	2010-11-22 11:58:12 +0000
@@ -59,6 +59,9 @@
         """Restrict the collection to queues that 'person' is allowed to see.
         """
 
+    def inProduct(product):
+        """Restrict the collection to queues with branches for 'product'."""
+
 
 class IAllBranchMergeQueues(IBranchMergeQueueCollection):
     """An `IBranchMergeQueueCollection` of all branch merge queues."""

=== modified file 'lib/lp/code/model/branchmergequeuecollection.py'
--- lib/lp/code/model/branchmergequeuecollection.py	2010-11-02 22:41:11 +0000
+++ lib/lp/code/model/branchmergequeuecollection.py	2010-11-22 11:58:12 +0000
@@ -10,6 +10,8 @@
 
 from zope.interface import implements
 
+from storm.expr import Join
+
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 from lp.code.interfaces.branchmergequeue import (
     user_has_special_merge_queue_access,
@@ -19,6 +21,7 @@
     InvalidFilter,
     )
 from lp.code.interfaces.codehosting import LAUNCHPAD_SERVICES
+from lp.code.model.branch import Branch
 from lp.code.model.branchmergequeue import BranchMergeQueue
 
 
@@ -108,9 +111,17 @@
             return self
         return VisibleBranchMergeQueueCollection(
             person,
-            self._store, None,
+            self._store, self._merge_queue_filter_expressions,
             self._tables, self._exclude_from_search)
 
+    def inProduct(self, product):
+        """See `IBranchMergeQueueCollection`."""
+        return self._filterBy(
+            [Branch.product == product],
+            exclude_from_search=['product'],
+            table=Branch,
+            join=Join(Branch, BranchMergeQueue.id == Branch.merge_queue_id))
+
 
 class VisibleBranchMergeQueueCollection(GenericBranchMergeQueueCollection):
     """A mergequeue collection which provides queues visible by a user."""

=== modified file 'lib/lp/code/model/tests/test_branchmergequeuecollection.py'
--- lib/lp/code/model/tests/test_branchmergequeuecollection.py	2010-11-03 08:28:44 +0000
+++ lib/lp/code/model/tests/test_branchmergequeuecollection.py	2010-11-22 11:58:12 +0000
@@ -102,6 +102,43 @@
         collection = self.all_queues.ownedBy(queue.owner)
         self.assertEqual([queue], collection.getMergeQueues())
 
+    def test_inProduct(self):
+        # 'inProject' returns a new collection restricted to queues
+        # with branches in the given project.
+        branch = self.factory.makeProductBranch()
+        branch2 = self.factory.makeProductBranch()
+        branch3 = self.factory.makeAnyBranch()
+        queue = self.factory.makeBranchMergeQueue(
+            branches=[removeSecurityProxy(branch)])
+        queue2 = self.factory.makeBranchMergeQueue(
+            branches=[removeSecurityProxy(branch2)])
+        queue3 = self.factory.makeBranchMergeQueue(
+            branches=[removeSecurityProxy(branch3)])
+
+        collection = self.all_queues.inProduct(branch.product)
+        self.assertEqual([queue], list(collection.getMergeQueues()))
+
+    def test_ownedBy_and_inProduct(self):
+        # 'ownedBy' and 'inProduct' can combine to form a collection that is
+        # restricted to queues of a particular product and owned by a
+        # particular person.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        branch = self.factory.makeProductBranch(product=product, owner=person)
+        branch2 = self.factory.makeAnyBranch(owner=person)
+        branch3 = self.factory.makeProductBranch(product=product)
+        queue = self.factory.makeBranchMergeQueue(
+            owner=person, branches=[removeSecurityProxy(branch)])
+        queue2 = self.factory.makeBranchMergeQueue(
+            owner=person, branches=[removeSecurityProxy(branch2)])
+        queue3 = self.factory.makeBranchMergeQueue(
+            branches=[removeSecurityProxy(branch3)])
+
+        collection = self.all_queues.inProduct(product).ownedBy(person)
+        self.assertEqual([queue], list(collection.getMergeQueues()))
+        collection = self.all_queues.ownedBy(person).inProduct(product)
+        self.assertEqual([queue], list(collection.getMergeQueues()))
+
 
 class TestGenericBranchMergeQueueCollectionVisibleFilter(TestCaseWithFactory):
 
@@ -171,6 +208,14 @@
                     queue_with_private_branch]),
             sorted(queues.getMergeQueues()))
 
+    def test_visibility_then_product(self):
+        # We can apply other filters after applying the visibleByUser filter.
+        second_public_queue = self.factory.makeBranchMergeQueue()
+        product = self.queue_with_public_branch.branches[0].product
+        queues = self.all_queues.visibleByUser(None).inProduct(
+            product).getMergeQueues()
+        self.assertEqual([self.queue_with_public_branch], list(queues))
+
     def test_launchpad_services_sees_all(self):
         # The LAUNCHPAD_SERVICES special user sees *everything*.
         queues = self.all_queues.visibleByUser(LAUNCHPAD_SERVICES)

=== modified file 'lib/lp/code/templates/product-portlet-codestatistics.pt'
--- lib/lp/code/templates/product-portlet-codestatistics.pt	2010-10-14 23:15:25 +0000
+++ lib/lp/code/templates/product-portlet-codestatistics.pt	2010-11-22 11:58:12 +0000
@@ -2,6 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  tal:define="features request/features"
   id="portlet-product-codestatistics">
 
     <p id="active-review-count"
@@ -11,7 +12,18 @@
       <tal:project replace="context/displayname"/> has
       <tal:active-count replace="count"/>
       <tal:link replace="structure python: link.render().lower()"/>.
-    </p> 
+    </p>
+
+    <div tal:condition="features/code.branchmergequeue">
+      <p id="merge-queue-count"
+         tal:define="count context/menu:branches/mergequeue_count;
+                     link context/menu:branches/mergequeues"
+         tal:condition="python: count &gt; 0">
+        <tal:project replace="context/displayname"/> has
+        <tal:active-count replace="count"/>
+        <tal:link replace="structure python: link.render().lower()"/>.
+      </p>
+    </div>
 
     <!--branches-->
     <p>
@@ -25,7 +37,7 @@
       <tal:branch-count replace="count"/>
       <tal:branches replace="python: view.branch_text.lower()">
         branches
-      </tal:branches 
+      </tal:branches
       ><tal:has-branches condition="view/branch_count">
         owned by
         <tal:individuals condition="view/person_owner_count">