Merge lp:~edwin-grubbs/launchpad/bug-602385-register-project-from-sourcepackage-page into lp:launchpad

[Edwin Grubbs]

Summary
-------

This branch makes it easy to register an upstream project from a source
package by prefilling the project registration form with data from the
source package.

Implementation details
----------------------

Added link to $sourcepackage/+edit-packaging and radio button to
$sourcepackage/+index
    lib/lp/registry/browser/sourcepackage.py
    lib/lp/registry/templates/sourcepackage-edit-packaging.pt
    lib/lp/registry/browser/product.py
    lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt

The makeBinaryPackagePublishingHistory() method had a
binarypackagerelease argument, but it completed ignored it.
    lib/lp/testing/factory.py

When +edit-packaging became a MultiStepView, some of the tests
quit exercising the view completely, since no errors were expected, and
the view had just stopped doing anything. I added a check inside the
MultiStepView to help prevent this from happening.
    lib/lp/registry/browser/tests/sourcepackage-views.txt
    lib/canonical/launchpad/webapp/launchpadform.py
    lib/canonical/launchpad/browser/multistep.py

Drive-by lint fixes.
    lib/lp/registry/model/sourcepackage.py

Tests
-----

./bin/test -vv -t '/sourcepackage-views.txt|xx-sourcepackage-packaging.txt'

Demo and Q/A
------------

The summary field is not always populated, since the
only info a source package has is the summaries from its binary
packages that might not exist yet.

* Open http://launchpad.dev/ubuntu/warty/+source/foobar
  * Select "Register the upstream project" radio button.
  * Click the "Link to Upstream Project" button.
  * The form should be prefilled.
  * Enter the license.
  * Submit the form.
  * You should now be redirected to the source package page.

* Open http://launchpad.dev/ubuntu/warty/+source/pmount/+edit-packaging
  * Click the "Register the upstream project" link.
  * The form should be prefilled.
  * Enter the license.
  * Submit the form.
  * You should now be redirected to the +edit-packaging page.

[Jelmer Vernooij (jelmer)]

It would be nice to have some tests for get_register_upstream_url() - making sure dashes are converted properly, etc.

get_register_upstream_url() handles the case of source_package.summary being None - when does that situation occur?

Since it's likely that the user doesn't want to create a project for their own page this way, it might be a good idea to enable the "I do not want to maintain this project" checkbox when registering a project this way.

[Jelmer Vernooij (jelmer)]

The summary seems to be "<packagename>: summary" now, should the packagename perhaps be stripped out ?

It would also be nice to fill in the description field from the multi-line Debian description, or perhaps that is something that can be addressed later.

[Jelmer Vernooij (jelmer)]

review: Needs Information (code)

[Edwin Grubbs (edwin-grubbs)]

Hi Jelmer,

Thanks for the review.

> It would be nice to have some tests for get_register_upstream_url() - making
> sure dashes are converted properly, etc.

The method uses urllib.urlencode(), which is reliable at encoding url parameters. I can add a unit test for that if you still want one, but we generally haven't tested that.

> get_register_upstream_url() handles the case of source_package.summary being
> None - when does that situation occur?

The SourcePackage.summary is actually assembled by getting a list of the binary packages for the DistributionSourcePackageReleases. If there are no releases, the summary is None.

> Since it's likely that the user doesn't want to create a project for their own
> page this way, it might be a good idea to enable the "I do not want to
> maintain this project" checkbox when registering a project this way.

This was commented on in bug 602385, and we thought that the user should make the decision not to own a project explicitly.

> The summary seems to be "<packagename>: summary" now, should the packagename
> perhaps be stripped out ?

The summary is definitely the part that I'm least happy about. The source package may or may not have any summary info depending on whether it has binary packages. If there are multiple binary packages, it will be even uglier, looking like this:
  <packagename>: summary
  <packagename>: summary2

Do you think I could stop populating the summary this way and just make the user enter it?

> It would also be nice to fill in the description field from the multi-line
> Debian description, or perhaps that is something that can be addressed later.

I think this would have to be done in a follow up branch. As bug 602385 indicates, it's also desired to automatically connect the source package to the new project instead of just redirecting back to the source package. Do you think the Debian description or some other field would be good for filling in the summary field also?

[Jelmer Vernooij (jelmer)]

On Thu, 2010-08-05 at 18:04 +0000, Edwin Grubbs wrote:
> Thanks for the review.
>
> > It would be nice to have some tests for get_register_upstream_url() - making
> > sure dashes are converted properly, etc.

