Merge lp:~bac/launchpad/bug-643538-code into lp:launchpad

[Brad Crittenden]

State the project's code usage, either Launchpad or elsewhere.

= Summary =

Launchpad must state the project's code usage. The product +code-index page needs to clearly state if the project is using Launchpad. If it isn't it should refer to where it is hosted.

== Proposed fix ==

Conditionally present the correct message. Also moved some of the code summary information into portlets in order to be more like the other application areas.

== Pre-implementation notes ==

Chats with Curtis, Edwin, and Jon.

== Implementation details ==

As above.

== Tests ==

Basically all of the code tests need to run:
bin/test -vvm lp.code

== Demo and Q/A ==

Create a new project and visit:
https://code.launchpad.dev/mynewproject

= Launchpad lint =

The lint issues are pretty much intractable. I cleaned up a lot.

Linting changed files:
  lib/lp/code/browser/configure.zcml
  lib/canonical/launchpad/icing/style.css
  lib/lp/code/templates/product-branches.pt
  lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt
  lib/lp/code/browser/branch.py
  lib/lp/code/browser/tests/test_product.py
  lib/lp/registry/browser/product.py
  lib/lp/code/browser/tests/test_branch.py
  lib/lp/code/stories/branches/xx-product-branches.txt
  lib/lp/code/templates/product-portlet-codestatistics-content.pt
  lib/lp/registry/browser/pillar.py
  lib/lp/code/stories/branches/xx-person-branches.txt
  lib/lp/code/templates/product-portlet-codestatistics.pt
  lib/lp/code/templates/product-branch-summary.pt
  lib/lp/registry/browser/tests/pillar-views.txt
  lib/lp/code/stories/branches/xx-private-branch-listings.txt
  lib/lp/registry/model/product.py
  lib/lp/registry/tests/test_service_usage.py
  lib/lp/code/browser/branchlisting.py

./lib/lp/code/stories/branches/xx-private-branch-listings.txt
      83: want exceeds 78 characters.
      93: want exceeds 78 characters.
./lib/lp/code/browser/branchlisting.py
     409: Line exceeds 78 characters.

[Brad Crittenden (bac)]

Screenshots can be seen at: http://people.canonical.com/~bac/code_usage/

[Brad Crittenden (bac)]

I've noticed on the screen where no code has been registered[1] there is a link to +set-branch (Configure code hosting) but no link to +add-branch (seen later as "Register a branch"). This seems like an oversight because using the former you cannot mirror a branch, only set in Launchpad and import.

[1] http://people.canonical.com/~bac/code_usage/0-nocode-owner.png

[Gavin Panella (allenap)]

Cool branch :)

The comments I have are all really minor.

Gavin.

[1]

     def getDistroDevelSeries(self, distribution):
- """Since distribution.currentseries hits the DB every time, cache it."""
+ """distribution.currentseries hits the DB every time so cache it."""
         self._distro_series_map = {}
         try:
             return self._distro_series_map[distribution]
         except KeyError:
             result = distribution.currentseries
             self._distro_series_map[distribution] = result
             return result

I think your change doesn't describe what the code does... but that's
because the code is broken! The following line is the culprit:

         self._distro_series_map = {}

Every time the method is called the cache gets reset. I think this
line can be removed.

[2]

+ self.branch = self.development_focus_branch

development_focus_branch is a cachedproperty, so perhaps branch should
be a property so that development_focus_branch is not computed until
it is needed.

[3]

+ self.assertEqual(None, find_tag_by_id(contents, 'branch-portlet'))
...
+ self.assertNotEqual(None, find_tag_by_id(contents, 'branch-portlet'))

I think this (and others that test against None) should be done with
assertIs(None, ...). Can't remember what difference is makes though :)

[4]

+ def test_portlets_shown_for_EXTERNAL(self):
+ # If the BranchUsage is HOSTED then the portlets are shown.

s/HOSTED/EXTERNAL/

[5]

+ <a tal:attributes="href view/mirror_location"><tal:mirror replace="view/mirror_location"/></a>.

Doesn't really matter, but it might be clearer expressed as:

        <a tal:attributes="href view/mirror_location"
           tal:content="view/mirror_location"/>.

[6]

+ <div tal:condition="not:view/new_branches_are_private" id="privacy-text">
+ <p>
+ New branches you create for <tal:name replace="context/displayname"/>
+ are <strong>public</strong> initially.
+ </p>
+ </div>
+ <div tal:condition="view/new_branches_are_private" id="privacy-text">
+ <p>
+ New branches you create for <tal:name replace="context/displayname"/>
+ are <strong>private</strong> initially.
+ </p>
+ </div>

The tal:condition could go on the subordinate <p> tags, then there's
only one <div>.

[7]

