Merge lp:~bac/launchpad/bug-524302 into lp:launchpad/db-devel

[Brad Crittenden]

Create a productseries/+setbranch page for setting/creating/importing a branch for the productseries.

Add productseries/+setbranch view to consolidate many other views dealing with creating/mirroring/importing branches. This view allows a user to do one of those things (though the terminology is hidden) and links the branch to the product series.

The view is not currently navigable from anywhere. Eventually it will replace +linkbranch.

A new view test has been created:

bin/test -vvt productseries-setbranch-views.txt

It may be preferred to roll that test into the productseries-views.txt test but it was expeditious to create it stand alone.

There are some known issues listed in the BRANCH.TODO file.

To demo, create a new project and go to https://launchpad.dev/<newproject>/trunk/+setbranch

[Edwin Grubbs (edwin-grubbs)]

Hi Brad,

This interface is a nice improvement. I've only set the series for a
branch once before, and I totally did it wrong because I was on the wrong
form.

Since I don't know if you are planning a followup branch for your
BRANCH.TODO items, I'm marking this:
    needs-fixing

It seems odd that productseries-setbranch.pt is in lp.registry but
productseries-setbranch.js is in lp.code. There are some more
comments below.

-Edwin

>=== modified file 'BRANCH.TODO'
>--- BRANCH.TODO 2010-03-19 07:13:15 +0000
>+++ BRANCH.TODO 2010-03-26 15:28:25 +0000
>@@ -2,3 +2,10 @@
> # landing. There is a test to ensure it is empty in trunk. If there is
> # stuff still here when you are ready to land, the items should probably
> # be converted to bugs so they can be scheduled.
>+
>+TODO:
>+
>+* validation errors give misleading messages
>+* uncaught constraint error on duplicate of code import URL
>+* code.lp.dev/proj/series displays the overview page but it should
>+ direct away from the code vhost
>=== modified file 'lib/lp/registry/browser/productseries.py'
>--- lib/lp/registry/browser/productseries.py 2010-03-23 00:39:45 +0000
>+++ lib/lp/registry/browser/productseries.py 2010-03-26 15:28:25 +0000
>@@ -644,7 +658,340 @@
> self.next_url = canonical_url(product)
>
>
>-class ProductSeriesLinkBranchView(LaunchpadEditFormView):
>+LINK_LP_BZR = 'link-lp-bzr'
>+CREATE_NEW = 'create-new'
>+IMPORT_EXTERNAL = 'import-external'
>+
>+
>+def _getBranchTypeVocabulary():
>+ items = (
>+ (LINK_LP_BZR,
>+ _("Link to a Bazaar branch already on Launchpad")),
>+ (CREATE_NEW,
>+ _("Create a new, empty branch in Launchpad and "
>+ "link to this series")),
>+ (IMPORT_EXTERNAL,
>+ _("Import a branch hosted somewhere else")),
>+ )
>+ terms = [
>+ SimpleTerm(name, name, label) for name, label in items]
>+ return SimpleVocabulary(terms)

