Merge lp:~jml/launchpad/remove-product-branch-portlet into lp:launchpad/db-devel

[Jonathan Lange]

Remove unused branch portlet and code that existed solely to support it.

I was poking around trying to delete the branch-related sample data across Launchpad and came across the getLatestBranchesForProduct method and its kin in IProduct.

AFAICT, it's only used in this one portlet, and I can't find this portlet actually being used anywhere on Launchpad. Maybe I'm looking in the wrong way. In any case, the tests are running now.

Merging against db-devel since that's where I made the branch. It can apply to devel once db-stable has been merged back in.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-06-03 23:33:00 +0000
+++ lib/lp/code/browser/configure.zcml	2010-07-09 10:29:07 +0000
@@ -863,17 +863,6 @@
             permission="zope.Public"/>
     </facet>
 
-    <browser:pages
-        for="lp.registry.interfaces.product.IProduct"
-        permission="zope.Public"
-        class="lp.registry.browser.product.ProductView">
-
-      <browser:page
-            name="+portlet-latestbranches"
-            template="../templates/product-portlet-latestbranches.pt"/>
-
-    </browser:pages>
-
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
         class="lp.code.browser.branchlisting.ProductBranchesView"

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2010-06-10 07:55:54 +0000
+++ lib/lp/code/interfaces/branch.py	2010-07-09 10:29:07 +0000
@@ -1236,23 +1236,6 @@
         :type visible_by_user: `IPerson` or None
         """
 
-    def getLatestBranchesForProduct(product, quantity, visible_by_user=None):
-        """Return the most recently created branches for the product.
-
-        At most `quantity` branches are returned. Branches that have been
-        merged or abandoned don't appear in the results -- only branches that
-        match `DEFAULT_BRANCH_STATUS_IN_LISTING`.
-
-        :param visible_by_user: If a person is not supplied, only public
-            branches are returned.  If a person is supplied both public
-            branches, and the private branches that the person is entitled to
-            see are returned.  Private branches are only visible to the owner
-            and subscribers of the branch, and to LP admins.
-        :type visible_by_user: `IPerson` or None
-        """
-        # XXX: JonathanLange 2008-11-27 spec=package-branches: This API needs
-        # to change for source package branches.
-
     @operation_parameters(
         unique_name=TextLine(title=_('Branch unique name'), required=True))
     @operation_returns_entry(IBranch)

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-06-11 03:36:15 +0000
+++ lib/lp/code/model/branch.py	2010-07-09 10:29:07 +0000
@@ -1226,18 +1226,6 @@
             branches.config(limit=branch_count)
         return branches
 
-    def getLatestBranchesForProduct(self, product, quantity,
-                                    visible_by_user=None):
-        """See `IBranchSet`."""
-        assert product is not None, "Must have a valid product."
-        all_branches = getUtility(IAllBranches)
-        latest = all_branches.visibleByUser(visible_by_user).inProduct(
-            product).withLifecycleStatus(*DEFAULT_BRANCH_STATUS_IN_LISTING)
-        latest_branches = latest.getBranches().order_by(
-            Desc(Branch.date_created), Desc(Branch.id))
-        latest_branches.config(limit=quantity)
-        return latest_branches
-
     def getByUniqueName(self, unique_name):
         """See `IBranchSet`."""
         return getUtility(IBranchLookup).getByUniqueName(unique_name)

=== modified file 'lib/lp/code/model/tests/test_branchset.py'
--- lib/lp/code/model/tests/test_branchset.py	2009-11-19 15:30:47 +0000
+++ lib/lp/code/model/tests/test_branchset.py	2010-07-09 10:29:07 +0000
@@ -8,14 +8,9 @@
 from unittest import TestLoader
 
 from lp.code.model.branch import BranchSet
-from lp.code.enums import BranchLifecycleStatus
-from lp.registry.interfaces.product import IProductSet
 from lp.testing import TestCaseWithFactory
 from canonical.testing import DatabaseFunctionalLayer
 
-from zope.component import getUtility
-from zope.security.proxy import removeSecurityProxy
-
 
 class TestBranchSet(TestCaseWithFactory):
 
@@ -23,46 +18,8 @@
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
-        self.product = getUtility(IProductSet).getByName('firefox')
         self.branch_set = BranchSet()
 
-    def test_limitedByQuantity(self):
-        """When getting the latest branches for a product, we can specify the
-        maximum number of branches we want to know about.
-        """
-        quantity = 3
-        latest_branches = self.branch_set.getLatestBranchesForProduct(
-            self.product, quantity)
-        self.assertEqual(quantity, len(list(latest_branches)))
-
-    def test_onlyForProduct(self):
-        """getLatestBranchesForProduct returns branches only from the
-        requested product.
-        """
-        quantity = 5
-        latest_branches = self.branch_set.getLatestBranchesForProduct(
-            self.product, quantity)
-        self.assertEqual(
-            [self.product.name] * quantity,
-            [branch.product.name for branch in latest_branches])
-
-    def test_abandonedBranchesNotIncluded(self):
-        """getLatestBranchesForProduct does not include branches that have
-        been abandoned, because they are not relevant for those interested
-        in recent activity.
-        """
-        original_branches = list(
-            self.branch_set.getLatestBranchesForProduct(self.product, 5))
-        branch = original_branches[0]
-        # XXX: JonathanLange 2007-07-06: WHITEBOXING. The anonymous user
-        # cannot change branch details, so we remove the security proxy and
-        # change it.
-        branch = removeSecurityProxy(branch)
-        branch.lifecycle_status = BranchLifecycleStatus.ABANDONED
-        latest_branches = list(
-            self.branch_set.getLatestBranchesForProduct(self.product, 5))
-        self.assertEqual(original_branches[1:], latest_branches)
-
     def test_getByUrls(self):
         # getByUrls returns a list of branches matching the list of URLs that
         # it's given.

=== removed file 'lib/lp/code/templates/product-portlet-latestbranches.pt'
--- lib/lp/code/templates/product-portlet-latestbranches.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/code/templates/product-portlet-latestbranches.pt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  omit-tag="">
-
-<div
-  tal:condition="view/getLatestBranches"
-  class="portlet"
-  id="portlet-latest-branches"
->
-  <h2>Latest branches</h2>
-  <div class="portletBody portletContent">
-    <ul class="branch">
-
-    <li tal:repeat="branch view/getLatestBranches" class="branch">
-      <a tal:attributes="href branch/fmt:url"
-         tal:content="branch/name"
-      >branch name</a
-      ><img src="/@@/private" alt=" (private)"
-            tal:condition="branch/private"/>:
-      <a tal:replace="structure branch/owner/fmt:link">
-            Guilherme Salgado
-      </a>
-    </li>
-  </ul>
-
-  </div>
-</div>
-</tal:root>

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-06-23 18:41:02 +0000
+++ lib/lp/registry/browser/product.py	2010-07-09 10:29:07 +0000
@@ -965,9 +965,6 @@
         url = canonical_url(series) + '/+bugs'
         return get_buglisting_search_filter_url(url, status=status)
 
-    def getLatestBranches(self):
-        return self.context.getLatestBranches(visible_by_user=self.user)
-
     @property
     def requires_commercial_subscription(self):
         """Whether to display notice to purchase a commercial subscription."""

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2010-06-14 20:15:22 +0000
+++ lib/lp/registry/interfaces/product.py	2010-07-09 10:29:07 +0000
@@ -685,9 +685,6 @@
         :return: None
         """
 
-    def getLatestBranches(quantity=5):
-        """Latest <quantity> branches registered for this product."""
-
     def getPackage(distroseries):
         """Return a package in that distroseries for this product."""
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-05-24 13:54:12 +0000
+++ lib/lp/registry/model/product.py	2010-07-09 10:29:07 +0000
@@ -658,12 +658,6 @@
         """See `IBugTarget`."""
         return self.name
 
-    def getLatestBranches(self, quantity=5, visible_by_user=None):
-        """See `IProduct`."""
-        return shortlist(
-            getUtility(IBranchSet).getLatestBranchesForProduct(
-                self, quantity, visible_by_user))
-
     def getPackage(self, distroseries):
         """See `IProduct`."""
         if isinstance(distroseries, Distribution):