> The method uses urllib.urlencode(), which is reliable at encoding url parameters. I can add a unit test for that if you still want one, but we generally haven't tested that.
I'm not concerned about the URL encoding, but about e.g. replacing
dashes in the source package name with spaces in the project title (as
is done on the first line of get_register_upstream_url), especially
since this function might get more complex in the future as more fields
are pre-filled-in.

> > Since it's likely that the user doesn't want to create a project for their own
> > page this way, it might be a good idea to enable the "I do not want to
> > maintain this project" checkbox when registering a project this way.
> This was commented on in bug 602385, and we thought that the user should make the decision not to own a project explicitly.
Fair enough.

> > The summary seems to be "<packagename>: summary" now, should the packagename
> > perhaps be stripped out ?
> The summary is definitely the part that I'm least happy about. The source package may or may not have any summary info depending on whether it has binary packages. If there are multiple binary packages, it will be even uglier, looking like this:
> <packagename>: summary
> <packagename>: summary2
> Do you think I could stop populating the summary this way and just make the user enter it?
I hadn't considered that we are basing the new project on a source
package and not on a binary package. As an optimization, I think it
would still be nice to strip out the "packagename:" bit if there is only
a single binary package for the source package, but I don't see a good
alternative in the other situation.

Certainly, having this field pre-filled-in, even when there are multiple
binary packages, is better than having an empty field imho.

> > It would also be nice to fill in the description field from the
> multi-line > Debian description, or perhaps that is something that can
> be addressed later. I think this would have to be done in a follow up
> branch. As bug 602385 indicates, it's also desired to automatically
> connect the source package to the new project instead of just
> redirecting back to the source package. Do you think the Debian
> description or some other field would be good for filling in the
> summary field also?
Using the Debian description to fill in the description field would also
be useful, but the same problem as above applies here as well
unfortunately as there can be multiple binary packages, each with their
own description.

Thanks for following up, nice work.

  review approve

Cheers,

Jelmer

review: Approve

[Edwin Grubbs (edwin-grubbs)]

> On Thu, 2010-08-05 at 18:04 +0000, Edwin Grubbs wrote:
> > Thanks for the review.
> >
> > > It would be nice to have some tests for get_register_upstream_url() -
> making
> > > sure dashes are converted properly, etc.
>
> > The method uses urllib.urlencode(), which is reliable at encoding url
> parameters. I can add a unit test for that if you still want one, but we
> generally haven't tested that.
> I'm not concerned about the URL encoding, but about e.g. replacing
> dashes in the source package name with spaces in the project title (as
> is done on the first line of get_register_upstream_url), especially
> since this function might get more complex in the future as more fields
> are pre-filled-in.

I added tests for get_register_upstream_url().

> > > Since it's likely that the user doesn't want to create a project for their
> own
> > > page this way, it might be a good idea to enable the "I do not want to
> > > maintain this project" checkbox when registering a project this way.
> > This was commented on in bug 602385, and we thought that the user should
> make the decision not to own a project explicitly.
> Fair enough.
>
> > > The summary seems to be "<packagename>: summary" now, should the
> packagename
> > > perhaps be stripped out ?
> > The summary is definitely the part that I'm least happy about. The source
> package may or may not have any summary info depending on whether it has
> binary packages. If there are multiple binary packages, it will be even
> uglier, looking like this:
> > <packagename>: summary
> > <packagename>: summary2
> > Do you think I could stop populating the summary this way and just make the
> user enter it?
> I hadn't considered that we are basing the new project on a source
> package and not on a binary package. As an optimization, I think it
> would still be nice to strip out the "packagename:" bit if there is only
> a single binary package for the source package, but I don't see a good
> alternative in the other situation.
>
> Certainly, having this field pre-filled-in, even when there are multiple
> binary packages, is better than having an empty field imho.

I removed the parts before the colon. I also eliminated duplicates, since it would look really ugly to have a summary like the one from this sourcepackage.

https://edge.launchpad.net/ubuntu/lucid/+source/linux

I added tests for this also.

> > > It would also be nice to fill in the description field from the
> > multi-line > Debian description, or perhaps that is something that can
> > be addressed later. I think this would have to be done in a follow up
> > branch. As bug 602385 indicates, it's also desired to automatically
> > connect the source package to the new project instead of just
> > redirecting back to the source package. Do you think the Debian
> > description or some other field would be good for filling in the
> > summary field also?
> Using the Debian description to fill in the description field would also
> be useful, but the same problem as above applies here as well
> unfortunately as there can be multiple binary packages, each with their
> own description.