Why is this a function instead of a constant? If you are
trying to avoid extra variables defined in the module, you could
just do:
  BRANCH_TYPE_VOCABULARY = SimpleVocabulary((
      SimpleTerm(LINK_LP_BZR, LINK_LP_BZR, 'foo'),
      ...

>+class RevisionControlSystemsExtended(RevisionControlSystems):
>+ """External RCS plus Bazaar."""
>+ BZR = DBItem(99, """
>+ Bazaar
>+
>+ External Bazaar branch.
>+ """)
>+
>+
>+class SetBranchForm(Interface):
>+ """The fields presented on the form for setting a branch."""
>+
>+ use_template(
>+ ICodeImport,
>+ ['cvs_module'])
>+
>+ rcs_type = Choice(title=_("Type of RCS"),
>+ required=False, vocabulary=RevisionControlSystemsExtended,
>+ description=_(
>+ "The version control system to import from. "))
>+
>+ repo_url = URIField(
>+ title=_("Branch URL"), required=True,
>+ description=_("The URL of the branch."),
>+ allowed_schemes=["http", "https"],
>+ allow_userinfo=False,
>+ allow_port=True,
>+ allow_query=False,
>+ allow_fragment=False,
>+ trailing_slash=False)
>+
>+ branch_location = copy_field(
>+ IProductSeries['branch'],
>+ __name__='branch_location',
>+ titl...

review: Needs Fixing

[Brad Crittenden (bac)]

Thanks for the excellent review Edwin. I've incorporated all of your suggestions. Having the view create the rendered items was a little more difficult due to the two different types of vocabularies.

I also took care of the items in my BRANCH.TODO list including not masking widget validation errors (which you also noted) and catching an error condition when an import URL has been requested before to avoid a db IntegrityError.

Finally I added a story test to show the high-level working of the new page.

[Brad Crittenden (bac)]

Incremental diff at http://pastebin.ubuntu.com/408292/

[Edwin Grubbs (edwin-grubbs)]

Hi Brad,

Thanks for making all the changes. This branch is definitely a lot harder than
I thought.

Since this branch is not linked anywhere yet, I would be ok with you deferring
items 2 and 3 below to a followup branch so you can land this before it gets
any bigger. I also have some comments inline, but they shouldn't be too hard
to fix in this branch.

merge-conditional

1. jslint: Lint found in '/home/egrubbs/canonical/lp-branches/review/lib/canonical/launchpad/javascript/code/tests/test_productseries_setbranch.js':
    Line 65 character 15: The body of a for in should be wrapped in an if statement to filter unwanted properties from the prototype.
                for (var sub in subscribers) {

    The easiest way to avoid this potential Javascript problem is:
                    Y.each(subscribers, function(sub) {

2. If the Branch name already exists, it appears as if the form does nothing.

3. If there is an existing imported SVN branch on a given URL, the form will
give you the correct error message, but if there is an existing imported BZR
branch on a given URL, it will give you this exception.

Traceback (most recent call last):
  File "/home/egrubbs/canonical/lp-sourcedeps/eggs/zope.publisher-3.10.0-py2.5.egg/zope/publisher/publish.py", line 134, in publish
    result = publication.callObject(request, obj)
  File "/home/egrubbs/canonical/lp-branches/review/lib/canonical/launchpad/webapp/publication.py", line 422, in callObject
    return mapply(ob, request.getPositionalArguments(), request)
  File "/home/egrubbs/canonical/lp-sourcedeps/eggs/zope.publisher-3.10.0-py2.5.egg/zope/publisher/publish.py", line 109, in mapply
    return debug_call(obj, args)
  File "/home/egrubbs/canonical/lp-sourcedeps/eggs/zope.publisher-3.10.0-py2.5.egg/zope/publisher/publish.py", line 115, in debug_call
    return obj(*args)
  File "/home/egrubbs/canonical/lp-branches/review/lib/canonical/launchpad/webapp/publisher.py", line 274, in __call__
    self.initialize()
  File "/home/egrubbs/canonical/lp-branches/review/lib/canonical/launchpad/webapp/launchpadform.py", line 111, in initialize
    self.form_result = action.success(data)
  File "/home/egrubbs/canonical/lp-sourcedeps/eggs/zope.formlib-3.6.0-py2.5.egg/zope/formlib/form.py", line 606, in success
    return self.success_handler(self.form, self, data)
  File "/home/egrubbs/canonical/lp-branches/review/lib/lp/registry/browser/productseries.py", line 993, in update_action
    data['repo_url'])
  File "/home/egrubbs/canonical/lp-branches/review/lib/lp/registry/browser/productseries.py", line 1040, in _createBzrBranch
    url=repo_url)
  File "/home/egrubbs/canonical/lp-branches/review/lib/lp/code/model/branchnamespace.py", line 103, in createBranch
    implicit_subscription = self.getPrivacySubscriber()
  File "/home/egrubbs/canonical/lp-branches/review/lib/lp/code/model/branchnamespace.py", line 343, in getPrivacySubscriber
    rule = self.product.getBranchVisibilityRuleForTeam(self.owner)
  File "/home/egrubbs/canonical/lp-branches/review/lib/lp/code/model/branchvisibilitypolicy.py", line 108, in getBranchVisibilityRuleForTeam
    item = self._selectOneBranchVisibilityTeamPolicy(team)
  File "/home/...

review: Approve (code ui*)

[Brad Crittenden (bac)]

Edwin,

Thanks for the review and the ideas about cleaning up the render() method.

I am going to defer the other two items for another, quick follow-on branch.

The incremental is at:
http://pastebin.ubuntu.com/409614/

[Brad Crittenden (bac)]

Curtis a screenshot is available at http://people.canonical.com/~bac/setbranch.png

[Curtis Hovey (sinzui)]

Hi Brad.

I think Branch name and owner are confusing. I think they subordinate to importing or creating a new branch but they appear to be enabled for setting the series to an existing branch. I know I cannot change the owner or name for the first option. I expect these two options to be, and appear to be, disbaled when I choose Link to a bazaar branch in Launchpad.

I do not see any test to verify the script is loaded on the page. Either we need to show that the
script is in the page or use windmill to verify it executed.

review: Needs Information (code, ui)

[Brad Crittenden (bac)]

As we discussed, the branch name and owner are conditionally disabled correctly, though the screen shot does not show it well.

The extra windmill test will be added to the follow up branch.

[Curtis Hovey (sinzui)]

review: Approve (code, ui)

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-03-17 23:17:46 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-04-07 13:24:38 +0000
@@ -202,8 +202,11 @@
             tal:attributes="src string:${lp_js}/code/branchmergeproposal.status.js">
     </script>
     <script type="text/javascript"
-            tal:attributes="src string:${lp_js}/code/branchmergeproposal.reviewcomment.js"></script>
-
+            tal:attributes="src string:${lp_js}/code/branchmergeproposal.reviewcomment.js">
+    </script>
+    <script type="text/javascript"
+            tal:attributes="src string:${lp_js}/code/productseries-setbranch.js">
+    </script>
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/lp/comment.js"></script>
     <script type="text/javascript"
 
=== modified file 'lib/lp/code/browser/bazaar.py'
--- lib/lp/code/browser/bazaar.py	2009-08-28 01:31:51 +0000
+++ lib/lp/code/browser/bazaar.py	2010-04-07 13:24:38 +0000
@@ -21,6 +21,7 @@
 from canonical.launchpad.webapp.authorization import (
     precache_permission_for_objects)
 
+from lp.code.enums import CodeImportReviewStatus
 from lp.code.interfaces.branch import IBranchCloud, IBranchSet
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.code.interfaces.codeimport import ICodeImportSet
@@ -61,7 +62,8 @@
 
     @property
     def import_count(self):
-        return getUtility(ICodeImportSet).getActiveImports().count()
+        return getUtility(ICodeImportSet).search(
+            review_status=CodeImportReviewStatus.REVIEWED).count()
 
     @property
     def bzr_version(self):
 
=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-03-16 19:04:48 +0000
+++ lib/lp/code/browser/branch.py	2010-04-07 13:24:38 +0000
@@ -16,6 +16,7 @@
     'BranchReviewerEditView',
     'BranchMergeQueueView',
     'BranchMirrorStatusView',
+    'BranchNameValidationMixin',
     'BranchNavigation',
     'BranchEditMenu',
     'BranchInProductView',
@@ -612,7 +613,7 @@
 class BranchNameValidationMixin:
     """Provide name validation logic used by several branch view classes."""
 
-    def _setBranchExists(self, existing_branch):
+    def _setBranchExists(self, existing_branch, field_name='name'):
         owner = existing_branch.owner
         if owner == self.user:
             prefix = "You already have"
@@ -622,7 +623,7 @@
             "%s a branch for <em>%s</em> called <em>%s</em>."
             % (prefix, existing_branch.target.displayname,
                existing_branch.name))
-        self.setFieldError('name', structured(message))
+        self.setFieldError(field_name, structured(message))
 
 
 class BranchEditSchema(Interface):
 
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-03-18 17:30:14 +0000
+++ lib/lp/code/browser/configure.zcml	2010-04-07 13:24:38 +0000
@@ -57,13 +57,6 @@
       permission="zope.Public"
       />
   <browser:page
-      for="canonical.launchpad.webapp.interfaces.ILaunchpadApplication"
-      name="+code-import-list"
-      class="lp.registry.browser.productseries.ProductSeriesSourceListView"
-      template="../templates/sources-list.pt"
-      permission="zope.Public"
-      />
-  <browser:page
       for="zope.interface.Interface"
       name="+test-webservice-js"
       template="../../../canonical/launchpad/templates/test-webservice-js.pt"
 
=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2010-03-26 01:05:26 +0000
+++ lib/lp/code/interfaces/codeimport.py	2010-04-07 13:24:38 +0000
@@ -188,16 +188,6 @@
         :param target: An `IBranchTarget` that the code is associated with.
         """
 
-    def getActiveImports(text=None):
-        """Return an iterable of all 'active' CodeImport objects.
-
-        Active is defined, somewhat arbitrarily, as having
-        review_status==REVIEWED and having completed at least once.
-
-        :param text: If specifed, limit to the results to those that contain
-            ``text`` in the product or project titles and descriptions.
-        """
-
     def get(id):
         """Get a CodeImport by its id.
 
 
=== modified file 'lib/lp/code/javascript/tests/test_productseries_setbranch.js'
--- lib/lp/code/javascript/tests/test_productseries_setbranch.js	2010-04-05 18:58:07 +0000
+++ lib/lp/code/javascript/tests/test_productseries_setbranch.js	2010-04-07 13:24:38 +0000
@@ -61,10 +61,10 @@
               var custom_events = Y.Event.getListeners(field, 'click');
               var click_event = custom_events[0];
               var subscribers = click_event.subscribers;
-              for (var sub in subscribers) {
-                 Y.Assert.isTrue(subscribers[sub].contains(expected),
+              Y.each(subscribers, function(sub) {
+                 Y.Assert.isTrue(sub.contains(expected),
                                  'branch_type_onclick handler setup');
-              };
+              });
            };
 
            check_handler(this.link_lp_bzr, module.onclick_branch_type);
 
=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-03-18 15:39:58 +0000
+++ lib/lp/code/model/codeimport.py	2010-04-07 13:24:38 +0000
@@ -30,10 +30,9 @@
 from canonical.database.constants import DEFAULT
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.database.enumcol import EnumCol
-from canonical.database.sqlbase import SQLBase, quote, sqlvalues
+from canonical.database.sqlbase import SQLBase
 from canonical.launchpad.interfaces import IStore
 from lp.code.model.codeimportjob import CodeImportJobWorkflow
-from lp.registry.model.productseries import ProductSeries
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.code.enums import (
     BranchType, CodeImportJobState, CodeImportResultStatus,
@@ -41,8 +40,6 @@
 from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
 from lp.code.interfaces.codeimportevent import ICodeImportEventSet
 from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
-from lp.code.interfaces.branchnamespace import (
-    get_branch_namespace)
 from lp.code.model.codeimportresult import CodeImportResult
 from lp.code.mail.codeimport import code_import_updated
 from lp.registry.interfaces.person import validate_public_person
@@ -256,51 +253,6 @@
             CodeImportJob.delete(code_import.import_job.id)
         CodeImport.delete(code_import.id)
 
-    def getActiveImports(self, text=None):
-        """See `ICodeImportSet`."""
-        query = self.composeQueryString(text)
-        return CodeImport.select(
-            query, orderBy=['product.name', 'branch.name'],
-            clauseTables=['Product', 'Branch'])
-
-    def composeQueryString(self, text=None):
-        """Build SQL "where" clause for `CodeImport` search.
-
-        :param text: Text to search for in the product and project titles and
-            descriptions.
-        """
-        conditions = [
-            "date_last_successful IS NOT NULL",
-            "review_status=%s" % sqlvalues(CodeImportReviewStatus.REVIEWED),
-            "CodeImport.branch = Branch.id",
-            "Branch.product = Product.id",
-            ]
-        if text == u'':
-            text = None
-
-        # First filter on text, if supplied.
-        if text is not None:
-            conditions.append("""
-                ((Project.fti @@ ftq(%s) AND Product.project IS NOT NULL) OR
-                Product.fti @@ ftq(%s))""" % (quote(text), quote(text)))
-
-        # Exclude deactivated products.
-        conditions.append('Product.active IS TRUE')
-
-        # Exclude deactivated projects, too.
-        conditions.append(
-            "((Product.project = Project.id AND Project.active) OR"
-            " Product.project IS NULL)")
-
-        # And build the query.
-        query = " AND ".join(conditions)
-        return """
-            codeimport.id IN
-            (SELECT codeimport.id FROM codeimport, branch, product, project
-             WHERE %s)
-            AND codeimport.branch = branch.id
-            AND branch.product = product.id""" % query
-
     def get(self, id):
         """See `ICodeImportSet`."""
         try:
 
=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-03-18 17:49:21 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-04-07 13:24:38 +0000
@@ -11,14 +11,11 @@
 from storm.store import Store
 from zope.component import getUtility
 
-from lp.codehosting.codeimport.tests.test_workermonitor import (
-    nuke_codeimport_sample_data)
 from lp.code.model.codeimport import CodeImportSet
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportjob import CodeImportJob, CodeImportJobSet
 from lp.code.model.codeimportresult import CodeImportResult
 from lp.code.interfaces.branchtarget import IBranchTarget
-from lp.code.interfaces.codeimport import ICodeImportSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.code.enums import (
     CodeImportResultStatus, CodeImportReviewStatus, RevisionControlSystems)
@@ -551,196 +548,5 @@
             requester, code_import.import_job.requesting_user)
 
 
-def make_active_import(factory, project_name=None, product_name=None,
-                       branch_name=None, svn_branch_url=None,
-                       cvs_root=None, cvs_module=None, git_repo_url=None,
-                       hg_repo_url=None, last_update=None, rcs_type=None):
-    """Make a new CodeImport for a new Product, maybe in a new Project.
-
-    The import will be 'active' in the sense used by
-    `ICodeImportSet.getActiveImports`.
-    """
-    if project_name is not None:
-        project = factory.makeProject(name=project_name)
-    else:
-        project = None
-    product = factory.makeProduct(
-        name=product_name, displayname=product_name, project=project)
-    code_import = factory.makeProductCodeImport(
-        product=product, branch_name=branch_name,
-        svn_branch_url=svn_branch_url, cvs_root=cvs_root,
-        cvs_module=cvs_module, git_repo_url=git_repo_url,
-        hg_repo_url=hg_repo_url, rcs_type=None)
-    make_import_active(factory, code_import, last_update)
-    return code_import
-
-
-def make_import_active(factory, code_import, last_update=None):
-    """Make `code_import` active as per `ICodeImportSet.getActiveImports`."""
-    from zope.security.proxy import removeSecurityProxy
-    naked_import = removeSecurityProxy(code_import)
-    if naked_import.review_status != CodeImportReviewStatus.REVIEWED:
-        naked_import.updateFromData(
-            {'review_status': CodeImportReviewStatus.REVIEWED},
-            factory.makePerson())
-    if last_update is None:
-        # If last_update is not specfied, presumably we don't care what it is
-        # so we just use some made up value.
-        last_update = datetime(2008, 1, 1, tzinfo=pytz.UTC)
-    naked_import.date_last_successful = last_update
-
-
-def deactivate(project_or_product):
-    """Mark `project_or_product` as not active."""
-    from zope.security.proxy import removeSecurityProxy
-    removeSecurityProxy(project_or_product).active = False
-
-
-class TestGetActiveImports(TestCaseWithFactory):
-    """Tests for CodeImportSet.getActiveImports()."""
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        """Prepare by deleting all the import data in the sample data.
-
-        This means that the tests only have to care about the import
-        data they create.
-        """
-        super(TestGetActiveImports, self).setUp()
-        nuke_codeimport_sample_data()
-        login('[e-mail]')
-
-    def tearDown(self):
-        super(TestGetActiveImports, self).tearDown()
-        logout()
-
-    def testEmpty(self):
-        # We start out with no code imports, so getActiveImports() returns no
-        # results.
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testOneSeries(self):
-        # When there is one active import, it is returned.
-        code_import = make_active_import(self.factory)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-
-    def testOneSeriesWithProject(self):
-        # Code imports for products with a project should be returned too.
-        code_import = make_active_import(
-            self.factory, project_name="whatever")
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-
-    def testExcludeDeactivatedProducts(self):
-        # Deactivating a product means that code imports associated to it are
-        # no longer returned.
-        code_import = make_active_import(self.factory)
-        self.failUnless(code_import.branch.product.active)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-        deactivate(code_import.branch.product)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testExcludeDeactivatedProjects(self):
-        # Deactivating a project means that code imports associated to
-        # products in it are no longer returned.
-        code_import = make_active_import(
-            self.factory, project_name="whatever")
-        self.failUnless(code_import.branch.product.project.active)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [code_import])
-        deactivate(code_import.branch.product.project)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(list(results), [])
-
-    def testSorting(self):
-        # Returned code imports are sorted by product name, then branch name.
-        prod1_a = make_active_import(
-            self.factory, product_name='prod1', branch_name='a')
-        prod2_a = make_active_import(
-            self.factory, product_name='prod2', branch_name='a')
-        prod1_b = self.factory.makeProductCodeImport(
-            product=prod1_a.branch.product, branch_name='b')
-        make_import_active(self.factory, prod1_b)
-        results = getUtility(ICodeImportSet).getActiveImports()
-        self.assertEquals(
-            list(results), [prod1_a, prod1_b, prod2_a])
-
-    def testSearchByProduct(self):
-        # Searching can filter by product name and other texts.
-        code_import = make_active_import(
-            self.factory, product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='product')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProductWithProject(self):
-        # Searching can filter by product name and other texts, and returns
-        # matching imports even if the associated product is in a project
-        # which does not match.
-        code_import = make_active_import(
-            self.factory, project_name='whatever', product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='product')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProject(self):
-        # Searching can filter by project name and other texts.
-        code_import = make_active_import(
-            self.factory, project_name='project', product_name='product')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='project')
-        self.assertEquals(
-            list(results), [code_import])
-
-    def testSearchByProjectWithNonMatchingProduct(self):
-        # If a project matches the text, it's an easy mistake to make to
-        # consider all the products with no project as matching too.
-        code_import_1 = make_active_import(
-            self.factory, product_name='product1')
-        code_import_2 = make_active_import(
-            self.factory, project_name='thisone', product_name='product2')
-        results = getUtility(ICodeImportSet).getActiveImports(
-            text='thisone')
-        self.assertEquals(
-            list(results), [code_import_2])
-
-    def testJoining(self):
-        # Test that the query composed by CodeImportSet.composeQueryString
-        # gets the joins right.  We create code imports for each of the
-        # possibilities of active or inactive product and active or inactive
-        # or absent project.
-        expected = set()
-        source = {}
-        for project_active in [True, False, None]:
-            for product_active in [True, False]:
-                if project_active is not None:
-                    project_name = self.factory.getUniqueString()
-                else:
-                    project_name = None
-                code_import = make_active_import(
-                    self.factory, project_name=project_name)
-                if code_import.branch.product.project and not project_active:
-                    deactivate(code_import.branch.product.project)
-                if not product_active:
-                    deactivate(code_import.branch.product)
-                if project_active != False and product_active:
-                    expected.add(code_import)
-                source[code_import] = (product_active, project_active)
-        results = set(getUtility(ICodeImportSet).getActiveImports())
-        errors = []
-        for extra in results - expected:
-            errors.append(('extra', source[extra]))
-        for missing in expected - results:
-            errors.append(('extra', source[missing]))
-        self.assertEquals(errors, [])
-
-
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/code/stories/branches/xx-bazaar-home.txt'
--- lib/lp/code/stories/branches/xx-bazaar-home.txt	2009-08-28 05:57:37 +0000
+++ lib/lp/code/stories/branches/xx-bazaar-home.txt	2010-04-07 13:24:38 +0000
@@ -16,7 +16,7 @@
     >>> print extract_text(footer)
     30 branches registered in
     6 projects
-    0 imported branches
+    1 imported branches
     2 branches associated with bug reports
     Launchpad uses Bazaar 0.92.0.
 
 
=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-02-23 21:48:53 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-04-07 13:24:38 +0000
@@ -80,13 +80,16 @@
     ...     print extract_text(find_tag_by_id(
     ...         browser.contents, 'proposal-summary'))
     >>> print_summary(nopriv_browser)
-    Status:...
+    Status:
+    ...
     Proposed branch:
     lp://dev/~name12/gnome-terminal/klingon
     Merge into:
     lp://dev/~name12/gnome-terminal/main
     Prerequisite:
     lp://dev/~name12/gnome-terminal/pushed
+    To merge this branch:
+    bzr merge lp://dev/~name12/gnome-terminal/klingon
 
 
 Editing a commit message
 
=== modified file 'lib/lp/code/stories/branches/xx-propose-for-merging.txt'
--- lib/lp/code/stories/branches/xx-propose-for-merging.txt	2010-01-14 04:32:38 +0000
+++ lib/lp/code/stories/branches/xx-propose-for-merging.txt	2010-04-07 13:24:38 +0000
@@ -35,6 +35,7 @@
     Status: Needs review
     Proposed branch: ...
     Merge into: lp://dev/fooix
+    To merge this branch: bzr merge ...
 
 
 Work in progress
@@ -57,3 +58,4 @@
     Status: Work in progress
     Proposed branch: ...
     Merge into: lp://dev/fooix
+    To merge this branch: bzr merge ...
 
=== removed file 'lib/lp/code/stories/codeimport/xx-codeimport-list.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-list.txt	2010-01-12 22:09:23 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-list.txt	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-There is a page listing all the active code imports on the code
-homepage.
-
-We start by deleting all the code import sample data and creating a
-few imports that will be displayed in the listing.
-
-    >>> import datetime
-    >>> import pytz
-    >>> from lp.codehosting.codeimport.tests.test_workermonitor import (
-    ...     nuke_codeimport_sample_data)
-    >>> from lp.code.enums import RevisionControlSystems
-    >>> from lp.code.model.tests.test_codeimport import (
-    ...     make_active_import)
-    >>> from lp.code.interfaces.codeimport import ICodeImportSet
-    >>> from lp.testing import login, logout
-    >>> from zope.component import getUtility
-    >>> login('[e-mail]')
-    >>> nuke_codeimport_sample_data()
-    >>> code_import_set = getUtility(ICodeImportSet)
-    >>> active_svn_import = make_active_import(
-    ...     factory, product_name="myproject", branch_name="trunk",
-    ...     svn_branch_url="http://example.com/svn/myproject/trunk",
-    ...     last_update=datetime.datetime(2007, 1, 1, tzinfo=pytz.UTC))
-    >>> active_bzr_svn_import = make_active_import(
-    ...     factory, product_name="ourproject", branch_name="trunk",
-    ...     svn_branch_url="http://example.com/bzr-svn/myproject/trunk",
-    ...     rcs_type=RevisionControlSystems.BZR_SVN,
-    ...     last_update=datetime.datetime(2007, 1, 2, tzinfo=pytz.UTC))
-    >>> active_cvs_import = make_active_import(
-    ...     factory, product_name="hisproj", branch_name="main",
-    ...     cvs_root=":pserver:[e-mail]:/cvs", cvs_module="hisproj",
-    ...     last_update=datetime.datetime(2007, 1, 3, tzinfo=pytz.UTC))
-    >>> active_git_import = make_active_import(
-    ...     factory, product_name="herproj", branch_name="master",
-    ...     git_repo_url="git://git.example.org/herproj",
-    ...     last_update=datetime.datetime(2007, 1, 4, tzinfo=pytz.UTC))
-    >>> active_hg_import = make_active_import(
-    ...     factory, product_name="hg-proj", branch_name="tip",
-    ...     hg_repo_url="http://hg.example.org/proj",
-    ...     last_update=datetime.datetime(2007, 1, 5, tzinfo=pytz.UTC))
-    >>> len(list(code_import_set.getActiveImports()))
-    5
-    >>> logout()
-
-The page is linked to from the "$N imported branches" text.
-
-    >>> browser.open('http://code.launchpad.dev')
-    >>> browser.getLink('5 imported branches').click()
-    >>> print browser.title
-    Available code imports
-
-It lists the active imports, sorted by product then branch name:
-
-   >>> def print_import_table():
-   ...     table = first_tag_by_class(browser.contents, 'listing')
-   ...     print extract_text(table)
-
-   >>> print_import_table()
-   Project    Branch Name Source Details                             Last Updated
-   herproj    master      git://git.example.org/herproj              2007-01-04
-   hg-proj    tip         http://hg.example.org/proj                 2007-01-05
-   hisproj    main        :pserver:[e-mail]:/cvs hisproj     2007-01-03
-   myproject  trunk       http://example.com/svn/myproject/trunk     2007-01-01
-   ourproject trunk       http://example.com/bzr-svn/myproject/trunk 2007-01-02
-
-You can filter the list by product:
-
-   >>> browser.getControl(name='text').value = 'hisproj'
-   >>> browser.getControl('Search', index=0).click()
-   >>> print_import_table()
-   Project   Branch Name Source Details                         Last Updated
-   hisproj   main        :pserver:[e-mail]:/cvs hisproj 2007-01-03
 
=== modified file 'lib/lp/code/stories/codeimport/xx-codeimport-view.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-view.txt	2010-03-18 17:49:21 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-view.txt	2010-04-07 13:24:38 +0000
@@ -1,10 +1,10 @@
 Code imports
 ============
 
-For now, there is no link to the page that lists all code imports, so
-we browse there directly:
+The code imports overview page is linked of the main code page.
 
-    >>> browser.open('http://code.launchpad.dev/+code-imports')
+    >>> browser.open('http://code.launchpad.dev')
+    >>> browser.getLink('1 imported branches').click()
     >>> print browser.title
     Code Imports
 
 
=== modified file 'lib/lp/code/templates/bazaar-index.pt'
--- lib/lp/code/templates/bazaar-index.pt	2010-03-11 06:43:00 +0000
+++ lib/lp/code/templates/bazaar-index.pt	2010-04-07 13:24:38 +0000
@@ -121,7 +121,7 @@
           </a>
         </div>
         <div>
-          <a href="/+code-import-list">
+          <a href="/+code-imports">
             <strong tal:content="view/import_count">123</strong>
             imported branches
           </a>
 
=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2010-02-24 08:05:27 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2010-04-07 13:24:38 +0000
@@ -131,5 +131,9 @@
              tal:content="context/preview_diff/conflicts"/>
       </td>
     </tr>
+    <tr id="summary-row-merge-instruction">
+      <th>To merge this branch:</th>
+      <td>bzr merge <span class="branch-url" tal:content="context/source_branch/bzr_identity" /></td>
+    </tr>
   </tbody>
 </table>
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-04-01 18:48:04 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-04-07 13:24:38 +0000
@@ -1664,6 +1664,13 @@
         facet="overview"
         permission="launchpad.Edit"/>
     <browser:page
+        for="lp.registry.interfaces.productseries.IProductSeries"
+        name="+setbranch"
+        class="lp.registry.browser.productseries.ProductSeriesSetBranchView"
+        template="../templates/productseries-setbranch.pt"
+        facet="overview"
+        permission="launchpad.Edit"/>
+    <browser:page
         name="+review"
         for="lp.registry.interfaces.productseries.IProductSeries"
         class="lp.registry.browser.productseries.ProductSeriesReviewView"
 
=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-03-23 00:39:45 +0000
+++ lib/lp/registry/browser/productseries.py	2010-04-07 13:24:38 +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).
 
 """View classes for `IProductSeries`."""