+ <tal:comment condition="nothing">
+ The view/*_count|nothing expressions below are so that this
+ template can be rendered by a view that does not have count
+ information available.
+ </tal:comment>

There aren't any view/*_count|nothing expressions, so this comment can
go.

[8]

+ configured = sum([1 for v in config_statuses.values() if v])

Don't need the list comprehension.

review: Approve (code)

[Brad Crittenden (bac)]

On Sep 23, 2010, at 11:49 , Gavin Panella wrote:

> Review: Approve code
> Cool branch :)
>
> The comments I have are all really minor.

Thanks for the helpful review Gavin.

>
> Gavin.
>
>
> [1]
>
> def getDistroDevelSeries(self, distribution):
> - """Since distribution.currentseries hits the DB every time, cache it."""
> + """distribution.currentseries hits the DB every time so cache it."""
> self._distro_series_map = {}
> try:
> return self._distro_series_map[distribution]
> except KeyError:
> result = distribution.currentseries
> self._distro_series_map[distribution] = result
> return result
>
> I think your change doesn't describe what the code does... but that's
> because the code is broken! The following line is the culprit:
>
> self._distro_series_map = {}
>
> Every time the method is called the cache gets reset. I think this
> line can be removed.

Thanks for looking. My change was just to stop lint from complaining about the comment being too long -- I didn't even see the broken code.

>
>
> [2]
>
> + self.branch = self.development_focus_branch
>
> development_focus_branch is a cachedproperty, so perhaps branch should
> be a property so that development_focus_branch is not computed until
> it is needed.
>

Good catch.

>
> [3]
>
> + self.assertEqual(None, find_tag_by_id(contents, 'branch-portlet'))
> ...
> + self.assertNotEqual(None, find_tag_by_id(contents, 'branch-portlet'))
>
> I think this (and others that test against None) should be done with
> assertIs(None, ...). Can't remember what difference is makes though :)
>

Done

>
> [4]
>
> + def test_portlets_shown_for_EXTERNAL(self):
> + # If the BranchUsage is HOSTED then the portlets are shown.
>
> s/HOSTED/EXTERNAL/
>

Done

>
> [5]
>
> + <a tal:attributes="href view/mirror_location"><tal:mirror replace="view/mirror_location"/></a>.
>
> Doesn't really matter, but it might be clearer expressed as:
>
> <a tal:attributes="href view/mirror_location"
> tal:content="view/mirror_location"/>.
>
>

Yes, much nicer.

> [6]
>
> + <div tal:condition="not:view/new_branches_are_private" id="privacy-text">
> + <p>
> + New branches you create for <tal:name replace="context/displayname"/>
> + are <strong>public</strong> initially.
> + </p>
> + </div>
> + <div tal:condition="view/new_branches_are_private" id="privacy-text">
> + <p>
> + New branches you create for <tal:name replace="context/displayname"/>
> + are <strong>private</strong> initially.
> + </p>
> + </div>
>
> The tal:condition could go on the subordinate <p> tags, then there's
> only one <div>.
>

Done.

>
> [7]
>
> + <tal:comment condition="nothing">
> + The view/*_count|nothing expressions below are so that this
> + template can be rendered by a view that does not have count
> + information available.
> + </tal:comment>
>
> There aren't any view/*_count|nothing expressions, so this comment can
> go.
>
>
c-n-p error

> [8]
>
> ...

[Matthew Revell (matthew.revell)]

Thanks for this work Brad. I have a couple of suggestions:

When no code hosting/mirroring is configured, I think the page would be easier to read if some of the text were split up.

For screen shots 0 and 1, I suggest the following:

  There are no branches of ticktock in Launchpad. You can change this by:

   * activating code hosting directly on Launchpad (read more)
   * asking Launchpad to mirror a Bazaar branch hosted elsewhere (read more)
   * asking Launchpad to import code from Git, Subversion or CVS into a Bazaar branch (read more).

I have removed Mercurial because Tim tells me it is still very much experimental (i.e. works in around 20% of cases).

Other than that, I'm Matthew Revell and I approve this message.

review: Approve (text)

[Guilherme Salgado (salgado)]

This looks good but I'm not sure the portlets will work nice with real data. For instance, if you see https://code.edge.launchpad.net/launchpad, most branches have long names, which cause most of the horizontal space to be used. How will that look with the portlets?

Also, it looks a bit weird having the two different styles of links (the Register a branch one uses a bigger font and the icon is to its left while the others use a smaller font and have the icon to the right) on the portlet. And by the way, are we moving the action links that were once inlined back into portlets?

review: Needs Information (ui*)

[Brad Crittenden (bac)]

Salgado thanks for the review and the questions.

I tried creating some branches with absurdly long names to see what happened. Using a browser that is almost 1400 pixels wide I get http://people.canonical.com/~bac/code_usage/5-code-still-fits.png. I should probably sees what that looks like on a netbook instead of my 27" monitor. :)

Shrinking the browser from there causes bad behavior seen at http://people.canonical.com/~bac/code_usage/6-too-narrow-overlap.png. I'll work with Curtis to see what can be done.

The other application pages have portlets similar to the one I'm proposing. The link styles are patterned after the involvement portlet on a project index page as seen by a project owner so it is on unprecedented. I think the layout needs some tweaking.

[Curtis Hovey (sinzui)]

The branch urls/names/displayname/what-ever should be using fmt:break-long-words

I think the font size difference in the links is a real problem. They should be the same, particularly since both presentations were added for 3.0. I do not know which is wrong. The problem might be hard to find because one might be using styles from the deprecated style sheet. I cannot judge the scope of this issue. it might be worthy of a separate bug, and it may be in launchpad-web if it is a universal issue.

[Brad Crittenden (bac)]

Hi Curtis, Matthew and Salgado.

I have made the changes as requested by you and they are shown in screenshots 7-9 at http://people.canonical.com/~bac/code_usage/.

* Bulleted list
* Capitalizing the items in the portlets
* Using break-long-words on the branch names in the table allows them to collapse when the window shrinks
* Don't

The requested changes required a number of test changes, especially the change to not show the portlets when code hosting has not yet been configured. Curtis in addition to mentoring the UI could you look at the latest code diff at http://pastebin.ubuntu.com/502288/ ?

[Curtis Hovey (sinzui)]

The code looks fine. You fixed the sprite and comprehension issues I pointed out in the paste.

I was disappointed by the story additions, the stories did not really tell a story. I was also concerned that the /applets is owned by Foo Bar, so the test for an story about an owner was performed by an admin :(. We looked and did not see an intersection with the unittests in lp/code/browser/tests, so we decided to accept the changes. This branch is large and has a lot of value.

review: Approve (code)

[Guilherme Salgado (salgado)]

On Tue, 2010-09-28 at 19:50 +0000, Brad Crittenden wrote:
> Hi Curtis, Matthew and Salgado.
>
> I have made the changes as requested by you and they are shown in
> screenshots 7-9 at http://people.canonical.com/~bac/code_usage/.
>
> * Bulleted list
> * Capitalizing the items in the portlets
> * Using break-long-words on the branch names in the table allows them
> to collapse when the window shrinks

That certainly improves things, but my main concern was with the
horizontal space that is now taken by the portlets. Given that the
portlets have virtually no content (just action links and 3 lines of
statistics), we're wasting a significant amount (IMHO) of real state,
which will make the branches list a bit too narrow on a 800px wide
browser window, like I tend to use[1]
(<http://people.canonical.com/~salgado/branches.png>).

You've said that other application pages have portlets, and that's true
for the bugs app page, but in that case they have a significant amount
of content (the tag cloud, pre-defined searches and action links), which
is not the case here. Also, the translations app page, on the other
hand, doesn't have any portlets, so I'm still not convinced the code app
page should have them. Unless there's a policy I'm not aware of?

[1] Even though my monitor's resolution is higher than that, I tend to
use less than 800px wide browser windows because most pages work fine on
those and I think Launchpad should as well.

[Curtis Hovey (sinzui)]

On Tue, 2010-09-28 at 21:07 +0000, Guilherme Salgado wrote:
> You've said that other application pages have portlets, and that's
> true
> for the bugs app page, but in that case they have a significant amount
> of content (the tag cloud, pre-defined searches and action links),
> which
> is not the case here. Also, the translations app page, on the other
> hand, doesn't have any portlets, so I'm still not convinced the code
> app
> page should have them. Unless there's a policy I'm not aware of?

The intent of the features is to make the root pages for projects to use
the same layouts and conventions. Code is using a 2.0 layout still.
Translations remains a conundrum. The user should trust that global
actions and set searches are in the right portlets.

This feature work is driven by our own strategists complaint that users
see conflicting designs when they work across applications.

{{{

Hello Curtis, Strategons,

Attached are screenshots of each of the six tabs of Launchpad for a
newly created project.

I want you to look at them. Make a note of the fonts, the styling of
the action portlets, the alignment of cells, the busyness of the
pages, the balance of the layouts, the colours used, the amount of
text on each page.

You will notice that there is significant difference between each
page. If you look at the pages with a detached eye, you may well come
to the conclusion that none of them are very nice to look at.

I think that this is a problem. I don't mean to put down anyone on the
team, but I would be embarrassed to present on these pages at a
conference.

...

}}}

This lead to an extension of the bridging-the-gap theme in June.
Launchpad must state where services are hosted so that they can complete
their task. Launchpad must state when the service is unknown, hosted, or
external. The applications must behave the same way when unknown,
external, or hosted so that users know what to expect when they use
multiple applications.
--
__Curtis C. Hovey_________
http://launchpad.net/

[Guilherme Salgado (salgado)]

Thanks for the explanation, Curtis.

Since it looks like this has been thought through carefully, I think
it's reasonable to trade some screen real estate with better
consistency.

 review approve

review: Approve

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2010-05-28 19:47:23 +0000
+++ lib/canonical/launchpad/icing/style.css	2010-09-28 22:26:02 +0000
@@ -550,6 +550,16 @@
     color: black !important;
 }
 
+.code-links td.code-count {
+  text-align: right;
+  padding-right: 0.5em;
+}
+
+.code-links td.code-link {
+  text-align: left;
+  margin: 0 0 0 0;
+}
+
 
 /* === Bugs === */
 /* The Launchpad Bugs application uses a maroon color: */
@@ -585,6 +595,15 @@
   padding-right: 1em;
 }
 
+.bug-links td.bugs-count {
+  text-align: right;
+  padding-right: 0.5em;
+}
+
+.bug-links td.bugs-link {
+  text-align: left;
+}
+
 /* --- Blueprints --- */
 
 body.tab-specifications #actions, body.tab-specifications .results {
@@ -652,15 +671,6 @@
   margin: 0.5em;
 }
 
-.bug-links td.bugs-count {
-  text-align: right;
-  padding-right: 0.5em;
-}
-
-.bug-links td.bugs-link {
-  text-align: left;
-}
-
 /* ====== Content area styles ====== */
 
 /* -- Front pages -- */

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-08-24 10:45:57 +0000
+++ lib/lp/code/browser/branch.py	2010-09-28 22:26:02 +0000
@@ -16,6 +16,7 @@
     'BranchReviewerEditView',
     'BranchMergeQueueView',
     'BranchMirrorStatusView',
+    'BranchMirrorMixin',
     'BranchNameValidationMixin',
     'BranchNavigation',
     'BranchEditMenu',
@@ -374,7 +375,39 @@
         return Link('+new-recipe', text, enabled=enabled, icon='add')
 
 
-class BranchView(LaunchpadView, FeedsMixin):
+class BranchMirrorMixin:
+    """Provide mirror_location property.
+
+    Requires self.branch to be set by the class using this mixin.
+    """
+
+    @property
+    def mirror_location(self):
+        """Check the mirror location to see if it is a private one."""
+        branch = self.branch
+
+        # If the user has edit permissions, then show the actual location.
+        if check_permission('launchpad.Edit', branch):
+            return branch.url
+
+        # XXX: Tim Penhey, 2008-05-30
+        # Instead of a configuration hack we should support the users
+        # specifying whether or not they want the mirror location
+        # hidden or not.  Given that this is a database patch,
+        # it isn't going to happen today.
+        # See bug 235916
+        hosts = config.codehosting.private_mirror_hosts.split(',')
+        private_mirror_hosts = [name.strip() for name in hosts]
+
+        uri = URI(branch.url)
+        for private_host in private_mirror_hosts:
+            if uri.underDomain(private_host):
+                return '<private server>'
+
+        return branch.url
+
+
+class BranchView(LaunchpadView, FeedsMixin, BranchMirrorMixin):
 
     feed_types = (
         BranchFeedLink,
@@ -387,6 +420,7 @@
     label = page_title
 
     def initialize(self):
+        self.branch = self.context
         self.notices = []
         # Replace our context with a decorated branch, if it is not already
         # decorated.
@@ -586,31 +620,6 @@
         return url.startswith("http")
 
     @property
-    def mirror_location(self):
-        """Check the mirror location to see if it is a private one."""
-        branch = self.context
-
-        # If the user has edit permissions, then show the actual location.
-        if check_permission('launchpad.Edit', branch):
-            return branch.url
-
-        # XXX: Tim Penhey, 2008-05-30
-        # Instead of a configuration hack we should support the users
-        # specifying whether or not they want the mirror location
-        # hidden or not.  Given that this is a database patch,
-        # it isn't going to happen today.
-        # See bug 235916
-        hosts = config.codehosting.private_mirror_hosts.split(',')
-        private_mirror_hosts = [name.strip() for name in hosts]
-
-        uri = URI(branch.url)
-        for private_host in private_mirror_hosts:
-            if uri.underDomain(private_host):
-                return '<private server>'
-
-        return branch.url
-
-    @property
     def show_merge_links(self):
         """Return whether or not merge proposal links should be shown.
 

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2010-08-31 11:11:09 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-09-28 22:26:02 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Base class view for branch listings."""
@@ -83,15 +83,18 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.widgets import LaunchpadDropdownWidget
+from lp.app.browser.tales import MenuAPI
 from lp.blueprints.interfaces.specificationbranch import (
     ISpecificationBranchSet,
     )
 from lp.bugs.interfaces.bugbranch import IBugBranchSet
+from lp.code.browser.branch import BranchMirrorMixin
 from lp.code.browser.branchmergeproposallisting import (
     ActiveReviewsView,
     PersonActiveReviewsView,
     PersonProductActiveReviewsView,
     )
+from lp.code.browser.summary import BranchCountSummaryView
 from lp.code.enums import (
     BranchLifecycleStatus,
     BranchLifecycleStatusFilter,
@@ -124,7 +127,6 @@
     IPersonProduct,
     IPersonProductFactory,
     )
-from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackage import ISourcePackageFactory
@@ -421,8 +423,7 @@
         return sorted(links, key=attrgetter('pocket'))
 
     def getDistroDevelSeries(self, distribution):
-        """Since distribution.currentseries hits the DB every time, cache it."""
-        self._distro_series_map = {}
+        """distribution.currentseries hits the DB every time so cache it."""
         try:
             return self._distro_series_map[distribution]
         except KeyError:
@@ -777,7 +778,7 @@
     """A branch listing that has no associated product or person."""
 
     field_names = ['lifecycle']
-    no_sort_by = (BranchListingSort.DEFAULT,)
+    no_sort_by = (BranchListingSort.DEFAULT, )
 
     no_branch_message = (
         'There are no branches that match the current status filter.')
@@ -932,8 +933,8 @@
     def active_reviews(self):
         text = get_plural_text(
             self.active_review_count,
-            'active review or unmerged proposal',
-            'active reviews or unmerged proposals')
+            'active review',
+            'active reviews')
         return Link('+activereviews', text)
 
     def addbranch(self):