That would be nice. I'll look into it and open a bug ...

=== modified file 'lib/canonical/launchpad/browser/multistep.py'
--- lib/canonical/launchpad/browser/multistep.py	2010-05-12 19:06:17 +0000
+++ lib/canonical/launchpad/browser/multistep.py	2010-08-09 01:33:51 +0000
@@ -93,6 +93,14 @@
         view.total_steps = self.total_steps
         view.is_step = self.getIsStepDict()
         self.step_number += 1
+
+        action_required = None
+        for name in self.request.form.keys():
+            if name.startswith('field.actions.'):
+                action_required = (name, self.request.form[name])
+                break
+
+        action_taken = view.action_taken
         while view.next_step is not None:
             view = view.next_step(self.context, self.request)
             assert isinstance(view, StepView), 'Not a StepView: %s' % view
@@ -102,8 +110,19 @@
             view.is_step = self.getIsStepDict()
             self.step_number += 1
             view.injectStepNameInRequest()
+            if view.action_taken is not None:
+                action_taken = view.action_taken
+
         self.view = view
 
+        if action_required is not None and action_taken is None:
+            # This is mostly useful for catching tests that pass
+            # in invalid form data via a dictionary instead of
+            # using a test browser.
+            raise AssertionError(
+                'MultiStepView did not find action for %s=%r'
+                % action_required)
+
     def render(self):
         return self.view.render()
 
 
=== modified file 'lib/canonical/launchpad/webapp/launchpadform.py'
--- lib/canonical/launchpad/webapp/launchpadform.py	2010-06-23 23:07:10 +0000
+++ lib/canonical/launchpad/webapp/launchpadform.py	2010-08-09 01:33:51 +0000
@@ -74,6 +74,8 @@
 
     actions = ()
 
+    action_taken = None
+
     render_context = False
 
     form_result = None
@@ -112,6 +114,7 @@
             self.form_result = action.success(data)
             if self.next_url:
                 self.request.response.redirect(self.next_url)
+        self.action_taken = action
 
     def render(self):
         """Return the body of the response.
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-08-04 04:07:21 +0000
+++ lib/lp/registry/browser/product.py	2010-08-09 01:33:51 +0000
@@ -120,7 +120,7 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.launchpadform import (
     action, custom_widget, LaunchpadEditFormView, LaunchpadFormView,
-    ReturnToReferrerMixin)
+    ReturnToReferrerMixin, safe_action)
 from canonical.launchpad.webapp.menu import NavigationMenu
 from canonical.launchpad.webapp.tales import MenuAPI
 from canonical.widgets.popup import PersonPickerWidget
@@ -1850,6 +1850,16 @@
     search_results_count = 0
 
     @property
+    def _return_url(self):
+        """This view is using the hidden _return_url field.
+
+        It is not using the `ReturnToReferrerMixin`, since none
+        of its other code is used, because multistep views can't
+        have next_url set until the form submission succeeds.
+        """
+        return self.request.form.get('_return_url')
+
+    @property
     def _next_step(self):
         """Define the next step.
 
@@ -1866,6 +1876,10 @@
         self.request.form['name'] = data['name'].lower()
         self.request.form['summary'] = data['summary']
 
+    # Make this a safe_action, so that the sourcepackage page can skip
+    # the first step with a link (GET request) providing form values.
+    continue_action = safe_action(StepView.continue_action)
+
 
 class ProjectAddStepTwo(StepView, ProductLicenseMixin, ReturnToReferrerMixin):
     """Step 2 (of 2) in the +new project add wizard."""
@@ -1887,6 +1901,16 @@
     custom_widget('license_info', GhostWidget)
 
     @property
+    def _return_url(self):
+        """This view is using the hidden _return_url field.
+
+        It is not using the `ReturnToReferrerMixin`, since none
+        of its other code is used, because multistep views can't
+        have next_url set until the form submission succeeds.
+        """
+        return self.request.form.get('_return_url')
+
+    @property
     def step_description(self):
         """See `MultiStepView`."""
         if self.search_results_count > 0:
@@ -2001,7 +2025,10 @@
         self.product = self.create_product(data)
         self.notifyCommercialMailingList()
         notify(ObjectCreatedEvent(self.product))