@@ -20,7 +20,7 @@
     'ProductSeriesOverviewNavigationMenu',
     'ProductSeriesRdfView',
     'ProductSeriesReviewView',
-    'ProductSeriesSourceListView',
+    'ProductSeriesSetBranchView',
     'ProductSeriesSpecificationsMenu',
     'ProductSeriesUbuntuPackagingView',
     'ProductSeriesView',
@@ -34,6 +34,7 @@
 from zope.component import getUtility
 from zope.app.form.browser import TextAreaWidget, TextWidget
 from zope.formlib import form
+from zope.interface import Interface
 from zope.schema import Choice
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
@@ -41,7 +42,7 @@
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
-from lp.code.browser.branchref import BranchRef
+from canonical.launchpad.fields import URIField
 from lp.blueprints.browser.specificationtarget import (
     HasSpecificationsMenuMixin)
 from lp.blueprints.interfaces.specification import (
@@ -49,9 +50,15 @@
 from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
 from canonical.launchpad.helpers import browserLanguages
+from lp.code.browser.branch import BranchNameValidationMixin
+from lp.code.browser.branchref import BranchRef
+from lp.code.enums import BranchType, RevisionControlSystems
+from lp.code.interfaces.branch import (
+    BranchCreationForbidden, BranchExists, IBranch)
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
+from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.codeimport import (
-    ICodeImportSet)
+    ICodeImport, ICodeImportSet)
 from lp.services.worlddata.interfaces.country import ICountry
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -70,12 +77,13 @@
     Link, Navigation, NavigationMenu, StandardLaunchpadFacets, stepthrough,
     stepto)
 from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
