Merge lp:~thumper/launchpad/new-import-link-move into lp:launchpad

[Tim Penhey]

Make the new import link on the product series page got to a page that doesn't lose the product context.

Make the import hyperlink on the product series page go the the +new-import page for the project rather than the generic +code-imports/+new page.

Also add text mentioning mercurial imports.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-02-08 20:11:17 +0000
+++ lib/lp/registry/browser/productseries.py	2010-03-10 22:19:18 +0000
@@ -309,7 +309,7 @@
     @property
     def request_import_link(self):
         """A link to the page for requesting a new code import."""
-        return canonical_url(getUtility(ICodeImportSet), view_name='+new')
+        return canonical_url(self.context.product, view_name='+new-import')
 
     @property
     def user_branch_visible(self):

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-02-09 05:13:05 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-03-10 22:19:18 +0000
@@ -107,6 +107,11 @@
     >>> print view.latest_release_with_download_files.version
     0.9.2
 
+The view also provides a link to register a new code import.
+
+    >>> print view.request_import_link
+    http://launchpad.dev/firefox/+new-import
+
 
 Edit ProductSeries
 ------------------

=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2009-11-13 20:14:41 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2010-03-10 22:19:18 +0000
@@ -54,7 +54,7 @@
         </li>
 
         <li>
-          If the code is in git, CVS or Subversion you can
+          If the code is in Git, Mercurial, CVS or Subversion you can
           <a tal:attributes="href view/request_import_link">request that the branch be imported to Bazaar</a>.
         </li>
       </ul>