-        self.next_url = canonical_url(self.product)
+        if self._return_url is None:
+            self.next_url = canonical_url(self.product)
+        else:
+            self.next_url = self._return_url
 
 
 class ProductAddView(MultiStepView):
@@ -2027,7 +2054,7 @@
 
     driver = copy_field(IProduct['driver'])
 
-    transfer_to_registry =  Bool(
+    transfer_to_registry = Bool(
         title=_("I do not want to maintain this project"),
         required=False,
         description=_(
 
=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2010-07-02 14:34:58 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2010-08-09 01:33:51 +0000
@@ -19,6 +19,8 @@
 
 from apt_pkg import ParseSrcDepends
 from cgi import escape
+import string
+import urllib
 from z3c.ptcompat import ViewPageTemplateFile
 from zope.app.form.browser import DropdownWidget
 from zope.app.form.interfaces import IInputWidget
@@ -35,12 +37,14 @@
 
 from canonical.launchpad import helpers
 from canonical.launchpad.browser.multistep import MultiStepView, StepView
+
 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
 from canonical.launchpad.browser.packagerelationship import (
     relationship_builder)
 from lp.answers.browser.questiontarget import (
     QuestionTargetFacetMixin, QuestionTargetAnswersMenu)
 from lp.services.worlddata.interfaces.country import ICountry
+from lp.registry.browser.product import ProjectAddStepOne
 from lp.registry.interfaces.packaging import IPackaging, IPackagingUtil
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.product import IProductSet
@@ -62,6 +66,30 @@
 from canonical.lazr.utils import smartquote
 
 
+def get_register_upstream_url(source_package, return_url):
+    displayname = string.capwords(source_package.name.replace('-', ' '))
+    params = {
+        '_return_url': return_url,
+        'field.name': source_package.name,
+        'field.displayname': displayname,
+        'field.title': displayname,
+        'field.__visited_steps__': ProjectAddStepOne.step_name,
+        'field.actions.continue': 'Continue',
+        }
+    if len(source_package.releases) == 0:
+        params['field.summary'] = ''
+    else:
+        # This is based on the SourcePackageName.summary attribute, but
+        # it eliminates the binary.name and duplicate summary lines.
+        summary_set = set()
+        for binary in source_package.releases[0].sample_binary_packages:
+            summary_set.add(binary.summary)
+        params['field.summary'] = '\n'.join(sorted(summary_set))
+    query_string = urllib.urlencode(
+        sorted(params.items()), doseq=True)
+    return '/projects/+new?%s' % query_string
+
+
 class SourcePackageNavigation(GetitemNavigation, BugTargetTraversalMixin):
 
     usedfor = ISourcePackage
@@ -190,6 +218,11 @@
         self.next_step = SourcePackageChangeUpstreamStepTwo
         self.request.form['product'] = data['product']
 
+    @property
+    def register_upstream_url(self):
+        return get_register_upstream_url(
+            self.context, return_url=self.request.getURL())
+
 
 class SourcePackageChangeUpstreamStepTwo(ReturnToReferrerMixin, StepView):
     """A view to set the `IProductSeries` of a sourcepackage."""
@@ -345,7 +378,7 @@
     def processForm(self):
         # look for an update to any of the things we track
         form = self.request.form
-        if form.has_key('packaging'):
+        if 'packaging' in form:
             if self.productseries_widget.hasValidInput():
                 new_ps = self.productseries_widget.getInputValue()
                 # we need to create or update the packaging
@@ -445,6 +478,7 @@
     initial_focus_widget = None
     max_suggestions = 9
     other_upstream = object()
+    register_upstream = object()
 
     def setUpFields(self):
         """See `LaunchpadFormView`."""
@@ -467,9 +501,12 @@
             vocab_terms.append(SimpleTerm(product, product.name, description))
         # Add an option to represent the user's decision to choose a
         # different project. Note that project names cannot be uppercase.
-        description = 'Choose another upstream project'
-        vocab_terms.append(
-            SimpleTerm(self.other_upstream, 'OTHER_UPSTREAM', description))
+        vocab_terms.append(
+            SimpleTerm(self.other_upstream, 'OTHER_UPSTREAM',
+                       'Choose another upstream project'))
+        vocab_terms.append(
+            SimpleTerm(self.register_upstream, 'REGISTER_UPSTREAM',
+                       'Register the upstream project'))
         upstream_vocabulary = SimpleVocabulary(vocab_terms)
 
         self.form_fields = Fields(
@@ -487,6 +524,12 @@
             self.next_url = canonical_url(
                 self.context, view_name="+edit-packaging")
             return
+        elif upstream is self.register_upstream:
+            # The user wants to create a new project.
+            url = get_register_upstream_url(
+                self.context, return_url=self.request.getURL())
+            self.request.response.redirect(url)
+            return
         self.context.setPackaging(upstream.development_focus, self.user)
         self.request.response.addInfoNotification(
             'The project %s was linked to this source package.' %
 
=== modified file 'lib/lp/registry/browser/tests/sourcepackage-views.txt'
--- lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-05-13 18:55:10 +0000
+++ lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-08-09 01:33:51 +0000
@@ -119,6 +119,7 @@
 empty.
 
     >>> form = {
+    ...     'field.__visited_steps__': 'sourcepackage_change_upstream_step1',
     ...     'field.product': '',
     ...     'field.actions.continue': 'Continue',
     ...     }
@@ -133,12 +134,18 @@
 but there is no notification message that the upstream link was updated.
 
     >>> form = {
-    ...     'field.productseries': 'bonkers/crazy',
-    ...     'field.actions.change': 'Change',
+    ...     'field.__visited_steps__': 'sourcepackage_change_upstream_step2',
+    ...     'field.product': 'bonkers',
+    ...     'field.productseries': 'crazy',
+    ...     'field.actions.continue': 'Continue',
     ...     }
     >>> view = create_initialized_view(
     ...     package, name='+edit-packaging', form=form,
     ...     principal=product.owner)
+    >>> print view.view
+    <...SourcePackageChangeUpstreamStepTwo object...>
+    >>> print view.view.next_url
+    http://launchpad.dev/youbuntu/busy/+source/bonkers
     >>> view.view.errors
     []
 
@@ -199,6 +206,7 @@
     Registered upstream project:
     Lernid
     Choose another upstream project
+    Register the upstream project
 
 The form does not steal focus because it is not the primary purpose of the
 page.
@@ -229,6 +237,7 @@
     Lernid...
     Lernid Dev...
     Choose another upstream project
+    Register the upstream project
 
 Choosing the "Choose another upstream project" option redirects the user
 to the +edit-packaging page where the user can search for a project.
@@ -259,7 +268,8 @@
     ...     name='stinkyseries', product=product)
     >>> distroseries = factory.makeDistroRelease(name='wonky',
     ...     distribution=distribution)
-    >>> sourcepackagename = factory.makeSourcePackageName(name='stinkypackage')
+    >>> sourcepackagename = factory.makeSourcePackageName(
+    ...     name='stinkypackage')
     >>> package = factory.makeSourcePackage(
     ...     sourcepackagename=sourcepackagename, distroseries=distroseries)
 
@@ -360,3 +370,4 @@
     match for this source package. Can you help us find one?
     Registered upstream project:
     Choose another upstream project
+    Register the upstream project
 
=== added file 'lib/lp/registry/browser/tests/test_sourcepackage_views.py'
--- lib/lp/registry/browser/tests/test_sourcepackage_views.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/test_sourcepackage_views.py	2010-08-09 01:33:51 +0000
@@ -0,0 +1,114 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for SourcePackage view code."""
+
+__metaclass__ = type
+
+import cgi
+import urllib
+
+from zope.component import getUtility
+
+from canonical.testing import DatabaseFunctionalLayer
+
+from lp.registry.browser.sourcepackage import get_register_upstream_url
+from lp.registry.interfaces.distroseries import IDistroSeriesSet
+from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
+from lp.testing import TestCaseWithFactory
+
+
+class TestSourcePackageViewHelpers(TestCaseWithFactory):
+    """Tests for SourcePackage view helper functions."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_get_register_upstream_url_displayname(self):
+        source_package = self.factory.makeSourcePackage(
+            sourcepackagename='python-super-package')
+        return_url = 'http://example.com/foo?a=b&c=d'
+        url = get_register_upstream_url(source_package, return_url)
+        expected_url = (
+            '/projects/+new?'
+            '_return_url='
+            'http%3A%2F%2Fexample.com%2Ffoo%3Fa%3Db%26c%3Dd'
+            '&field.__visited_steps__=projectaddstep1'
+            '&field.actions.continue=Continue'
+            # The sourcepackagename 'python-super-package' is split on
+            # the hyphens, and each word is capitalized.
+            '&field.displayname=Python+Super+Package'
+            '&field.name=python-super-package'
+            # The summary is empty, since the source package doesn't
+            # have a binary package release.
+            '&field.summary='
+            '&field.title=Python+Super+Package')
+        self.assertEqual(expected_url, url)
+
+    def test_get_register_upstream_url_summary(self):
+        test_publisher = SoyuzTestPublisher()
+        test_data = test_publisher.makeSourcePackageWithBinaryPackageRelease()
+        source_package_name = (
+            test_data['source_package'].sourcepackagename.name)
+        distroseries_id = test_data['distroseries'].id
+        test_publisher.updateDistroSeriesPackageCache(
+            test_data['distroseries'])
+
+        # updateDistroSeriesPackageCache reconnects the db, so the
+        # objects need to be reloaded.
+        distroseries = getUtility(IDistroSeriesSet).get(distroseries_id)
+        source_package = distroseries.getSourcePackage(source_package_name)
+        return_url = 'http://example.com/foo?a=b&c=d'
+        url = get_register_upstream_url(source_package, return_url)
+        expected_base = '/projects/+new'
+        expected_params = [
+            ('_return_url', 'http://example.com/foo?a=b&c=d'),
+            ('field.__visited_steps__', 'projectaddstep1'),
+            ('field.actions.continue', 'Continue'),
+            ('field.displayname', 'Bonkers'),
+            ('field.name', 'bonkers'),
+            ('field.summary', 'summary for flubber-bin\n'
+                              + 'summary for flubber-lib'),
+            ('field.title', 'Bonkers'),
+            ]
+        base, query = urllib.splitquery(url)
+        params = cgi.parse_qsl(query)
+        self.assertEqual((expected_base, expected_params),
+                         (base, params))
+
+    def test_get_register_upstream_url_summary_duplicates(self):
+
+        class FakeDistroSeriesBinaryPackage:
+            def __init__(self, summary):
+                self.summary = summary
+
+        class FakeDistributionSourcePackageRelease:
+            sample_binary_packages = [
+                FakeDistroSeriesBinaryPackage('summary for foo'),
+                FakeDistroSeriesBinaryPackage('summary for bar'),
+                FakeDistroSeriesBinaryPackage('summary for baz'),
+                FakeDistroSeriesBinaryPackage('summary for baz'),
+                ]
+
+        class FakeSourcePackage:
+            name = 'foo'
+            releases = [FakeDistributionSourcePackageRelease()]
+
+        source_package = FakeSourcePackage()
+        return_url = 'http://example.com/foo?a=b&c=d'
+        url = get_register_upstream_url(source_package, return_url)
+        expected_base = '/projects/+new'
+        expected_params = [
+            ('_return_url', 'http://example.com/foo?a=b&c=d'),
+            ('field.__visited_steps__', 'projectaddstep1'),
+            ('field.actions.continue', 'Continue'),
+            ('field.displayname', 'Foo'),
+            ('field.name', 'foo'),
+            ('field.summary', 'summary for bar\n'
+                              + 'summary for baz\n'
+                              + 'summary for foo'),
+            ('field.title', 'Foo'),
+            ]
+        base, query = urllib.splitquery(url)
+        params = cgi.parse_qsl(query)
+        self.assertEqual((expected_base, expected_params),
+                         (base, params))
 
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-08-02 21:38:00 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-08-09 01:33:51 +0000
@@ -39,7 +39,6 @@
 from lp.registry.model.packaging import Packaging
 from lp.translations.model.potemplate import (
     HasTranslationTemplatesMixin,
-    POTemplate,
     TranslationTemplatesCollection)
 from canonical.launchpad.interfaces.lpstorm import IStore
 from lp.soyuz.model.publishing import (
@@ -52,7 +51,6 @@
     SourcePackageRelease)
 from lp.translations.model.translationimportqueue import (
     HasTranslationImportsMixin)
-from canonical.launchpad.helpers import shortlist
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.packaging import PackagingType
 from lp.registry.interfaces.distribution import NoPartnerArchive
 
=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-05-18 17:05:29 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-08-09 01:33:51 +0000
@@ -1,4 +1,15 @@
-= Packaging =
+Packaging
+=========
+
+Create test data.
+
+    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
+    >>> test_publisher = SoyuzTestPublisher()
+    >>> login('[e-mail]')
+    >>> test_data = test_publisher.makeSourcePackageWithBinaryPackageRelease()
+    >>> test_publisher.updateDistroSeriesPackageCache(
+    ...     test_data['distroseries'])
+    >>> logout()
 
 No Privileges Person visit the distroseries upstream links page for Hoary
 and sees that pmount is not linked.
@@ -20,6 +31,7 @@
     match for this source package. Can you help us find one?
     Registered upstream project:
     Choose another upstream project
+    Register the upstream project
 
 No Privileges Person knows that the pmount package comes from the thunderbird
 project. He sets the upstream packaging link and sees that it is set.
@@ -58,3 +70,79 @@
     ...     user_browser.contents, 'packages_list'))
     The Hoary Hedgehog Release (active development) ...
       0.1-2  release (main) ... weeks ago
+
+Register a project from a source package
+----------------------------------------
+
+If an upstream project doesn't already exist in Launchpad, it can
+be registered with data from the source package prefilling the first
+step of the multistep form.
+
+    >>> user_browser.open(
+    ...     'http://launchpad.dev/youbuntu/busy/+source/bonkers')
+    >>> user_browser.getControl(
+    ...     'Register the upstream project').selected = True
+    >>> user_browser.getControl("Link to Upstream Project").click()
+    >>> print user_browser.url.replace('&', '\n&')
+    http://launchpad.dev/projects/+new?_return_url=http...%2Bindex
+    &field.__visited_steps__=projectaddstep1
+    &field.actions.continue=Continue
+    &field.displayname=Bonkers
+    &field.name=bonkers
+    &field.summary=summary+for+flubber-bin%0Asummary+for+flubber-lib
+    &field.title=Bonkers
+    >>> print user_browser.getControl(name='field.name').value
+    bonkers
+    >>> print user_browser.getControl(name='field.displayname').value
+    Bonkers
+    >>> print user_browser.getControl(name='field.title').value
+    Bonkers
+    >>> print user_browser.getControl(name='field.summary').value
+    summary for flubber-bin
+    summary for flubber-lib
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'step-title'))
+    Step 2 (of 2): Check for duplicate projects
+
+If the user selects "Choose another upstream project" and then finds out
+that the project doesn't exist, there is a also a link on the
++edit-packaging page to register the project.
+
+    >>> user_browser.open(
+    ...     'http://launchpad.dev/youbuntu/busy/+source/bonkers/')
+    >>> user_browser.getControl(
+    ...     'Choose another upstream project').selected = True
+    >>> user_browser.getControl("Link to Upstream Project").click()
+    >>> print user_browser.url
+    http://launchpad.dev/youbuntu/busy/+source/bonkers/+edit-packaging
+
+    >>> user_browser.getLink("Register the upstream project").click()
+    >>> print user_browser.url.replace('&', '\n&')
+    http://launchpad.dev/projects/+new?_return_url=http...%2Bedit-packaging
+    &field.__visited_steps__=projectaddstep1
+    &field.actions.continue=Continue
+    &field.displayname=Bonkers
+    &field.name=bonkers
+    &field.summary=summary+for+flubber-bin%0Asummary+for+flubber-lib
+    &field.title=Bonkers
+    >>> print user_browser.getControl(name='field.name').value
+    bonkers
+    >>> print user_browser.getControl(name='field.displayname').value
+    Bonkers
+    >>> print user_browser.getControl(name='field.title').value
+    Bonkers
+    >>> print user_browser.getControl(name='field.summary').value
+    summary for flubber-bin
+    summary for flubber-lib
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'step-title'))
+    Step 2 (of 2): Check for duplicate projects
+
+If there are no problems with the prefilled data, then the license
+just needs to be selected. The user will then be redirected back
+to the source package page so that it can be linked.
+
+    >>> user_browser.getControl(name='field.licenses').value = ['BSD']
+    >>> user_browser.getControl("Complete Registration").click()
+    >>> print user_browser.url
+    http://launchpad.dev/youbuntu/busy/+source/bonkers/+edit-packaging
 