-from canonical.launchpad.webapp.interfaces import NotFoundError
+from canonical.launchpad.webapp.interfaces import (
+    NotFoundError, UnexpectedFormData)
 from canonical.launchpad.webapp.launchpadform import (
     action, custom_widget, LaunchpadEditFormView, LaunchpadFormView)
 from canonical.launchpad.webapp.menu import structured
+from canonical.widgets.itemswidgets import LaunchpadRadioWidget
 from canonical.widgets.textwidgets import StrippedTextWidget
 
 from lp.registry.browser import (
@@ -83,6 +91,9 @@
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.productseries import IProductSeries
 
+from lazr.enum import DBItem
+from lazr.restful.interface import copy_field, use_template
+
 
 def quote(text):
     """Escape and quote text."""
@@ -644,7 +655,369 @@
         self.next_url = canonical_url(product)
 
 
-class ProductSeriesLinkBranchView(LaunchpadEditFormView):
+LINK_LP_BZR = 'link-lp-bzr'
+CREATE_NEW = 'create-new'
+IMPORT_EXTERNAL = 'import-external'
+
+
+BRANCH_TYPE_VOCABULARY = SimpleVocabulary((
+    SimpleTerm(LINK_LP_BZR, LINK_LP_BZR,
+               _("Link to a Bazaar branch already on Launchpad")),
+    SimpleTerm(CREATE_NEW, CREATE_NEW,
+               _("Create a new, empty branch in Launchpad and "
+                 "link to this series")),
+    SimpleTerm(IMPORT_EXTERNAL, IMPORT_EXTERNAL,
+               _("Import a branch hosted somewhere else")),
+    ))
+
+
+class RevisionControlSystemsExtended(RevisionControlSystems):
+    """External RCS plus Bazaar."""
+    BZR = DBItem(99, """
+        Bazaar
+
+        External Bazaar branch.
+        """)
+
+
+class SetBranchForm(Interface):
+    """The fields presented on the form for setting a branch."""
+
+    use_template(
+        ICodeImport,
+        ['cvs_module'])
+
+    rcs_type = Choice(title=_("Type of RCS"),
+        required=False, vocabulary=RevisionControlSystemsExtended,
+        description=_(
+            "The version control system to import from. "))
+
+    repo_url = URIField(
+        title=_("Branch URL"), required=True,
+        description=_("The URL of the branch."),
+        allowed_schemes=["http", "https"],
+        allow_userinfo=False,
+        allow_port=True,
+        allow_query=False,
+        allow_fragment=False,
+        trailing_slash=False)
+
+    branch_location = copy_field(
+        IProductSeries['branch'],
+        __name__='branch_location',
+        title=_('Branch'),
+        description=_(
+            "The Bazaar branch for this series in Launchpad, "
+            "if one exists."),
+        )
+
+    branch_type = Choice(
+        title=_('Import type'),
+        vocabulary=BRANCH_TYPE_VOCABULARY,
+        description=_("The type of import"),
+        required=True)
+
+    branch_name = copy_field(
+        IBranch['name'],
+        __name__='branch_name',
+        title=_('Branch name'),
+        description=_(''),
+        required=True,
+        )
+
+    branch_owner = copy_field(
+        IBranch['owner'],
+        __name__='branch_owner',
+        title=_('Branch owner'),
+        description=_(''),
+        required=True,
+        )
+
+
+class ProductSeriesSetBranchView(LaunchpadFormView, ProductSeriesView,
+                                 BranchNameValidationMixin):
+    """The view to set a branch for the ProductSeries."""
+
+    schema = SetBranchForm
+    # Set for_input to True to ensure fields marked read-only will be editable
+    # upon creation.
+    for_input = True
+
+    custom_widget('rcs_type', LaunchpadRadioWidget)
+    custom_widget('branch_type', LaunchpadRadioWidget)
+    initial_values = {
+        'rcs_type': RevisionControlSystemsExtended.BZR,
+        'branch_type': LINK_LP_BZR,
+        }
+
+    def setUpWidgets(self):
+        """See `LaunchpadFormView`."""
+        super(ProductSeriesSetBranchView, self).setUpWidgets()
+
+        def render(widget, term_value, current_value, label=None):
+            term = widget.vocabulary.getTerm(term_value)
+            if term.value == current_value:
+                render = widget.renderSelectedItem
+            else:
+                render = widget.renderItem
+            if label is None:
+                label = term.title
+            value = term.token
+            return render(index=term.value,
+                          text=label,
+                          value=value,
+                          name=widget.name,
+                          cssClass='')
+
+        widget = self.widgets['rcs_type']
+        vocab = widget.vocabulary
+        current_value = widget._getFormValue()
+        self.rcs_type_cvs = render(widget, vocab.CVS, current_value, 'CVS')
+        self.rcs_type_svn = render(widget, vocab.BZR_SVN, current_value,
+                                   'SVN')
+        self.rcs_type_git = render(widget, vocab.GIT, current_value)
+        self.rcs_type_hg = render(widget, vocab.HG, current_value)
+        self.rcs_type_bzr = render(widget, vocab.BZR, current_value)
+        self.rcs_type_emptymarker = widget._emptyMarker()
+
+        widget = self.widgets['branch_type']
+        current_value = widget._getFormValue()
+        vocab = widget.vocabulary
+
+        (self.branch_type_link,
+         self.branch_type_create,
+         self.branch_type_import) = [
+            render(widget, value, current_value)
+            for value in (LINK_LP_BZR, CREATE_NEW, IMPORT_EXTERNAL)]
+
+    def _validateLinkLpBzr(self, data):
+        """Validate data for link-lp-bzr case."""
+        if 'branch_location' not in data:
+            self.setFieldError(
+                'branch_location',
+                'The branch location must be set.')
+
+    def _validateCreateNew(self, data):
+        """Validate data for create new case."""
+        self._validateBranch(data)
+
+    def _validateImportExternal(self, data):
+        """Validate data for import external case."""
+        rcs_type = data.get('rcs_type')
+        repo_url = data.get('repo_url')
+
+        if repo_url is None:
+            self.setFieldError('repo_url',
+                               'You must set the external repository URL.')
+        else:
+            # Ensure this URL has not been imported before.
+            code_import = getUtility(ICodeImportSet).getByURL(repo_url)
+            if code_import is not None:
+                self.setFieldError(
+                    'repo_url',
+                    structured("""
+                    This foreign branch URL is already specified for
+                    the imported branch <a href="%s">%s</a>.""",
+                               canonical_url(code_import.branch),
+                               code_import.branch.unique_name))
+
+        # RCS type is mandatory.
+        # This condition should never happen since an initial value is set.
+        if rcs_type is None:
+            # The error shows but does not identify the widget.
+            self.setFieldError(
+                'rcs_type',
+                'You must specify the type of RCS for the remote host.')
+        elif rcs_type == RevisionControlSystemsExtended.CVS:
+            if 'cvs_module' not in data:
+                self.setFieldError(
+                    'cvs_module',
+                    'The CVS module must be set.')
+        self._validateBranch(data)
+
+    def _validateBranch(self, data):
+        """Validate that branch name and owner are set."""
+        if 'branch_name' not in data:
+            self.setFieldError(
+                'branch_name',
+                'The branch name must be set.')
+        if 'branch_owner' not in data:
+            self.setFieldError(
+                'branch_owner',
+                'The branch owner must be set.')
+
+    def _setRequired(self, names, value):
+        """Mark the widget field as optional."""
+        for name in names:
+            widget = self.widgets[name]
+            # The 'required' property on the widget context is set to False.
+            # The widget also has a 'required' property but it isn't used
+            # during validation.
+            widget.context.required = value
+
+    def _validSchemes(self, rcs_type):
+        """Return the valid schemes for the repository URL."""
+        schemes = set(['http', 'https'])
+        # Extend the allowed schemes for the repository URL based on
+        # rcs_type.
+        extra_schemes = {
+            RevisionControlSystemsExtended.BZR_SVN:['svn'],
+            RevisionControlSystemsExtended.GIT:['git'],
+            }
+        schemes.update(extra_schemes.get(rcs_type, []))
+        return schemes
+
+    def validate_widgets(self, data, names=None):
+        """See `LaunchpadFormView`."""
+        names = ['branch_type', 'rcs_type']
+        super(ProductSeriesSetBranchView, self).validate_widgets(data, names)
+        branch_type = data.get('branch_type')
+        if branch_type == LINK_LP_BZR:
+            # Mark other widgets as non-required.
+            self._setRequired(['rcs_type', 'repo_url', 'cvs_module',
+                               'branch_name', 'branch_owner'], False)
+        elif branch_type == CREATE_NEW:
+            self._setRequired(
+                ['branch_location', 'repo_url', 'rcs_type', 'cvs_module'],
+                False)
+        elif branch_type == IMPORT_EXTERNAL:
+            rcs_type = data.get('rcs_type')
+
+            # Set the valid schemes based on rcs_type.
+            self.widgets['repo_url'].field.allowed_schemes = (
+                self._validSchemes(rcs_type))
+            # The branch location is not required for validation.
+            self._setRequired(['branch_location'], False)
+            # The cvs_module is required if it is a CVS import.
+            if rcs_type == RevisionControlSystemsExtended.CVS:
+                self._setRequired(['cvs_module'], True)
+        else:
+            raise AssertionError("Unknown branch type %s" % branch_type)
+        # Perform full validation now.
+        super(ProductSeriesSetBranchView, self).validate_widgets(data)
+
+    def validate(self, data):
+        """See `LaunchpadFormView`."""
+        # If widget validation returned errors then there is no need to
+        # continue as we'd likely just override the errors reported there.
+        if len(self.errors) > 0:
+            return
+        branch_type = data['branch_type']
+        if branch_type == IMPORT_EXTERNAL:
+            self._validateImportExternal(data)
+        elif branch_type == LINK_LP_BZR:
+            self._validateLinkLpBzr(data)
+        elif branch_type == CREATE_NEW:
+            self._validateCreateNew(data)
+        else:
+            raise AssertionError("Unknown branch type %s" % branch_type)
+
+    @property
+    def target(self):
+        """The branch target for the context."""
+        return IBranchTarget(self.context)
+
+    @action(_('Update'), name='update')
+    def update_action(self, action, data):
+        self.next_url = canonical_url(self.context)
+        branch_type = data.get('branch_type')
+        if branch_type == LINK_LP_BZR:
+            branch_location = data.get('branch_location')
+            if branch_location != self.context.branch:
+                self.context.branch = branch_location
+                # Request an initial upload of translation files.
+                getUtility(IRosettaUploadJobSource).create(
+                    self.context.branch, NULL_REVISION)
+            else:
+                self.context.branch = branch_location
+            self.request.response.addInfoNotification(
+                'Series code location updated.')
+        else:
+            branch_name = data.get('branch_name')
+            branch_owner = data.get('branch_owner')
+
+            # Create a new branch.
+            if branch_type == CREATE_NEW:
+                branch = self._createBzrBranch(
+                    BranchType.HOSTED, branch_name, branch_owner)
+                if branch is not None:
+                    self.context.branch = branch
+                    self.request.response.addInfoNotification(
+                        'New branch created and linked to the series.')
+
+            # Import or mirror an external branch.
+            elif branch_type == IMPORT_EXTERNAL:
+                # Either create an externally hosted bzr branch
+                # (a.k.a. 'mirrored') or create a new code import.
+                rcs_type = data.get('rcs_type')
+                if rcs_type == RevisionControlSystemsExtended.BZR:
+                    branch = self._createBzrBranch(
+                        BranchType.MIRRORED, branch_name, branch_owner,
+                        data['repo_url'])
+
+                    if branch is not None:
+                        self.context.branch = branch
+                        self.request.response.addInfoNotification(
+                            'Mirrored branch created and linked to '
+                            'the series.')
+                else:
+                    # We need to create an import request.
+
+                    # Ensure the URL has not already been imported.
+                    if rcs_type == RevisionControlSystemsExtended.CVS:
+                        cvs_root = data.get('repo_url')
+                        cvs_module = data.get('cvs_module')
+                        url = None
+                    else:
+                        cvs_root = None
+                        cvs_module = None
+                        url = data.get('repo_url')
+                    rcs_item = RevisionControlSystems.items[rcs_type.name]
+                    code_import = getUtility(ICodeImportSet).new(
+                        registrant=branch_owner,
+                        target=self.target,
+                        branch_name=branch_name,
+                        rcs_type=rcs_item,
+                        url=url,
+                        cvs_root=cvs_root,
+                        cvs_module=cvs_module)
+                    self.context.branch = code_import.branch
+                    self.request.response.addInfoNotification(
+                        'Code import created and branch linked to the '
+                        'series.')
+            else:
+                raise UnexpectedFormData(branch_type)
+
+    def _createBzrBranch(self, branch_type, branch_name,
+                         branch_owner, repo_url=None):
+        """Create a new Bazaar branch.  It may be hosted or mirrored.
+
+        Return the branch on success or None.
+        """
+        branch = None
+        try:
+            namespace = self.target.getNamespace(branch_owner)
+            branch = namespace.createBranch(branch_type=branch_type,
+                                            name=branch_name,
+                                            registrant=self.user,
+                                            url=repo_url)
+            if branch_type == BranchType.MIRRORED:
+                branch.requestMirror()
+        except BranchCreationForbidden:
+            self.addError(
+                "You are not allowed to create branches in %s." %
+                self.context.displayname)
+        except BranchExists, e:
+            self._setBranchExists(e.existing_branch, 'branch_name')
+        return branch
+
+    @property
+    def cancel_url(self):
+        """See `LaunchpadFormView`."""
+        return canonical_url(self.context)
+
+
+class ProductSeriesLinkBranchView(LaunchpadEditFormView, ProductSeriesView):
     """View to set the bazaar branch for a product series."""
 
     schema = IProductSeries
@@ -753,23 +1126,6 @@
         return encodeddata
 
 
-class ProductSeriesSourceListView(LaunchpadView):
-    """A listing of all the running imports.
-
-    See `ICodeImportSet.getActiveImports` for our definition of running.
-    """
-
-    page_title = 'Available code imports'
-    label = page_title
-
-    def initialize(self):
-        """See `LaunchpadFormView`."""
-        self.text = self.request.get('text')
-        results = getUtility(ICodeImportSet).getActiveImports(text=self.text)
-
-        self.batchnav = BatchNavigator(results, self.request)
-
-
 class ProductSeriesFileBugRedirect(LaunchpadView):
     """Redirect to the product's +filebug page."""
 
 
=== added file 'lib/lp/registry/browser/tests/productseries-setbranch-view.txt'
--- lib/lp/registry/browser/tests/productseries-setbranch-view.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/productseries-setbranch-view.txt	2010-04-07 13:24:38 +0000
@@ -0,0 +1,339 @@
+Set branch
+----------
+
+The productseries +setbranch view allows the user to set a branch for
+this series.  The branch can be one that already exists in Launchpad,
+or a new branch in Launchpad can be defined, or it can be a repository
+that exists externally in a variety of version control systems.
+
+    >>> from canonical.launchpad.testing.pages import find_tag_by_id
+    >>> product = factory.makeProduct(name="chevy")
+    >>> series = factory.makeProductSeries(name="impala", product=product)
+    >>> transaction.commit()
+    >>> login_person(product.owner)
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner)
+    >>> print find_tag_by_id(view.render(), 'maincontent')
+    <div...
+    ...Link to a Bazaar branch already on Launchpad...
+    ...Create a new, empty branch in Launchpad and link to this series...
+    ...Import a branch hosted somewhere else...
+    ...Branch name:...
+    ...Branch owner:...
+
+
+Linking to an existing branch
+-----------------------------
+
+If linking to an existing branch is selected then the branch location
+must be provided.
+
+    >>> form = {
+    ...     'field.branch_type': 'link-lp-bzr',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    The branch location must be set.
+
+Setting the branch location to an invalid branch results in another
+validation error.
+
+    >>> form = {
+    ...     'field.branch_type': 'link-lp-bzr',
+    ...     'field.branch_location': 'foo',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    ('Invalid value', InvalidValue("token 'foo' not found in vocabulary"))
+
+Providing a valid branch results in a successful linking.
+
+    >>> series.branch is None
+    True
+    >>> branch = factory.makeBranch(name='impala-branch',
+    ...                             owner=product.owner, product=product)
+    >>> form = {
+    ...     'field.branch_type': 'link-lp-bzr',
+    ...     'field.branch_location': branch.unique_name,
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Series code location updated.
+
+    >>> print series.branch.name
+    impala-branch
+
+
+Creating a new branch
+---------------------
+
+When creating a new branch the branch name and owner must be specified.
+
+    >>> series = factory.makeProductSeries(name="camaro", product=product)
+    >>> transaction.commit()
+
+    >>> form = {
+    ...     'field.branch_type': 'create-new',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    The branch name must be set.
+    The branch owner must be set.
+
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> mark = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> form = {
+    ...     'field.branch_type': 'create-new',
+    ...     'field.branch_name': 'camaro-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.actions.update': 'Update',
+    ...     }
+
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    New branch created and linked to the series.
+    >>> print series.branch.name
+    camaro-branch
+
+
+Import a branch hosted elsewhere
+--------------------------------
+
+Importing an externally hosted branch can either be a mirror, if a
+Bazaar branch, or an import, if a git, hg, cvs, or svn branch.
+
+Lots of data are required to create an import.
+
+    >>> series = factory.makeProductSeries(name="blazer", product=product)
+    >>> transaction.commit()
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    You must set the external repository URL.
+    You must specify the type of RCS for the remote host.
+    The branch name must be set.
+    The branch owner must be set.
+
+For Bazaar branches the scheme may only be http or https.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'BZR',
+    ...     'field.branch_name': 'blazer-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'bzr://bzr.com/foo',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    ('repo_url'...The URI scheme "bzr" is not allowed.  Only URIs with the following schemes may be
+    used: http, https'))
+
+A correct URL is accepted.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'BZR',
+    ...     'field.branch_name': 'blazer-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'http://bzr.com/foo',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Mirrored branch created and linked to the series.
+    >>> print series.branch.name
+    blazer-branch
+
+Git branches cannnot use svn.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'GIT',
+    ...     'field.branch_name': 'chevette-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'svn://svn.com/chevette',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    ('repo_url'...'The URI scheme "svn" is not allowed.  Only
+    URIs with the following schemes may be used: git, http, https'))
+
+But Git branches may use git.
+
+    >>> series = factory.makeProductSeries(name="chevette", product=product)
+    >>> transaction.commit()
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'GIT',
+    ...     'field.branch_name': 'chevette-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'git://github.com/chevette',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> transaction.commit()
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Code import created and branch linked to the series.
+    >>> print series.branch.name
+    chevette-branch
+
+But Subversion branches cannnot use git.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'BZR_SVN',
+    ...     'field.branch_name': 'suburban-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'git://github.com/suburban',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    ('repo_url'...'The URI scheme "git" is not allowed.  Only
+    URIs with the following schemes may be used: http, https, svn'))
+
+But Subversion branches may use svn as the scheme.
+
+    >>> series = factory.makeProductSeries(name="suburban", product=product)
+    >>> transaction.commit()
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'BZR_SVN',
+    ...     'field.branch_name': 'suburban-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'svn://svn.com/suburban',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Code import created and branch linked to the series.
+    >>> print series.branch.name
+    suburban-branch
+
+Mercurial branches must use http or https as the scheme.
+
+    >>> series = factory.makeProductSeries(name="malibu", product=product)
+    >>> transaction.commit()
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'HG',
+    ...     'field.branch_name': 'malibu-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'https://mercurial.com/branch',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Code import created and branch linked to the series.
+    >>> print series.branch.name
+    malibu-branch
+
+CVS branches must use http or https as the scheme and must have the
+CVS module field specified.
+
+    >>> series = factory.makeProductSeries(name="corvair", product=product)
+    >>> transaction.commit()
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'CVS',
+    ...     'field.branch_name': 'corvair-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'https://cvs.com/branch',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    >>> for error in view.errors:
+    ...     print error
+    The CVS module must be set.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'CVS',
+    ...     'field.branch_name': 'corvair-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'https://cvs.com/branch',
+    ...     'field.cvs_module': 'root',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Code import created and branch linked to the series.
+    >>> print series.branch.name
+    corvair-branch
+
+Attempting to import a location that has already been imported results
+in an error.
+
+    >>> form = {
+    ...     'field.branch_type': 'import-external',
+    ...     'field.rcs_type': 'GIT',
+    ...     'field.branch_name': 'chevette-branch-dup',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.repo_url': 'git://github.com/chevette',
+    ...     'field.actions.update': 'Update',
+    ...     }
+    >>> view = create_initialized_view(series, name='+setbranch',
+    ...                                principal=product.owner, form=form)
+    >>> for error in view.errors:
+    ...     print error
+    <BLANKLINE>
+    This foreign branch URL is already specified for
+    the imported branch <a href="http://code.launchpad.dev/~.../chevy/chevette-branch">~.../chevy/chevette-branch</a>.
+
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
 
=== added file 'lib/lp/registry/stories/productseries/xx-productseries-set-branch.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-set-branch.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-set-branch.txt	2010-04-07 13:24:38 +0000
@@ -0,0 +1,147 @@
+Setting the branch for a product series
+=======================================
+
+A product series should have a branch set for it.  The branch can be
+hosted on Launchpad or somewhere else.  Foreign branches can be in
+Bazaar, Git, Mercurial, Subversion, or CVS.  Though internally
+Launchpad treats those scenarios differently we provide a single page
+to the user to set up the branch.
+
+At present, the unified page for setting up the branch is not linked
+from anywhere, so it must be navigated to directly.
+
+    >>> browser = setupBrowser(auth="Basic [e-mail]:test")
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+
+The default choice for the type of branch to set is one that
+already exists on Launchpad.
+
+    >>> print_radio_button_field(browser.contents, 'branch_type')
+    (*) Link to a Bazaar branch already on Launchpad
+    ( ) Create a new, empty branch in Launchpad and link to this series
+    ( ) Import a branch hosted somewhere else
+
+
+Linking to an existing branch
+-----------------------------
+
+A user can choose to link to an existing branch on Launchpad.
+
+    >>> login('[e-mail]')
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> productset = getUtility(IProductSet)
+    >>> firefox = productset.getByName('firefox')
+    >>> branch = factory.makeBranch(name="firefox-hosted-branch", product=firefox)
+    >>> branch_name = branch.unique_name
+    >>> logout()
+
+    >>> browser.getControl(name='field.branch_location').value = branch_name
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    Series code location updated.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+
+
+Creating a new branch
+---------------------
+
+A brand new, empty branch on Launchpad can be created and set as the
+series branch.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Create a new, empty branch in Launchpad').click()
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    There is 1 error.
+    Required input is missing.
+
+However in order to create the branch the name and owner must be
+specified.  The owner is a pre-populated dropdown list so the default
+can be used.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Create a new, empty branch in Launchpad').click()
+    >>> browser.getControl(name='field.branch_name').value = 'new-firefox-branch'
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    New branch created and linked to the series.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+
+
+Linking to an external branch
+-----------------------------
+
+An external branch can be linked.  The branch can be a Bazaar branch
+or be a Git, Mercurial, Subversion, or CVS branch.
+
+Each of these types must provide the URL of the external repository,
+the branch name to use in Launchpad, and the branch owner.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Import a branch hosted somewhere else').click()
+    >>> browser.getControl('Branch name').value = 'bzr-firefox-branch'
+    >>> browser.getControl('Bazaar', index=0).click()
+    >>> browser.getControl('Branch URL').value = 'https://bzr.example.com/branch'
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    Series code location updated.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+
+The process is the same for a Git external branch, though the novel
+"git://" scheme can also be used.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Import a branch hosted somewhere else').click()
+    >>> browser.getControl('Branch name').value = 'git-firefox-branch'
+    >>> browser.getControl('Git').click()
+    >>> browser.getControl('Branch URL').value = 'git://git.example.com/branch'
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    Code import created and branch linked to the series.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+
+Likewise Subversion can use the "svn://" scheme.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Import a branch hosted somewhere else').click()
+    >>> browser.getControl('Branch name').value = 'svn-firefox-branch'
+    >>> browser.getControl('SVN').click()
+    >>> browser.getControl('Branch URL').value = 'svn://svn.example.com/branch'
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    Code import created and branch linked to the series.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+
+The branch owner can be the logged in user or one of her teams.
+
+    >>> browser.open('http://launchpad.dev/firefox/trunk/+setbranch')
+    >>> browser.getControl('Import a branch hosted somewhere else').click()
+    >>> browser.getControl('Branch name').value = 'hg-firefox-branch'
+    >>> browser.getControl('Mercurial').click()
+    >>> browser.getControl('Branch URL').value = 'http://hg.example.com/branch'
+    >>> browser.getControl('Branch owner').value = ['hwdb-team']
+    >>> browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(browser.contents):
+    ...     print extract_text(message)
+    Code import created and branch linked to the series.
+    >>> print browser.url
+    http://launchpad.dev/firefox/trunk
+    >>> login('[e-mail]')
+    >>> firefox_trunk = firefox.getSeries('trunk')
+    >>> print firefox_trunk.branch.unique_name
+    ~hwdb-team/firefox/hg-firefox-branch
+    >>> print firefox_trunk.branch.owner.name
+    hwdb-team
+    >>> logout()
 
=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2010-03-09 22:06:12 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2010-04-07 13:24:38 +0000
@@ -29,7 +29,7 @@
         <li>
           <p>
             If the code is in a Bazaar branch not yet on Launchpad
-            you can either
+            you can either:
           </p>
 
           <ul class="bulleted" style="margin-bottom: 0;">
@@ -39,7 +39,7 @@
               registering a mirrored branch</a>
             </li>
             <li id="ssh-key-directions">
-              Push the branch directly to Launchpad. eg. with <br />
+              Push the branch directly to Launchpad, e.g. with:<br />
               <tt><strong>
                 bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
               </strong></tt>
@@ -58,7 +58,7 @@
           <a tal:attributes="href view/request_import_link">request that the branch be imported to Bazaar</a>.
         </li>
       </ul>
-      
+
       <ul class="horizontal">
         <li>
           <a tal:replace="structure context/menu:overview/link_branch/fmt:link" />
 
=== modified file 'lib/lp/registry/templates/productseries-linkbranch.pt'
--- lib/lp/registry/templates/productseries-linkbranch.pt	2009-08-11 21:26:30 +0000
+++ lib/lp/registry/templates/productseries-linkbranch.pt	2010-04-07 13:24:38 +0000
@@ -7,8 +7,44 @@
   i18n:domain="launchpad">
   <body>
     <div metal:fill-slot="main">
-      <div metal:use-macro="context/@@launchpad_form/form" />
+      <ul>
+        <li>If the code is already in a Bazaar branch registered with Launchpad,
+          specify it here:
+          <div metal:use-macro="context/@@launchpad_form/form" />
+        </li>
+
+        <li>
+          <p>
+            Otherwise, if the code is in a Bazaar branch not yet on Launchpad
+            you can either:
+          </p>
+
+          <ul class="bulleted" style="margin-bottom: 0;">
+            <li>
+              Have the branch mirrored from a remote location by
+               <a tal:attributes="href context/menu:overview/branch_add/fmt:url">
+              registering a mirrored branch</a>
+            </li>
+            <li id="ssh-key-directions">
+              Push the branch directly to Launchpad, e.g. with:<br />
+              <tt><strong>
+                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
+              </strong></tt>
+              <tal:no-keys condition="not:view/user/sshkeys">
+                <br/>To authenticate with the Launchpad branch upload service,
+                you need to
+                <a tal:attributes="href string:${view/user/fmt:url}/+editsshkeys">
+                  register a SSH key</a>.
+              </tal:no-keys>
+            </li>
+          </ul>
+        </li>
+
+        <li>
+          If the code is in git, CVS or Subversion you can
+          <a tal:attributes="href view/request_import_link">request that the branch be imported to Bazaar</a>.
+        </li>
+      </ul>
     </div>
   </body>
 </html>
-
 
=== added file 'lib/lp/registry/templates/productseries-setbranch.pt'
--- lib/lp/registry/templates/productseries-setbranch.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/productseries-setbranch.pt	2010-04-07 13:24:38 +0000
@@ -0,0 +1,129 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  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"
+  i18n:domain="launchpad">
+
+<body>
+
+<metal:block fill-slot="head_epilogue">
+  <style type="text/css">
+    .subordinate {
+      margin: 0.5em 0 0.5em 4em;
+    }
+  </style>
+</metal:block>
+
+<div metal:fill-slot="main">
+
+  <div metal:use-macro="context/@@launchpad_form/form">
+
+    <metal:formbody fill-slot="widgets">
+
+      <table class="form">
+
+        <tr>
+          <td>
+            <label tal:replace="structure view/branch_type_link">
+              Link to a Bazaar branch already in Launchpad
+            </label>
+            <table class="subordinate">
+              <tal:widget define="widget nocall:view/widgets/branch_location">
+                <metal:block use-macro="context/@@launchpad_form/widget_row" />
+              </tal:widget>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td>
+            <label tal:replace="structure view/branch_type_create">
+              Create a new, empty branch in Launchpad and link
+              to this series
+            </label>
+          </td>
+        </tr>
+
+        <tr>
+          <td>
+            <label tal:replace="structure view/branch_type_import">
+              Import a branch hosted somewhere else
+            </label>
+            <table class="subordinate">
+              <tal:widget define="widget nocall:view/widgets/repo_url">
+                <metal:block use-macro="context/@@launchpad_form/widget_row" />
+              </tal:widget>
+
+              <tr>
+                <td>
+                  <label tal:replace="structure view/rcs_type_bzr">
+                    Bazaar, hosted externally
+                  </label>
+                </td>
+              </tr>
+
+              <tr>
+                <td>
+                  <label tal:replace="structure view/rcs_type_git">
+                    Git
+                  </label>
+                </td>
+              </tr>
+
+              <tr>
+                <td>
+                  <label tal:replace="structure view/rcs_type_svn">
+                    SVN
+                  </label>
+                </td>
+              </tr>
+
+              <tr>
+                <td>
+                  <label tal:replace="structure view/rcs_type_hg">
+                    Mercurial
+                  </label>
+                </td>
+              </tr>
+
+              <tr>
+                <td>
+                  <label tal:replace="structure view/rcs_type_cvs">
+                    CVS
+                  </label>
+                  <table class="subordinate">
+                  <tal:widget define="widget nocall:view/widgets/cvs_module">
+                    <metal:block use-macro="context/@@launchpad_form/widget_row" />
+                  </tal:widget>
+                  </table>
+                </td>
+              </tr>
+
+            </table>
+          </td>
+        </tr>
+
+        <tal:widget define="widget nocall:view/widgets/branch_name">
+          <metal:block use-macro="context/@@launchpad_form/widget_row" />
+        </tal:widget>
+        <tal:widget define="widget nocall:view/widgets/branch_owner">
+          <metal:block use-macro="context/@@launchpad_form/widget_row" />
+        </tal:widget>
+
+      </table>
+      <input tal:replace="structure view/rcs_type_emptymarker" />
+
+    </metal:formbody>
+  </div>
+
+  <script type="text/javascript">
+    YUI().use('lp.code.productseries_setbranch', function(Y) {
+      Y.on('domready', Y.lp.code.productseries_setbranch.setup);
+    });
+  </script>
+
+</div>
+</body>
+</html>
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-04-05 17:40:35 +0000
+++ lib/lp/testing/factory.py	2010-04-07 13:24:38 +0000
@@ -149,8 +149,8 @@
 
 DIFF = """\
 === zbqvsvrq svyr 'yvo/yc/pbqr/vagresnprf/qvss.cl'
---- yvo/yc/pbqr/vagresnprf/qvss.cl	2009-10-01 13:25:12 +0000
-+++ yvo/yc/pbqr/vagresnprf/qvss.cl	2010-02-02 15:48:56 +0000
+--- yvo/yc/pbqr/vagresnprf/qvss.cl      2009-10-01 13:25:12 +0000
++++ yvo/yc/pbqr/vagresnprf/qvss.cl      2010-02-02 15:48:56 +0000
 @@ -121,6 +121,10 @@
                  'Gur pbasyvpgf grkg qrfpevovat nal cngu be grkg pbasyvpgf.'),
               ernqbayl=Gehr))
@@ -635,7 +635,7 @@
     def makeProcessorFamily(self, name, title=None, description=None,
                             restricted=False):
         """Create a new processor family.
-        
+
         :param name: Name of the family (e.g. x86)
         :param title: Optional title of the family
         :param description: Optional extended description
@@ -1568,7 +1568,7 @@
 
         :param branch: If supplied, the branch to set as
             ProductSeries.branch.
-        :param product: If supplied, the name of the series.
+        :param name: If supplied, the name of the series.
         :param product: If supplied, the series is created for this product.
             Otherwise, a new product is created.
         """