@@ -1022,7 +1023,7 @@
 
     page_title = _('Subscribed')
     label_template = 'Bazaar branches subscribed to by %(displayname)s'
-    no_sort_by = (BranchListingSort.DEFAULT,)
+    no_sort_by = (BranchListingSort.DEFAULT, )
 
     def _getCollection(self):
         return getUtility(IAllBranches).subscribedBy(self.context)
@@ -1122,8 +1123,8 @@
     def active_reviews(self):
         text = get_plural_text(
             self.active_review_count,
-            'active review or unmerged proposal',
-            'active reviews or unmerged proposals')
+            'Active review',
+            'Active reviews')
         return Link('+activereviews', text, site='code')
 
     @enabled_with_permission('launchpad.Commercial')
@@ -1140,7 +1141,7 @@
     """A base class for product branch listings."""
 
     show_series_links = True
-    no_sort_by = (BranchListingSort.PRODUCT,)
+    no_sort_by = (BranchListingSort.PRODUCT, )
     label_template = 'Bazaar branches of %(displayname)s'
 
     def _getCollection(self):
@@ -1180,8 +1181,23 @@
         return message % self.context.displayname
 
 
+class ProductBranchStatisticsView(BranchCountSummaryView,
+                                  ProductBranchListingView):
+    """Portlet containing branch statistics."""
+
+    @property
+    def branch_text(self):
+        text = super(ProductBranchStatisticsView, self).branch_text
+        return text.capitalize()
+
+    @property
+    def commit_text(self):
+        text = super(ProductBranchStatisticsView, self).commit_text
+        return text.capitalize()
+
+
 class ProductCodeIndexView(ProductBranchListingView, SortSeriesMixin,
-                           ProductDownloadFileMixin):
+                           ProductDownloadFileMixin, BranchMirrorMixin):
     """Initial view for products on the code virtual host."""
 
     show_set_development_focus = True
@@ -1193,6 +1209,10 @@
         self.revision_cache = revision_cache.inProduct(self.product)
 
     @property
+    def branch(self):
+        return self.development_focus_branch
+
+    @property
     def form_action(self):
         return "+branches"
 
@@ -1240,6 +1260,7 @@
         # skip subsequent series where the lifecycle status is Merged or
         # Abandoned
         sorted_series = self.sorted_active_series_list
+
         def show_branch(branch):
             if self.selected_lifecycle_status is None:
                 return True
@@ -1323,6 +1344,14 @@
     def committer_text(self):
         return get_plural_text(self.committer_count, _('person'), _('people'))
 
+    @property
+    def configure_codehosting(self):
+        """Get the menu link for configuring code hosting."""
+        series_menu = MenuAPI(self.context.development_focus).overview
+        set_branch = series_menu['set_branch']
+        set_branch.text = 'Configure code hosting'
+        return set_branch
+
 
 class ProductBranchesView(ProductBranchListingView):
     """View for branch listing for a product."""
@@ -1353,7 +1382,7 @@
 class ProjectBranchesView(BranchListingView):
     """View for branch listing for a project."""
 
-    no_sort_by = (BranchListingSort.DEFAULT,)
+    no_sort_by = (BranchListingSort.DEFAULT, )
     extra_columns = ('author', 'product')
     label_template = 'Bazaar branches of %(displayname)s'
     show_series_links = True

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-09-22 18:37:57 +0000
+++ lib/lp/code/browser/configure.zcml	2010-09-28 22:26:02 +0000
@@ -1,4 +1,4 @@
-<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+<!-- Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
      GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
@@ -961,6 +961,18 @@
         permission="zope.Public"
         name="+code-index"
         template="../templates/product-branches.pt"/>
+   <browser:page
+      for="lp.registry.interfaces.product.IProduct"
+      class="lp.code.browser.branchlisting.ProductBranchStatisticsView"
+      permission="zope.Public"
+      name="+portlet-product-codestatistics"
+      template="../templates/product-portlet-codestatistics.pt"/>
+   <browser:page
+      for="lp.registry.interfaces.product.IProduct"
+      class="lp.code.browser.branchlisting.ProductBranchStatisticsView"
+      permission="zope.Public"
+      name="+portlet-product-codestatistics-content"
+      template="../templates/product-portlet-codestatistics-content.pt"/>
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
         layer="lp.code.publisher.CodeLayer"

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2010-09-28 22:26:02 +0000
@@ -45,7 +45,6 @@
     )
 from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.testing import (
-    ANONYMOUS,
     login,
     login_person,
     logout,
@@ -78,6 +77,7 @@
             branch_type=BranchType.MIRRORED,
             url="http://example.com/good/mirror")
         view = BranchView(branch, LaunchpadTestRequest())
+        view.initialize()
         self.assertTrue(view.user is None)
         self.assertEqual(
             "http://example.com/good/mirror", view.mirror_location)
@@ -89,6 +89,7 @@
             branch_type=BranchType.MIRRORED,
             url="http://private.example.com/bzr-mysql/mysql-5.0")
         view = BranchView(branch, LaunchpadTestRequest())
+        view.initialize()
         self.assertTrue(view.user is None)
         self.assertEqual(
             "<private server>", view.mirror_location)
@@ -106,6 +107,7 @@
         logout()
         login('[e-mail]')
         view = BranchView(branch, LaunchpadTestRequest())
+        view.initialize()
         self.assertEqual(view.user, owner)
         self.assertEqual(
             "http://private.example.com/bzr-mysql/mysql-5.0",
@@ -126,6 +128,7 @@
         logout()
         login('[e-mail]')
         view = BranchView(branch, LaunchpadTestRequest())
+        view.initialize()
         self.assertEqual(view.user, other)
         self.assertEqual(
             "<private server>", view.mirror_location)
@@ -160,7 +163,7 @@
             len(branch.mirror_status_message)
             <= branch_view.MAXIMUM_STATUS_MESSAGE_LENGTH,
             "branch.mirror_status_message longer than expected: %r"
-            % (branch.mirror_status_message,))
+            % (branch.mirror_status_message, ))
         self.assertEqual(
             branch.mirror_status_message, branch_view.mirror_status_message)
         self.assertEqual(
@@ -185,7 +188,7 @@
                 'whiteboard': '',
                 'owner': arbitrary_person,
                 'author': arbitrary_person,
-                'product': arbitrary_product
+                'product': arbitrary_product,
                 }
             add_view.add_action.success(data)
             # Make sure that next_mirror_time is a datetime, not an sqlbuilder

=== modified file 'lib/lp/code/browser/tests/test_product.py'
--- lib/lp/code/browser/tests/test_product.py	2010-08-24 02:16:53 +0000
+++ lib/lp/code/browser/tests/test_product.py	2010-09-28 22:26:02 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the product view classes and templates."""
@@ -10,20 +10,25 @@
     timedelta,
     )
 import unittest
-
 from mechanize import LinkNotFoundError
 import pytz
-from zope.component import (
-    getMultiAdapter,
-    getUtility,
+from zope.component import getUtility
+
+from canonical.launchpad.testing.pages import (
+    extract_text,
+    find_tag_by_id,
     )
-
 from canonical.launchpad.webapp import canonical_url
-from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import DatabaseFunctionalLayer
+from lp.app.enums import ServiceUsage
+from lp.code.enums import (
+    BranchType,
+    BranchVisibilityRule,
+    )
 from lp.code.interfaces.revision import IRevisionSet
 from lp.testing import (
     ANONYMOUS,
+    BrowserTestCase,
     login,
     login_person,
     TestCaseWithFactory,
@@ -32,9 +37,8 @@
 from lp.testing.views import create_initialized_view
 
 
-class TestProductCodeIndexView(TestCaseWithFactory):
-    """Tests for the product code home page."""
-
+class ProductTestBase(TestCaseWithFactory):
+    """Common methods for tests herein."""
     layer = DatabaseFunctionalLayer
 
     def makeProductAndDevelopmentFocusBranch(self, **branch_args):
@@ -49,6 +53,10 @@
         product.development_focus.branch = branch
         return product, branch
 
+
+class TestProductCodeIndexView(ProductTestBase):
+    """Tests for the product code home page."""
+
     def getBranchSummaryBrowseLinkForProduct(self, product):
         """Get the 'browse code' link from the product's code home.
 
@@ -98,13 +106,15 @@
 
     def test_initial_branches_contains_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch()
-        view = create_initialized_view(product, '+code-index', rootsite='code')
+        view = create_initialized_view(product, '+code-index',
+                                       rootsite='code')
         self.assertIn(branch, view.initial_branches)
 
     def test_initial_branches_does_not_contain_private_dev_focus_branch(self):
         product, branch = self.makeProductAndDevelopmentFocusBranch(
             private=True)
-        view = create_initialized_view(product, '+code-index', rootsite='code')
+        view = create_initialized_view(product, '+code-index',
+                                       rootsite='code')
         self.assertNotIn(branch, view.initial_branches)
 
     def test_committer_count_with_revision_authors(self):