=== modified file 'lib/lp/registry/templates/sourcepackage-edit-packaging.pt'
--- lib/lp/registry/templates/sourcepackage-edit-packaging.pt	2010-02-16 17:37:36 +0000
+++ lib/lp/registry/templates/sourcepackage-edit-packaging.pt	2010-08-09 01:33:51 +0000
@@ -27,6 +27,26 @@
       If you need a new series created, contact the owner of
       <a tal:content="structure view/product/fmt:link"/>.
     </div>
+
+    <div metal:fill-slot="buttons">
+      <input tal:repeat="action view/actions"
+             tal:replace="structure action/render"
+        />
+      &nbsp;or&nbsp;
+      <tal:comment condition="nothing">
+        This template is for a multistep view, and only the first
+        step provides the register_upstream_url.
+      </tal:comment>
+      <a id="register-upstream-link"
+         tal:condition="view/register_upstream_url | nothing"
+         tal:attributes="href view/register_upstream_url">
+        Register the upstream project
+      </a>
+      <tal:has-cancel-link condition="view/cancel_url">
+        &nbsp;or&nbsp;
+        <a tal:attributes="href view/cancel_url">Cancel</a>
+      </tal:has-cancel-link>
+    </div>
   </div>
 
 </div>
 
=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-08-05 17:11:43 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-08-09 01:33:51 +0000
@@ -10,6 +10,7 @@
 from StringIO import StringIO
 import tempfile
 
