Merge lp:~jamalta/launchpad/destination-ppa-498643 into lp:launchpad

[Jamal Fanaian]

Changed the Destination PPA options to read 'PPA Name (username/ppa)' in copy packages page to help distinguish between similarly named PPAs.

[Jamal Fanaian (jamalta)]

= Summary =

Add PPA url to the Destination PPA widget when copying contents from a PPA, to make each option unique (bug 498643).

== Proposed fix ==

Appended the PPA url to each widget option:
  Name of PPA (user/ppaname)

== Pre-implementation notes ==

Following style suggestion by Jullian Edwards in the bug comments.

== Tests ==

% bin/test -vvct xx-copy-packages

== Demo and Q/A ==

Must login as user with an existing PPA (u: <email address hidden> p: test).

* https://launchpad.dev/~cprov/+archive/ppa/+copy-packages

== Launchpad lint ==

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/browser/archive.py
  lib/lp/soyuz/stories/ppa/xx-copy-packages.txt

[Brad Crittenden (bac)]

Hi Jamal,

Your fix looks good. In your diff at line 9, please change the line back to have a 4 space indentation. You can then bring the following line up as it will just be 77 characters.

Also you agreed to fix the import violation exposed by running your test. Thanks.

review: Approve (code)

[Jamal Fanaian (jamalta)]

Brad,

Thanks for the review. The suggested changes have been made, and the import violation was resolved.

[Brad Crittenden (bac)]

Running the full test suite on ec2 shows that lib/lp/soyuz/browser/tests/archive-views.txt must be updated too. Once that is done I will land the branch for you.

review: Needs Fixing (code)

[Brad Crittenden (bac)]

The tests now pass.

review: Approve (code)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-01-20 15:41:25 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-01-21 16:04:15 +0000
@@ -1171,7 +1171,7 @@
                 continue
             token = '%s/%s' % (ppa.owner.name, ppa.name)
             terms.append(
-                SimpleTerm(ppa, token, ppa.displayname))
+                SimpleTerm(ppa, token, '%s (%s)' % (ppa.displayname, token)))
 
         return form.Fields(
             Choice(__name__='destination_archive',

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-01-12 08:03:29 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-01-21 16:04:15 +0000
@@ -1218,7 +1218,7 @@
 
     >>> for item in archive_widget.vocabulary:
     ...     print item.title
-    PPA for Ubuntu Team
+    PPA for Ubuntu Team (ubuntu-team/ppa)
 
     >>> print archive_widget.getInputValue() == cprov.archive
     True
@@ -1268,8 +1268,8 @@
 
     >>> for item in archive_widget.vocabulary:
     ...     print item.title
-    PPA for Celso Providelo
-    PPA for No Privileges Person
+    PPA for Celso Providelo (cprov/ppa)
+    PPA for No Privileges Person (no-priv/ppa)
 
     >>> print archive_widget.getInputValue()
     Traceback (most recent call last):

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-01-15 23:28:53 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-01-21 16:04:15 +0000
@@ -202,7 +202,7 @@
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').displayOptions
-    ['PPA for James Blackwell']
+    ['PPA for James Blackwell (jblack/ppa)']
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').value
@@ -698,7 +698,7 @@
 
     >>> print jblack_browser.getControl(
     ...     'Destination PPA').displayOptions
-    ['PPA for James Blackwell', 'PPA for James Blackwell Friends']
+    ['PPA for James Blackwell (jblack/ppa)', 'PPA for James Blackwell Friends (jblack-friends/ppa)']
 
 James wants to populate the PPA for James Blackwell Friends, he
 selects that.