@@ -120,7 +130,8 @@
             date_generator=date_generator)
         getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
 
-        view = create_initialized_view(product, '+code-index', rootsite='code')
+        view = create_initialized_view(product, '+code-index',
+                                       rootsite='code')
         self.assertEqual(view.committer_count, 1)
 
     def test_committers_count_private_branch(self):
@@ -138,10 +149,150 @@
             date_generator=date_generator)
         getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
 
-        view = create_initialized_view(product, '+code-index', rootsite='code')
+        view = create_initialized_view(product, '+code-index',
+                                       rootsite='code')
         self.assertEqual(view.committer_count, 1)
 
 
+class TestProductCodeIndexServiceUsages(ProductTestBase, BrowserTestCase):
+    """Tests for the product code page, especially the usage messasges."""
+
+    def test_external_mirrored(self):
+        # Test that the correct URL is displayed for a mirrored branch.
+        product, branch = self.makeProductAndDevelopmentFocusBranch(
+            branch_type=BranchType.MIRRORED,
+            url="http://example.com/mybranch")
+        self.assertEqual(ServiceUsage.EXTERNAL, product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        login(ANONYMOUS)
+        content = find_tag_by_id(browser.contents, 'external')
+        text = extract_text(content)
+        expected = ("%(product_title)s hosts its code at %(branch_url)s.  "
+                    "Launchpad has a mirror of the master branch "
+                    "and you can create branches from it." % dict(
+                        product_title=product.title,
+                        branch_url=branch.url))
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+    def test_external_remote(self):
+        # Test that a remote branch is shown properly.
+        product, branch = self.makeProductAndDevelopmentFocusBranch(
+            branch_type=BranchType.REMOTE,
+            url="http://example.com/mybranch")
+        self.assertEqual(ServiceUsage.EXTERNAL,
+                         product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        login(ANONYMOUS)
+        content = find_tag_by_id(browser.contents, 'external')
+        text = extract_text(content)
+        expected = ("%(product_title)s hosts its code at %(branch_url)s.  "
+                    "Launchpad does not have a copy of the remote "
+                    "branch." % dict(
+                        product_title=product.title,
+                        branch_url=branch.url))
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+    def test_unknown(self):
+        product = self.factory.makeProduct()
+        self.assertEqual(ServiceUsage.UNKNOWN, product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        login(ANONYMOUS)
+        content = find_tag_by_id(browser.contents, 'unknown')
+        text = extract_text(content)
+        expected = (
+            "Launchpad does not know where %(product_title)s "
+            "hosts its code.*" %
+            dict(product_title=product.title))
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+    def test_on_launchpad(self):
+        product, branch = self.makeProductAndDevelopmentFocusBranch()
+        self.assertEqual(ServiceUsage.LAUNCHPAD, product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        login(ANONYMOUS)
+        text = extract_text(find_tag_by_id(
+            browser.contents, 'branch-count-summary'))
+        expected = "1 active  branch owned by 1 person.*"
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+    def test_view_mirror_location(self):
+        url = "http://example.com/mybranch"
+        product, branch = self.makeProductAndDevelopmentFocusBranch(
+            branch_type=BranchType.MIRRORED,
+            url=url)
+        view = create_initialized_view(product, '+code-index',
+                                       rootsite='code')
+        self.assertEqual(url, view.mirror_location)
+
+
+class TestProductBranchesViewPortlets(ProductTestBase, BrowserTestCase):
+    """Tests for the portlets."""
+
+    def test_portlet_not_shown_for_UNKNOWN(self):
+        # If the BranchUsage is UNKNOWN then the portlets are not shown.
+        product = self.factory.makeProduct()
+        self.assertEqual(ServiceUsage.UNKNOWN, product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        contents = browser.contents
+        self.assertIs(None, find_tag_by_id(contents, 'branch-portlet'))
+        self.assertIs(None, find_tag_by_id(contents, 'privacy'))
+        self.assertIs(None, find_tag_by_id(contents, 'involvement'))
+        self.assertIs(None, find_tag_by_id(
+            contents, 'portlet-product-codestatistics'))
+
+    def test_portlets_shown_for_HOSTED(self):
+        # If the BranchUsage is HOSTED then the portlets are shown.
+        product, branch = self.makeProductAndDevelopmentFocusBranch()
+        self.assertEqual(ServiceUsage.LAUNCHPAD, product.codehosting_usage)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        contents = browser.contents
+        self.assertIsNot(None, find_tag_by_id(contents, 'branch-portlet'))
+        self.assertIsNot(None, find_tag_by_id(contents, 'privacy'))
+        self.assertIsNot(None, find_tag_by_id(contents, 'involvement'))
+        self.assertIsNot(None, find_tag_by_id(
+            contents, 'portlet-product-codestatistics'))
+
+    def test_portlets_shown_for_EXTERNAL(self):
+        # If the BranchUsage is EXTERNAL then the portlets are shown.
+        url = "http://example.com/mybranch"
+        product, branch = self.makeProductAndDevelopmentFocusBranch(
+            branch_type=BranchType.MIRRORED,
+            url=url)
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        contents = browser.contents
+        self.assertIsNot(None, find_tag_by_id(contents, 'branch-portlet'))
+        self.assertIsNot(None, find_tag_by_id(contents, 'privacy'))
+        self.assertIsNot(None, find_tag_by_id(contents, 'involvement'))
+        self.assertIsNot(None, find_tag_by_id(
+            contents, 'portlet-product-codestatistics'))
+
+    def test_is_private(self):
+        team_owner = self.factory.makePerson()
+        team = self.factory.makeTeam(team_owner)
+        product = self.factory.makeProduct(owner=team_owner)
+        branch = self.factory.makeProductBranch(product=product)
+        login_person(product.owner)
+        product.development_focus.branch = branch
+        product.setBranchVisibilityTeamPolicy(
+            team, BranchVisibilityRule.PRIVATE)
+        view = create_initialized_view(
+            product, '+code-index', rootsite='code', principal=product.owner)
+        text = extract_text(find_tag_by_id(view.render(), 'privacy'))
+        expected = ("New branches you create for %(name)s are private "
+                    "initially.*" % dict(name=product.displayname))
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+    def test_is_public(self):
+        product = self.factory.makeProduct()
+        branch = self.factory.makeProductBranch(product=product)
+        login_person(product.owner)
+        product.development_focus.branch = branch
+        browser = self.getUserBrowser(canonical_url(product, rootsite='code'))
+        text = extract_text(find_tag_by_id(browser.contents, 'privacy'))
+        expected = ("New branches you create for %(name)s are public "
+                    "initially.*" % dict(name=product.displayname))
+        self.assertTextMatchesExpressionIgnoreWhitespace(expected, text)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-

=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
--- lib/lp/code/stories/branches/xx-branch-deletion.txt	2010-05-13 16:22:19 +0000
+++ lib/lp/code/stories/branches/xx-branch-deletion.txt	2010-09-28 22:26:02 +0000
@@ -4,20 +4,34 @@
 can be deleted.  The main use for this is to allow users to delete
 branches that have been created in error.
 
-    >>> browser = setupBrowser(auth="Basic [e-mail]:test")
-    >>> browser.open('http://code.launchpad.dev/firefox')
+    >>> from lp.code.enums import BranchType
+    >>> login(ANONYMOUS)
+    >>> alice = factory.makePerson(name="alice", password="test",
+    ...                            email="[e-mail]")
+    >>> product = factory.makeProduct(
+    ...     name='earthlynx', displayname="Earth Lynx", owner=alice)
+    >>> branch = factory.makeProductBranch(
+    ...     product=product, branch_type=BranchType.HOSTED)
+    >>> productseries = factory.makeProductSeries(
+    ...     product=product, branch=branch)
+    >>> login_person(alice)
+    >>> product.development_focus = productseries
+    >>> logout()
+
+    >>> browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> browser.open('http://code.launchpad.dev/earthlynx')
     >>> browser.getLink("Register a branch").click()
     >>> browser.getControl('Branch URL').value = 'http://foo.bar.com/oops'
     >>> browser.getControl('Name').value = 'to-delete'
     >>> browser.getControl('Register Branch').click()
     >>> print browser.title
-    to-delete : Code : Mozilla Firefox
+    to-delete : Code : Earth Lynx
 
 The newly created branch has an action 'Delete branch'.
 
     >>> delete_link = browser.getLink('Delete branch')
     >>> print delete_link.url
-    http://code.launchpad.dev/~name12/firefox/to-delete/+delete
+    http://code.launchpad.dev/~alice/earthlynx/to-delete/+delete
 
 When the user clicks on the link, they are informed what will happen if they
 delete the branch.
@@ -25,7 +39,7 @@
     >>> delete_link.click()
     >>> print extract_text(find_main_content(browser.contents))
     Delete branch
-    Mozilla Firefox...
+    Earth Lynx...
     Branch deletion is permanent.
     or Cancel
 
@@ -35,15 +49,15 @@
 
     >>> browser.getControl('Delete').click()
     >>> print browser.url
-    http://code.launchpad.dev/firefox
+    http://code.launchpad.dev/earthlynx
     >>> for message in get_feedback_messages(browser.contents):
     ...     print message
-    Branch ~name12/firefox/to-delete deleted...
+    Branch ~alice/earthlynx/to-delete deleted...
 
 If the branch is junk, then the user is taken back to the code listing for
 the deleted branch's owner.
 
-    >>> browser.open('http://code.launchpad.dev/~name12')
+    >>> browser.open('http://code.launchpad.dev/~alice')
     >>> browser.getLink("Register a branch").click()
     >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Name').value = 'to-delete'
@@ -51,14 +65,15 @@
     >>> browser.getLink('Delete branch').click()
     >>> browser.getControl('Delete').click()
     >>> print browser.url
-    http://code.launchpad.dev/~name12
+    http://code.launchpad.dev/~alice
     >>> for message in get_feedback_messages(browser.contents):
     ...     print message
-    Branch ~name12/+junk/to-delete deleted...
+    Branch ~alice/+junk/to-delete deleted...
 
 Branches that are stacked upon cannot be deleted.
 
-    >>> login('[e-mail]')
+    >>> from lp.testing.sampledata import ADMIN_EMAIL
+    >>> login(ADMIN_EMAIL)
     >>> stacked_upon = factory.makeAnyBranch()
     >>> stacked = factory.makeAnyBranch(stacked_on=stacked_upon)
     >>> branch_location = canonical_url(stacked_upon)
@@ -82,12 +97,11 @@
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login(ANONYMOUS)
-    >>> name12 = getUtility(IPersonSet).getByName('name12')
     >>> ubuntu_branches = getUtility(ILaunchpadCelebrities).ubuntu_branches
     >>> ignored = removeSecurityProxy(ubuntu_branches).addMember(
-    ...     name12, ubuntu_branches.teamowner)
-    >>> login_person(name12)
-    >>> branch = factory.makePackageBranch(owner=name12)
+    ...     alice, ubuntu_branches.teamowner)
+    >>> login_person(alice)
+    >>> branch = factory.makePackageBranch(owner=alice)
     >>> package = branch.sourcepackage
     >>> package.setBranch(
     ...     PackagePublishingPocket.RELEASE, branch, branch.registrant)

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2010-01-14 23:39:06 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt	2010-09-28 22:26:02 +0000
@@ -63,11 +63,11 @@
 
     >>> browser.open('http://code.launchpad.dev/fooix')
     >>> print_tag_with_id(browser.contents, 'merge-counts')
-    3 active reviews or unmerged proposals
-
-The 'active reviews or unmerged proposals' text links to the active reviews page.
-
-    >>> browser.getLink('active reviews or unmerged proposals').click()
+    3 Active reviews
+
+The 'active reviews' text links to the active reviews page.
+
+    >>> browser.getLink('Active reviews').click()
     >>> print browser.title
     Active code reviews for Fooix...
 
@@ -94,7 +94,7 @@
     >>> browser.open('http://code.launchpad.dev/~albert')
     >>> print_tag_with_id(browser.contents, 'page-summary')
     1 owned branch, 1 registered branch, 1 subscribed branch
-    1 active review or unmerged proposal
+    1 active review
 
 The person's active reviews also lists all of their currently requested
 reviews.

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2010-09-27 19:39:21 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2010-09-28 22:26:02 +0000
@@ -15,6 +15,19 @@
 
 Hosted branches use Launchpad as their primary location.
 
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.code.enums import BranchType
+    >>> from zope.component import getUtility
+    >>> login(ANONYMOUS)
+    >>> redfish = getUtility(IProductSet).getByName('redfish')
+    >>> branch = factory.makeProductBranch(
+    ...     product=redfish, branch_type=BranchType.HOSTED)
+    >>> productseries = factory.makeProductSeries(
+    ...     product=redfish, branch=branch)
+    >>> login_person(redfish.owner)
+    >>> redfish.development_focus = productseries
+    >>> logout()
+
     >>> browser = setupBrowser(auth="Basic [e-mail]:test")
     >>> browser.open('http://code.launchpad.dev/redfish')
     >>> browser.getLink("Register a branch").click()
@@ -122,6 +135,29 @@
 Let's make sure we can load the branch creation form on a product.
 
     >>> user_browser.getLink("Register a branch").click()
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+The link is not there because the product has not been configured to
+do code hosting yet.  The development focus must be set with a branch first.
+
+    >>> owner_browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> owner_browser.open('http://code.launchpad.dev/applets')
+    >>> owner_browser.getLink('Configure code hosting').click()
+    >>> print owner_browser.url
+    http://code.launchpad.dev/applets/trunk/+setbranch
+
+    >>> owner_browser.getControl(
+    ...     'Create a new, empty branch').click()
+    >>> owner_browser.getControl('Branch name').value = 'trunk'
+    >>> owner_browser.getControl('Update').click()
+
+Now that code hosting has been configured, a regular user will be able
+to register a branch.
+
+    >>> user_browser.open('http://code.launchpad.dev/applets')
+    >>> user_browser.getLink("Register a branch").click()
     >>> print user_browser.url
     http://code.launchpad.dev/applets/+addbranch
 
@@ -313,7 +349,7 @@
 URL validation should check that the entered URL is not the root of a
 site.
 
-    >>> user_browser.open('http://code.launchpad.dev/firefox')
+    >>> user_browser.open('http://code.launchpad.dev/applets')
     >>> user_browser.getLink("Register a branch").click()
     >>> user_browser.getControl('Branch URL').value = 'http://example.com'
     >>> user_browser.getControl('Name').value = 'unique-name'
@@ -326,7 +362,7 @@
 
 URL validation should check that the entered URL is not from Launchpad.
 
-    >>> user_browser.open('http://code.launchpad.dev/firefox')
+    >>> user_browser.open('http://code.launchpad.dev/applets')
     >>> user_browser.getLink("Register a branch").click()
     >>> user_browser.getControl('Branch URL').value = (
     ...     'http://code.launchpad.dev/~testuser/')
@@ -341,7 +377,7 @@
 As well as checking against the root site set in the config, a check is
 also done against the value stored as a database constraint.
 
-    >>> user_browser.open('http://code.launchpad.dev/firefox')
+    >>> user_browser.open('http://code.launchpad.dev/applets')
     >>> user_browser.getLink("Register a branch").click()
     >>> user_browser.getControl('Branch URL').value = (
     ...     'http://bazaar.launchpad.net/foo/bar/')
@@ -377,6 +413,14 @@
 When registering a branch from the product pages, there is no product
 widget, so errors are set at the page level.
 
+    >>> owner_browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> owner_browser.open('http://code.launchpad.dev/landscape')
+    >>> owner_browser.getLink('Configure code hosting').click()
+    >>> owner_browser.getControl(
+    ...     'Create a new, empty branch').click()
+    >>> owner_browser.getControl('Branch name').value = 'trunk'
+    >>> owner_browser.getControl('Update').click()
+
     >>> user_browser.open('http://code.launchpad.dev/landscape')
     >>> user_browser.getLink("Register a branch").click()
     >>> user_browser.getControl('Branch URL').value = 'http://foo.com/bar'

=== modified file 'lib/lp/code/stories/branches/xx-person-branches.txt'
--- lib/lp/code/stories/branches/xx-person-branches.txt	2010-05-27 02:19:27 +0000
+++ lib/lp/code/stories/branches/xx-person-branches.txt	2010-09-28 22:26:02 +0000
@@ -101,7 +101,7 @@
     >>> eric_browser.open('http://code.launchpad.dev/~eric')
     >>> print_tag_with_id(eric_browser.contents, 'page-summary')
     1 owned branch, 1 registered branch, 1 subscribed branch
-    0 active reviews or unmerged proposals
+    0 active reviews
 
 Now we'll create another branch, and unsubscribe the owner from it.
 
@@ -113,4 +113,4 @@
     >>> eric_browser.open('http://code.launchpad.dev/~eric')
     >>> print_tag_with_id(eric_browser.contents, 'page-summary')
     2 owned branches, 2 registered branches, 1 subscribed branch
-    0 active reviews or unmerged proposals
+    0 active reviews

=== modified file 'lib/lp/code/stories/branches/xx-private-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-private-branch-listings.txt	2010-09-03 00:25:07 +0000
+++ lib/lp/code/stories/branches/xx-private-branch-listings.txt	2010-09-28 22:26:02 +0000
@@ -1,4 +1,5 @@
-= Private Branch Listings =
+Private Branch Listings
+=======================
 
 All pages that show branch listings to users should only show branches
 that the user is allowed to see.
@@ -15,7 +16,8 @@
     ...     reset_all_branch_last_modified)
     >>> reset_all_branch_last_modified()
 
-== Additional sample data ==
+Additional sample data
+----------------------
 
 Adding a private branch that is only visible by No Privileges Person
 (and Launchpad administrators).
@@ -37,7 +39,8 @@
     >>> logout()
 
 
-== The code home page ==
+The code home page
+------------------
 
 The code home page shows lists of recently imported, changed, and
 registered branches.
@@ -60,7 +63,8 @@
 Logged in users should only be able to see public branches, and private
 branches that they are subscribed to or are the owner of.
 
-    >>> no_priv_browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> no_priv_browser = setupBrowser(
+    ...     auth='Basic [e-mail]:test')
     >>> print_recently_registered_branches(no_priv_browser)
     '...~no-priv/landscape/testing-branch...<span...class="sprite private"...'
     '...~mark/+junk/testdoc...'
@@ -91,7 +95,8 @@
     '...~name12/gnome-terminal/scanned...'
 
 
-== Landscape code listing page ==
+Landscape code listing page
+---------------------------
 
 One of the most obvious places to hide private branches are the code
 listing tab.
@@ -103,12 +108,13 @@
     ...     # So print the text shown in the application summary.
     ...     if table is None:
     ...         print extract_text(find_tag_by_id(
-    ...             browser.contents, 'application-summary'))
+    ...             browser.contents, 'branch-summary'))
     ...     else:
     ...         for row in table.tbody.fetch('tr'):
     ...             print extract_text(row)
 
     >>> print_landscape_code_listing(anon_browser)
+    Launchpad does not know where The Landscape Project hosts its code...
     There are no branches for The Landscape Project in Launchpad...
 
     >>> print_landscape_code_listing(no_priv_browser)
@@ -124,7 +130,8 @@
     lp://dev/~no-priv/landscape/testing-branch      Development   ...
 
 
-== Person code listing pages ==
+Person code listing pages
+-------------------------
 
 The person code listings is the other obvious place to filter out the
 viewable branches.
@@ -173,7 +180,8 @@
     >>> print_person_code_listing(landscape_dev_browser, '/+ownedbranches')
     Total of 10 branches listed
     lp://dev/~name12/landscape/feature-x            Development   ...
-    >>> print_person_code_listing(landscape_dev_browser, '/+registeredbranches')
+    >>> print_person_code_listing(landscape_dev_browser,
+    ...                           '/+registeredbranches')
     Total of 11 branches listed
     lp://dev/~landscape-developers/landscape/trunk  Development   ...
     lp://dev/~name12/landscape/feature-x            Development   ...
@@ -190,7 +198,8 @@
     lp://dev/~name12/landscape/feature-x            Development   ...
 
 
-== Bug branch links ==
+Bug branch links
+----------------
 
 When a private branch is linked to a bug, the bug branch link is only
 visible to those that would be able to see the branch.
@@ -227,7 +236,8 @@
     No bug branch links
 
 
-== Branches set as primary branches for product series ==
+Branches set as primary branches for product series
+---------------------------------------------------
 
 When a branch is set as the user branch for product series, the details
 must be visible to those that are entitled to see it, but hidden from

=== modified file 'lib/lp/code/stories/branches/xx-product-branches.txt'
--- lib/lp/code/stories/branches/xx-product-branches.txt	2010-08-19 14:22:01 +0000
+++ lib/lp/code/stories/branches/xx-product-branches.txt	2010-09-28 22:26:02 +0000
@@ -34,25 +34,34 @@
 If there are not any branches, a helpful message is shown.
 
     >>> def get_summary(browser):
-    ...     return find_tag_by_id(browser.contents, 'application-summary')
+    ...     return find_tag_by_id(browser.contents, 'branch-summary')
     >>> summary = get_summary(browser)
     >>> print extract_text(summary)
-    There are no branches for Gnome Applets in Launchpad.
+    Launchpad does not know where The Gnome Panel Applets hosts its code.
+    There are no branches for Gnome Applets in Launchpad.  You can change this by:
+    activating code hosting directly on Launchpad. (read more)
+    asking Launchpad to mirror a Bazaar branch hosted elsewhere. (read more)
+    asking Launchpad to import code from Git, Subversion, or CVS into a
+      Bazaar branch. (read more)
+    Getting started with code hosting in Launchpad.
+
+
     If there are Bazaar branches of Gnome Applets in a publicly
       accessible location, Launchpad can act as a mirror of the branch
       by registering a Mirrored branch. Read more.
     Launchpad can also act as a primary location for Bazaar branches of
       Gnome Applets. Read more.
     Launchpad can import code from CVS, Subversion, Mercurial or Git
-      into Bazaar branches. Read more.
+      into Bazaar branches. Read more...
 
 The 'Read more' links go to the help wiki.
 
     >>> for anchor in summary.fetch('a'):
     ...     print anchor['href']
+    https://help.launchpad.net/Code/UploadingABranch
     https://help.launchpad.net/Code/MirroredBranches
-    https://help.launchpad.net/Code/UploadingABranch
     https://help.launchpad.net/VcsImports
+    https://help.launchpad.net/Code
 
 
 Link to the product downloads
@@ -63,6 +72,7 @@
 
     >>> browser.open('http://code.launchpad.dev/netapplet')
     >>> print extract_text(get_summary(browser))
+    Launchpad does not know where Network Applet hosts its code...
     There are no branches for NetApplet in Launchpad.
     ...
     There are download files available for NetApplet.
@@ -83,8 +93,6 @@
     >>> browser.open('http://code.launchpad.dev/evolution')
     >>> summary = get_summary(browser)
     >>> print extract_text(get_summary(browser))
-    3 active branches ...
-    0 active reviews or unmerged proposals
     You can get a copy of the development focus branch using the
     command:
        bzr branch lp://dev/evolution
@@ -124,7 +132,8 @@
 Firstly lets associate release--0.9.1 with the 1.0 series.
 
     >>> admin_browser.open('http://launchpad.dev/firefox/1.0/+linkbranch')
-    >>> admin_browser.getControl('Branch').value = '~mark/firefox/release--0.9.1'
+    >>> admin_browser.getControl('Branch').value = (
+    ...     '~mark/firefox/release--0.9.1')
     >>> admin_browser.getControl('Update').click()
 
     >>> browser.open('http://code.launchpad.dev/firefox')
@@ -155,32 +164,78 @@
     lp://dev/~mark/firefox/release-0.8     Development ...
 
 
-Floating buttons
-================
+Involvement portlet
+===================
 
-There are two buttons that show on the right hand side of the screen
-for project branch listings.  'Register a branch' and 'Import a branch'.
+There are several links in the side portlet:  'Register a branch',
+'Import a branch', 'Configure code hosting', and 'Define branch
+visibility'.  The links are only shown if the user has permission to
+perform the task.
 
     >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> login('[e-mail]')
+    >>> login(ANONYMOUS)
     >>> product = getUtility(IProductSet).getByName('firefox')
     >>> old_branch = product.development_focus.branch
+    >>> login_person(product.owner)
     >>> product.development_focus.branch = None
     >>> logout()
     >>> def print_links(browser):
-    ...     links = find_tag_by_id(browser.contents, 'floating-links')
+    ...     links = find_tag_by_id(browser.contents, 'involvement')
+    ...     if links is None:
+    ...         print 'None'
+    ...         return
     ...     for link in links.findAll('a'):
     ...         print extract_text(link)
-    >>> browser.open('http://code.launchpad.dev/firefox')
-    >>> print_links(browser)
+
+    >>> def setup_code_hosting(productname):
+    ...     admin_browser.open('http://code.launchpad.dev/%s' % productname)
+    ...     admin_browser.getLink('Configure code hosting').click()
+    ...     admin_browser.getControl(
+    ...         'Create a new, empty branch').click()
+    ...     admin_browser.getControl('Branch name').value = 'trunk'
+    ...     admin_browser.getControl('Update').click()
+
+The involvement portlet is not shown if the product does not have code
+hosting configured or if it is not using Launchpad.
+
+    >>> print product.codehosting_usage.name
+    UNKNOWN
+    >>> admin_browser.open('http://code.launchpad.dev/firefox')
+    >>> print_links(admin_browser)
+    None
+
+    >>> setup_code_hosting('firefox')
+    >>> print product.codehosting_usage.name
+    LAUNCHPAD
+    >>> admin_browser.open('http://code.launchpad.dev/firefox')
+    >>> print_links(admin_browser)
+    Register a branch
+    Import a branch
+    Configure code hosting
+    Define branch visibility
+
+The owner of the project sees the links for the activities he can
+perform, everything except defining branch visibility.
+
+    >>> owner_browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> owner_browser.open('http://code.launchpad.dev/firefox')
+    >>> print_links(owner_browser)
+    Register a branch
+    Import a branch
+    Configure code hosting
+
+And a regular user can only register and import branches.
+
+    >>> user_browser.open('http://code.launchpad.dev/firefox')
+    >>> print_links(user_browser)
     Register a branch
     Import a branch
 
 If the product specifies that it officially uses Launchpad code, then
 the 'Import a branch' button is still shown.
 
-    >>> login('[e-mail]')
+    >>> login_person(product.owner)
     >>> product.development_focus.branch = old_branch
     >>> logout()
     >>> browser.open('http://code.launchpad.dev/firefox')
@@ -189,34 +244,54 @@
     Import a branch
 
 
-Nice wording of summary numbers
-===============================
+The statistics portlet
+======================
 
 The text that is shown giving a summary of the number of branches
 shows correct singular and plural forms.
 
-    >>> def print_summary(product):
+    >>> def get_stats_portlet(browser):
+    ...     return find_tag_by_id(
+    ...         browser.contents,
+    ...         'portlet-product-codestatistics')
+    >>> def print_portlet(product):
     ...     browser.open('http://code.launchpad.dev/%s' % product)
-    ...     print extract_text(get_summary(browser))
-
-    >>> print_summary('gnome-terminal')
-    8 active branches owned by 1 person and 2 teams, 0 commits in the last month
-    ...
+    ...     portlet = get_stats_portlet(browser)
+    ...     if portlet is None:
+    ...         print 'None'
+    ...     else:
+    ...         print extract_text(portlet)
+
+    >>> setup_code_hosting('gnome-terminal')
+    >>> print_portlet('gnome-terminal')
+    0 Active reviews
+    9 Active branches owned by 2 people and 2 teams
+    0 Commits in the last month
+
     >>> from lp.testing import ANONYMOUS, login, logout
     >>> login(ANONYMOUS)
     >>> fooix = factory.makeProduct('fooix')
     >>> ignored = factory.makeProductBranch(fooix)
-    >>> ignored = factory.makeProductBranch(fooix)
-    >>> logout()
-    >>> print_summary('fooix')
-    2 active branches owned by 2 people, 0 commits in the last month
-    ...
-    >>> print_summary('evolution')
-    3 active branches owned by 1 person and 1 team, 0 commits in the last month
-    ...
-    >>> print_summary('iso-codes')
-    1 active branch owned by 1 person, 0 commits in the last month
-    ...
+    >>> logout()
+    >>> setup_code_hosting('fooix')
+    >>> print_portlet('fooix')
+    0 Active reviews
+    2 Active branches owned by 2 people
+    0 Commits in the last month
+
+    >>> print_portlet('evolution')
+    0 Active reviews
+    3 Active branches owned by 1 person and 1 team
+    0 Commits in the last month
+
+    >>> login(ANONYMOUS)
+    >>> dinky = factory.makeProduct('dinky')
+    >>> logout()
+    >>> setup_code_hosting('dinky')
+    >>> print_portlet('dinky')
+    0 Active reviews
+    1 Active branch owned by 1 person
+    0 Commits in the last month
 
 
 Product has Branches, but none initially visible
@@ -224,17 +299,16 @@
 
 It is a bit of an edge case, but if there are branches for a product but all
 of them are either merged or abandoned and there is no development focus
-branch, then they will not appear on the initial branch listing.
+branch, then they will not appear on the initial branch listing and
+the portlets will not be shown.
 
     >>> admin_browser.open('http://code.launchpad.dev/~carlos/iso-codes/0.35')
     >>> admin_browser.getLink('Change branch details').click()
     >>> admin_browser.getControl('Abandoned').click()
     >>> admin_browser.getControl('Change Branch').click()
 
-    >>> browser.open('http://code.launchpad.dev/iso-codes')
-    >>> print extract_text(get_summary(browser))
-    0 active branches, 0 commits in the last month
-    0 active reviews or unmerged proposals
+    >>> print_portlet('iso-codes')
+    None
 
     >>> message = find_tag_by_id(browser.contents, 'no-branch-message')
     >>> print extract_text(message)

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-08-14 16:39:07 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-09-28 22:26:02 +0000
@@ -28,7 +28,27 @@
 
     >>> browser.open('http://code.launchpad.dev/firefox')
     >>> browser.getLink('Import a branch').click()
-
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+The owner can configure code hosting for the project and then
+importing will be available to any user.
+
+    >>> owner_browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> owner_browser.open('http://code.launchpad.dev/firefox')
+    >>> owner_browser.getLink('Configure code hosting').click()
+    >>> owner_browser.getControl(
+    ...     'Import a branch').click()
+    >>> owner_browser.getControl('Branch URL').value = 'git://example.com/firefox'
+    >>> owner_browser.getControl('Git').click()
+    >>> owner_browser.getControl('Branch name').value = 'trunk'
+    >>> owner_browser.getControl('Update').click()
+
+Now a regular user can import another branch.
+
+    >>> browser.open('http://code.launchpad.dev/firefox')
+    >>> browser.getLink('Import a branch').click()
 
 Requesting a Subversion import
 ==============================

=== modified file 'lib/lp/code/templates/branch-listing.pt'
--- lib/lp/code/templates/branch-listing.pt	2010-04-11 22:45:09 +0000
+++ lib/lp/code/templates/branch-listing.pt	2010-09-28 22:26:02 +0000
@@ -74,16 +74,16 @@
       </tal:ignore>
       <tr tal:condition="product/required:launchpad.Edit"
           tal:define="edit_link product/development_focus/fmt:url/+linkbranchtoseries">
-        <td colspan="5" class="branch-no-dev-focus">A development focus branch hasn't 
+        <td colspan="5" class="branch-no-dev-focus">A development focus branch hasn't
             been specified, <a tal:attributes="href edit_link">set it now</a>.</td>
       </tr>
       </tal:missing-dev-focus>
       </tal:allow-setting-dev-focus>
       <tr tal:repeat="branch context/branches">
         <td>
-          <img src="/@@/branch" /> <a tal:attributes="href branch/fmt:url"
-             tal:content="branch/bzr_identity">
-               Name
+          <a tal:attributes="href branch/fmt:url"
+             tal:content="structure branch/bzr_identity/fmt:break-long-words"
+             class="sprite branch">Name
           </a>
           <tal:associated-series repeat="series branch/active_series"
                                  condition="context/view/show_series_links">

=== modified file 'lib/lp/code/templates/product-branch-summary.pt'
--- lib/lp/code/templates/product-branch-summary.pt	2010-08-13 16:09:45 +0000
+++ lib/lp/code/templates/product-branch-summary.pt	2010-09-28 22:26:02 +0000
@@ -7,42 +7,59 @@
   lang="en"
   dir="ltr"
   i18n:domain="launchpad"
-  id="application-summary">
+  id="branch-summary">
+
+  <div id="unknown" tal:condition="context/codehosting_usage/enumvalue:UNKNOWN">
+    <p>
+      <strong>
+        Launchpad does not know where <tal:project_title replace="context/title" />
+        hosts its code.
+      </strong>
+    </p>
+  </div>
+
+  <div id="external"
+       tal:condition="context/codehosting_usage/enumvalue:EXTERNAL">
+    <p>
+      <strong>
+        <tal:project_title replace="context/title" /> hosts its code at
+        <a tal:attributes="href view/mirror_location"
+           tal:content="view/mirror_location"></a>.
+      </strong>
+    </p>
+    <p tal:condition="context/homepageurl">
+      You can learn more at the project's
+      <a tal:attributes="href context/homepageurl">web page</a>.
+    </p>
+    <p tal:condition="view/branch/branch_type/enumvalue:MIRRORED">
+      Launchpad has a mirror of the master branch and you can create branches
+      from it.
+    </p>
+    <p tal:condition="view/branch/branch_type/enumvalue:REMOTE">
+      Launchpad does not have a copy of the remote branch.
+    </p>
+  </div>
 
   <tal:no-branches condition="not: view/branch_count">
     There are no branches for <tal:project-name replace="context/displayname"/>
-    in Launchpad.
-    <ul>
-      <li>If there are Bazaar branches of
-      <tal:project-name replace="context/displayname"/>
-      in a publicly accessible location,
-      Launchpad can act as a mirror of the branch by registering a
-      <em>Mirrored</em> branch.
-      <a href="https://help.launchpad.net/Code/MirroredBranches">Read more.</a>
-      </li>
-      <li>Launchpad can also act as a primary
-      location for Bazaar branches of
-      <tal:project-name replace="context/displayname"/>.
-      <a href="https://help.launchpad.net/Code/UploadingABranch">Read more.</a>
-      </li>
-
-      <li>Launchpad can import code from CVS, Subversion, Mercurial or Git
-      into Bazaar branches.  <a
-      href="https://help.launchpad.net/VcsImports">Read more.</a> </li>
-
+    in Launchpad.  You can change this by:
+
+    <ul class="bulleted" style="margin-top:1em;">
+
+      <li>activating code hosting directly on
+      Launchpad. (<a href="https://help.launchpad.net/Code/UploadingABranch">read
+      more</a>)</li>
+
+      <li>asking Launchpad to mirror a Bazaar branch hosted
+      elsewhere. (<a href="https://help.launchpad.net/Code/MirroredBranches">read
+      more</a>)</li>
+
+      <li>asking Launchpad to import code from Git, Subversion, or CVS into a
+      Bazaar branch. (<a href="https://help.launchpad.net/VcsImports">read more</a>)</li>
     </ul>
   </tal:no-branches>
 
   <tal:has-branches condition="view/branch_count">
-    <p tal:replace="structure context/@@+count-summary"/>
-    <p id="merge-counts"
-       tal:define="menu context/menu:branches">
-      <strong class="count" tal:content="menu/active_review_count">5</strong>
-      <tal:link
-          define="link menu/active_reviews"
-          replace="structure link/render"
-          />
-    </p>
     <div tal:condition="view/has_development_focus_branch"
          style="margin: 1em 0"
          tal:define="config modules/canonical.config/config;
@@ -60,6 +77,30 @@
     </div>
 
   </tal:has-branches>
+
+  <div tal:condition="context/codehosting_usage/enumvalue:UNKNOWN">
+    <div
+       tal:condition="not: context/codehosting_usage/enumvalue:LAUNCHPAD"
+       tal:define="configure_codehosting view/configure_codehosting |
+       nothing">
+      <p style="margin-top: 10px;">
+        <a class="sprite maybe"
+           href="https://help.launchpad.net/Code">Getting started
+          with code hosting in Launchpad</a>.</p>
+
+      <p tal:condition="context/required:launchpad.Edit"
+         id="no-code-edit"
+         >
+        <a tal:condition="configure_codehosting"
+           tal:replace="structure configure_codehosting/fmt:link"/>
+      </p>
+      <p tal:define="menu context/menu:branches;
+                     link menu/branch_visibility"
+         tal:condition="link/enabled"
+         tal:content="structure link/render"></p>
+    </div>
+  </div>
+
   <p tal:condition="view/latest_release_with_download_files">
     <img src="/@@/download"/> There are
     <a tal:define="rooturl modules/canonical.launchpad.webapp.vhosts/allvhosts/configs/mainsite/rooturl"

=== modified file 'lib/lp/code/templates/product-branches.pt'
--- lib/lp/code/templates/product-branches.pt	2009-09-17 00:27:40 +0000
+++ lib/lp/code/templates/product-branches.pt	2010-09-28 22:26:02 +0000
@@ -3,40 +3,66 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  metal:use-macro="view/macro:page/main_only"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
 
 <body>
 
-<div metal:fill-slot="main">
-
-  <div style="float:right" id="floating-links"
-       tal:define="menu context/menu:branches">
-    <div tal:define="link menu/branch_add"
-         tal:condition="link/enabled"
-         tal:content="structure link/render" />
-    <div tal:define="link menu/code_import"
-         tal:condition="link/enabled"
-         tal:content="structure link/render" />
-    <div tal:define="link menu/branch_visibility"
-         tal:condition="link/enabled"
-         tal:content="structure link/render" />
-  </div>
-
-  <div id="private-policy" tal:condition="view/new_branches_are_private"
-       class="informational message">
-    New branches you create for <tal:name replace="context/displayname"/>
-    are <strong>private</strong> initially.
-  </div>
-
-  <tal:branch-summary content="structure context/@@+branch-summary" />
-
-  <tal:has-branches condition="view/branch_count"
-                    define="branches view/branches">
-    <tal:branchlisting content="structure branches/@@+branch-listing" />
-  </tal:has-branches>
-</div>
+  <metal:side fill-slot="side" tal:define="context_menu context/menu:context">
+    <div id="branch-portlet"
+         tal:condition="not: context/codehosting_usage/enumvalue:UNKNOWN">
+      <div id="privacy"
+           tal:define="are_private view/new_branches_are_private"
+           tal:attributes="class python: are_private and 'first portlet private' or 'first portlet public'">
+
+        <p tal:condition="not:view/new_branches_are_private" id="privacy-text">
+          New branches you create for <tal:name replace="context/displayname"/>
+          are <strong>public</strong> initially.
+        </p>
+
+        <p tal:condition="view/new_branches_are_private" id="privacy-text">
+          New branches you create for <tal:name replace="context/displayname"/>
+          are <strong>private</strong> initially.
+        </p>
+
+      </div>
+
+      <div id="involvement" class="portlet"
+           tal:define="menu context/menu:branches">
+        <ul class="involvement">
+            <li style="border: none">
+              <a href="+addbranch" class="menu-link-addbranch sprite code">
+                Register a branch
+              </a>
+            </li>
+        </ul>
+        <p style="margin-top:10px;"
+           tal:define="link menu/code_import"
+           tal:condition="link/enabled"
+           tal:content="structure link/render"></p>
+        <p tal:define="configure_codehosting view/configure_codehosting | nothing"
+           tal:condition="configure_codehosting"
+           tal:replace="structure configure_codehosting/fmt:link"></p>
+        <p tal:define="link menu/branch_visibility"
+           tal:condition="link/enabled"
+           tal:content="structure link/render"></p>
+      </div>
+
+      <div tal:replace="structure context/@@+portlet-product-codestatistics" />
+    </div>
+  </metal:side>
+
+  <tal:main metal:fill-slot="main">
+
+    <tal:branch-summary content="structure context/@@+branch-summary" />
+
+    <tal:has-branches condition="view/branch_count"
+                      define="branches view/branches">
+      <tal:branchlisting content="structure branches/@@+branch-listing" />
+    </tal:has-branches>
+
+  </tal:main>
 
 </body>
 </html>

=== added file 'lib/lp/code/templates/product-portlet-codestatistics-content.pt'
--- lib/lp/code/templates/product-portlet-codestatistics-content.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/product-portlet-codestatistics-content.pt	2010-09-28 22:26:02 +0000
@@ -0,0 +1,55 @@
+<tal:portlet-product-codestatistics-content
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:metal="http://xml.zope.org/namespaces/metal">
+
+  <tr tal:define="menu context/menu:branches" class="code-links"
+      id="merge-counts">
+    <td class="code-count"
+        tal:define="count menu/active_review_count"
+        tal:content="count" />
+    <td>
+      <tal:link
+         define="link menu/active_reviews"
+         replace="structure link/render"
+         />
+    </td>
+  </tr>
+
+  <tr class="code-links" id="branch-count-summary">
+    <td class="code-count"
+        tal:define="count view/branch_count"
+        tal:content="count" />
+    <td>
+  <tal:branches replace="view/branch_text">branches</tal:branches
+  ><tal:has-branches condition="view/branch_count">
+  owned by
+  <tal:individuals condition="view/person_owner_count">
+    <tal:owners content="view/person_owner_count">42</tal:owners>
+    <tal:people replace="view/person_text">people</tal:people
+    ></tal:individuals
+    ><tal:teams condition="view/team_owner_count">
+    <tal:individuals condition="view/person_owner_count">
+      and
+    </tal:individuals>
+    <tal:toc content="view/team_owner_count">1</tal:toc>
+    <tal:people replace="view/team_text">team</tal:people
+    ></tal:teams></tal:has-branches>
+    </td>
+  </tr>
+
+  <tr class="code-links">
+    <td class="code-count"
+        tal:define="count view/commit_count"
+        tal:content="count" />
+    <td>
+    <tal:commits replace="view/commit_text">commits</tal:commits>
+    <tal:has-committers condition="view/committer_count">
+      by
+      <tal:cc content="view/committer_count">4</tal:cc>
+      <tal:people replace="view/committer_text">people</tal:people>
+    </tal:has-committers>
+    in the last month
+    </td>
+  </tr>
+
+</tal:portlet-product-codestatistics-content>

=== added file 'lib/lp/code/templates/product-portlet-codestatistics.pt'
--- lib/lp/code/templates/product-portlet-codestatistics.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/product-portlet-codestatistics.pt	2010-09-28 22:26:02 +0000
@@ -0,0 +1,11 @@
+<div
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  class="portlet" id="portlet-product-codestatistics">
+
+  <table class="code-links">
+    <tbody id="portlet-product-codestatistics"
+      tal:content="structure context/@@+portlet-product-codestatistics-content" />
+  </table>
+</div>

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-09-28 14:58:40 +0000
+++ lib/lp/registry/browser/product.py	2010-09-28 22:26:02 +0000
@@ -458,9 +458,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 = (
-            )
+        set_branch.summary = "Specify the location of this project's code."
         config_list.append(
             dict(link=set_branch,
                  configured=config_statuses['configure_codehosting']))
@@ -469,11 +467,8 @@
     @property
     def registration_completeness(self):
         """The percent complete for registration."""
-        configured = 0
         config_statuses = self.configuration_states
-        for key, value in config_statuses.items():
-            if value:
-                configured += 1
+        configured = sum(1 for val in config_statuses.values() if val)
         scale = 100
         done = int(float(configured) / len(config_statuses) * scale)
         undone = scale - done
@@ -1396,9 +1391,9 @@
     def setUpFields(self):
         super(ProductConfigureBase, self).setUpFields()
         if self.usage_fieldname is not None:
-            # The usage fields are shared among pillars. But when referring to
-            # an individual object in Launchpad it is better to call it by its
-            # real name, i.e. 'project' instead of 'pillar'.
+            # The usage fields are shared among pillars.  But when referring
+            # to an individual object in Launchpad it is better to call it by
+            # its real name, i.e. 'project' instead of 'pillar'.
             usage_field = self.form_fields.get(self.usage_fieldname)
             if usage_field:
                 usage_field.custom_widget = CustomWidgetFactory(

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-09-25 14:29:32 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-09-28 22:26:02 +0000
@@ -182,6 +182,17 @@
     >>> print view.codehosting_usage.name
     LAUNCHPAD
 
+    >>> from lp.code.enums import BranchType
+    >>> remote = factory.makeProduct()
+    >>> branch = factory.makeProductBranch(product=remote,
+    ...                                    branch_type=BranchType.REMOTE)
+    >>> remote.official_codehosting
+    False
+    >>> view = create_view(remote, '+get-involved')
+    >>> print view.codehosting_usage.name
+    UNKNOWN
+
+
 Project groups cannot make links to register a branch, so
 official_codehosting is always false.
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-09-27 18:16:28 +0000
+++ lib/lp/registry/model/product.py	2010-09-28 22:26:02 +0000
@@ -404,7 +404,8 @@
             return ServiceUsage.UNKNOWN
         elif self.development_focus.branch.branch_type == BranchType.HOSTED:
             return ServiceUsage.LAUNCHPAD
-        elif self.development_focus.branch.branch_type == BranchType.MIRRORED:
+        elif self.development_focus.branch.branch_type in (
+            BranchType.MIRRORED, BranchType.REMOTE):
             return ServiceUsage.EXTERNAL
         return ServiceUsage.NOT_APPLICABLE
 

=== modified file 'lib/lp/registry/tests/test_service_usage.py'
--- lib/lp/registry/tests/test_service_usage.py	2010-09-22 00:52:15 +0000
+++ lib/lp/registry/tests/test_service_usage.py	2010-09-28 22:26:02 +0000
@@ -8,6 +8,7 @@
 from canonical.testing import DatabaseFunctionalLayer
 
 from lp.app.enums import ServiceUsage
+from lp.code.enums import BranchType
 from lp.testing import (
     login_person,
     TestCaseWithFactory,
@@ -56,13 +57,6 @@
             True,
             self.target.official_answers)
 
-    def test_codehosting_usage(self):
-        # Only test get for codehosting; this has no setter because the
-        # state is derived from other data.
-        self.assertEqual(
-            ServiceUsage.UNKNOWN,
-            self.target.codehosting_usage)
-
     def test_translations_usage_no_data(self):
         # By default, we don't know anything about a target
         self.assertEqual(
@@ -195,6 +189,42 @@
         super(TestProductUsageEnums, self).setUp()
         self.target = self.factory.makeProduct()
 
+    def test_codehosting_unknown(self):
+        # A default product has UNKNOWN usage.
+        self.assertEqual(
+            ServiceUsage.UNKNOWN,
+            self.target.codehosting_usage)
+
+    def test_codehosting_mirrored_branch(self):
+        # A mirrored branch is EXTERNAL.
+        login_person(self.target.owner)
+        self.target.development_focus.branch = self.factory.makeProductBranch(
+            product=self.target,
+            branch_type=BranchType.MIRRORED)
+        self.assertEqual(
+            ServiceUsage.EXTERNAL,
+            self.target.codehosting_usage)
+
+    def test_codehosting_remote_branch(self):
+        # A remote branch is EXTERNAL.
+        login_person(self.target.owner)
+        self.target.development_focus.branch = self.factory.makeProductBranch(
+            product=self.target,
+            branch_type=BranchType.REMOTE)
+        self.assertEqual(
+            ServiceUsage.EXTERNAL,
+            self.target.codehosting_usage)
+
+    def test_codehosting_hosted_branch(self):
+        # A branch on Launchpad is HOSTED.
+        login_person(self.target.owner)
+        self.target.development_focus.branch = self.factory.makeProductBranch(
+            product=self.target,
+            branch_type=BranchType.HOSTED)
+        self.assertEqual(
+            ServiceUsage.LAUNCHPAD,
+            self.target.codehosting_usage)
+
 
 class TestProductSeriesUsageEnums(
     TestCaseWithFactory,