+import transaction
 import pytz
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
@@ -18,13 +19,16 @@
 from canonical.database.constants import UTC_NOW
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.launchpad.webapp.errorlog import ErrorReportingUtility
+from canonical.testing.layers import reconnect_stores
 from canonical.testing import (
     DatabaseFunctionalLayer, LaunchpadZopelessLayer)
+
 from lp.app.errors import NotFoundError
 from lp.archivepublisher.config import Config
 from lp.archivepublisher.diskpool import DiskPool
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
+from lp.registry.interfaces.distroseries import IDistroSeriesSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
@@ -460,6 +464,67 @@
 
         return source
 
+    def makeSourcePackageWithBinaryPackageRelease(self):
+        """Make test data for SourcePackage.summary.
+
+        The distroseries that is returned from this method needs to be
+        passed into updateDistroseriesPackageCache() so that
+        SourcePackage.summary can be populated.
+        """
+        distribution = self.factory.makeDistribution(
+            name='youbuntu', displayname='Youbuntu')
+        distroseries = self.factory.makeDistroRelease(name='busy',
+            distribution=distribution)
+        source_package_name = self.factory.makeSourcePackageName(
+            name='bonkers')
+        source_package = self.factory.makeSourcePackage(
+            sourcepackagename=source_package_name,
+            distroseries=distroseries)
+        component = self.factory.makeComponent('multiverse')
+        das = self.factory.makeDistroArchSeries(
+            distroseries=distroseries)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            sourcepackagename=source_package_name,
+            distroseries=distroseries,
+            component=component)
+
+        for name in ('flubber-bin', 'flubber-lib'):
+            binary_package_name = self.factory.makeBinaryPackageName(name)
+            build = self.factory.makeBinaryPackageBuild(
+                source_package_release=spph.sourcepackagerelease,
+                archive=self.factory.makeArchive(),
+                distroarchseries=das)
+            bpr = self.factory.makeBinaryPackageRelease(
+                binarypackagename=binary_package_name,
+                summary='summary for %s' % name,
+                build=build, component=component)
+            bpph = self.factory.makeBinaryPackagePublishingHistory(
+                binarypackagerelease=bpr, distroarchseries=das)
+        return dict(
+            distroseries=distroseries,
+            source_package=source_package)
+
+    def updateDistroSeriesPackageCache(
+        self, distroseries, restore_db_connection='launchpad'):
+        # XXX: EdwinGrubbs 2010-08-04 bug=396419. Currently there is no
+        # test api call to switchDbUser that works for non-zopeless layers.
+        # When bug 396419 is fixed, we can instead use
+        # DatabaseLayer.switchDbUser() instead of reconnect_stores()
+        transaction.commit()
+        reconnect_stores(config.statistician.dbuser)
+        distroseries = getUtility(IDistroSeriesSet).get(distroseries.id)
+
+        class TestLogger:
+            # Silent logger.
+            def debug(self, msg):
+                pass
+        distroseries.updateCompletePackageCache(
+            archive=distroseries.distribution.main_archive,
+            ztm=transaction,
+            log=TestLogger())
+        transaction.commit()
+        reconnect_stores(restore_db_connection)
+
 
 class TestNativePublishingBase(TestCaseWithFactory, SoyuzTestPublisher):
     layer = LaunchpadZopelessLayer