Merge lp:~bjornt/launchpad/bug-376990 into lp:launchpad

[Björn Tillenius]

[Björn Tillenius (bjornt)]

This branch makes canonical_url() produce browser URLs, even though the
current request is a web service request. We have some problems that API
URLs are used instead of browser URLs, for example in XHTML
presentations and when e-mail notifications are generated inside API
methods.

IMHO, canonical_url() should be split into two functions, but it's too
late to do that now. I'd like one function that always returns a browser
URL, and one that returns either a browser or web service URL, depending
on which request is currently used. That's basically how I made
canonical_url() work with this change. If no request is explicitly
passed to it, a browser URL is always returned. In the case where you
may want an API URL, you have to pass in the current request explicitly.
That's why I had to pass in the request to canonical_url() in the
/people/foo rediretor, since it's used in both the app and web service
servers. Basically all code that redirects objects to canonical_url()
will need to pass in the request explicitly. At the moment all tests
pass, but we might find a few bugs later. I don't expect this to be a
big deal, though.

In this branch I also made canonical_url.txt run in FunctionalLayer, so
that it runs a bit faster.

BTW, I'm not going to land this branch before someone with more web
service foo has commented on it, but I have discussed this approach with
them already.

=== modified file 'database/replication/initialize.py'
--- database/replication/initialize.py	2009-06-24 21:17:33 +0000
+++ database/replication/initialize.py	2009-07-19 04:41:14 +0000
@@ -144,9 +144,11 @@
             comment='Launchpad tables and sequences');
         """)
 
+    script.append(
+        "echo 'Adding %d tables to replication set @lpmain_set';"
+        % len(lpmain_tables))
     for table in sorted(lpmain_tables):
         script.append("""
-            echo 'Adding %(table)s to replication set @lpmain_set';
             set add table (
                 set id=@lpmain_set,
                 origin=@master_node,
@@ -156,9 +158,11 @@
         entry_id += 1
 
     entry_id = 200
+    script.append(
+        "echo 'Adding %d sequences to replication set @lpmain_set';"
+        % len(lpmain_sequences))
     for sequence in sorted(lpmain_sequences):
         script.append("""
-            echo 'Adding %(sequence)s to replication set @lpmain_set';
             set add sequence (
                 set id=@lpmain_set,
                 origin=@master_node,

=== modified file 'database/replication/report.py'
--- database/replication/report.py	2009-06-24 21:17:33 +0000
+++ database/replication/report.py	2009-07-19 04:41:14 +0000
@@ -39,7 +39,7 @@
             self.labels = labels[:]
         self.rows = []
 
-    
+
 class HtmlReport:
 
     def alert(self, text):
@@ -157,10 +157,11 @@
 
     cur.execute("""
         SELECT li_receiver, li_origin, li_provider
-        FROM sl_listen ORDER BY li_receiver
+        FROM sl_listen
+        ORDER BY li_receiver, li_origin, li_provider
         """)
     for row in cur.fetchall():
-        table.rows.append('Node %s' % node for node in row)
+        table.rows.append(['Node %s' % node for node in row])
     return report.table(table)
 
 

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2009-07-17 00:26:05 +0000
+++ database/sampledata/current-dev.sql	2009-07-19 04:41:14 +0000
@@ -4756,7 +4756,8 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243626, 'Commercial Subscription Approvers', 243623, NULL, 'commercial-approvers', NULL, NULL, NULL, NULL, 1, NULL, '2008-06-27 14:49:38.676264', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243627, 'Ubuntu-branches-owner', NULL, NULL, 'ubuntu-branches-owner', NULL, NULL, NULL, NULL, 1, NULL, '2009-03-17 07:28:15.948042', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 1, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, 243625);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243628, 'Ubuntu branches', 243627, 'Celebrity team that controls Ubuntu source package branches.', 'ubuntu-branches', NULL, NULL, NULL, NULL, 3, NULL, '2009-03-17 07:29:13.259033', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
-INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'Ubuntu Security Team', 4, NULL, 'ubuntu-security', NULL, NULL, NULL, NULL, 2, NULL, '2009-07-14 20:23:59.698654', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243630, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 
 
 ALTER TABLE person ENABLE TRIGGER ALL;
@@ -9142,23 +9143,24 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (81, 16, 243620, 2, '2008-05-14 12:07:14.22745', NULL, NULL, NULL, 16, NULL, 16, '2008-05-14 12:07:14.22745', NULL, NULL, '2008-05-14 12:07:14.22745', NULL, NULL, NULL, '2008-05-14 12:07:14.140921');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (83, 243622, 243621, 3, '2008-05-12 17:40:08.720578', NULL, NULL, NULL, 16, NULL, 16, '2008-05-12 17:40:08.720578', NULL, NULL, '2008-05-12 17:40:08.720578', NULL, NULL, NULL, '2008-05-12 17:40:08.637114');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (85, 243627, 243628, 3, '2009-03-17 07:29:13.30381', NULL, NULL, NULL, 243627, NULL, 243627, '2009-03-17 07:29:13.30381', NULL, NULL, '2009-03-17 07:29:13.30381', NULL, NULL, NULL, '2009-03-17 07:29:13.259033');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (86, 1, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (87, 12, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (88, 16, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (89, 22, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (90, 23, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (91, 26, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (92, 27, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (93, 28, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (94, 29, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (95, 38, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (96, 63, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (97, 70, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (98, 243610, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (99, 243611, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (100, 243617, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (101, 243622, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243623, 243629, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (86, 4, 243629, 3, '2009-07-14 20:23:59.769346', NULL, NULL, NULL, 4, NULL, 4, '2009-07-14 20:23:59.769346', NULL, NULL, '2009-07-14 20:23:59.769346', NULL, NULL, NULL, '2009-07-14 20:23:59.698654');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (87, 1, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (88, 12, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (89, 16, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (90, 22, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (91, 23, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (92, 26, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (93, 27, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (94, 28, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (95, 29, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (96, 38, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (97, 63, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (98, 70, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (99, 243610, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (100, 243611, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (101, 243617, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243622, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (103, 243623, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
 
 
 ALTER TABLE teammembership ENABLE TRIGGER ALL;
@@ -9342,23 +9344,25 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (195, 243628, 243628);
 INSERT INTO teamparticipation (id, team, person) VALUES (196, 243628, 243627);
 INSERT INTO teamparticipation (id, team, person) VALUES (197, 243629, 243629);
-INSERT INTO teamparticipation (id, team, person) VALUES (198, 243629, 1);
-INSERT INTO teamparticipation (id, team, person) VALUES (199, 243629, 12);
-INSERT INTO teamparticipation (id, team, person) VALUES (200, 243629, 16);
-INSERT INTO teamparticipation (id, team, person) VALUES (201, 243629, 22);
-INSERT INTO teamparticipation (id, team, person) VALUES (202, 243629, 23);
-INSERT INTO teamparticipation (id, team, person) VALUES (203, 243629, 26);
-INSERT INTO teamparticipation (id, team, person) VALUES (204, 243629, 27);
-INSERT INTO teamparticipation (id, team, person) VALUES (205, 243629, 28);
-INSERT INTO teamparticipation (id, team, person) VALUES (206, 243629, 29);
-INSERT INTO teamparticipation (id, team, person) VALUES (207, 243629, 38);
-INSERT INTO teamparticipation (id, team, person) VALUES (208, 243629, 63);
-INSERT INTO teamparticipation (id, team, person) VALUES (209, 243629, 70);
-INSERT INTO teamparticipation (id, team, person) VALUES (210, 243629, 243610);
-INSERT INTO teamparticipation (id, team, person) VALUES (211, 243629, 243611);
-INSERT INTO teamparticipation (id, team, person) VALUES (212, 243629, 243617);
-INSERT INTO teamparticipation (id, team, person) VALUES (213, 243629, 243622);
-INSERT INTO teamparticipation (id, team, person) VALUES (214, 243629, 243623);
+INSERT INTO teamparticipation (id, team, person) VALUES (198, 243629, 4);
+INSERT INTO teamparticipation (id, team, person) VALUES (199, 243630, 243630);
+INSERT INTO teamparticipation (id, team, person) VALUES (200, 243630, 1);
+INSERT INTO teamparticipation (id, team, person) VALUES (201, 243630, 12);
+INSERT INTO teamparticipation (id, team, person) VALUES (202, 243630, 16);
+INSERT INTO teamparticipation (id, team, person) VALUES (203, 243630, 22);
+INSERT INTO teamparticipation (id, team, person) VALUES (204, 243630, 23);
+INSERT INTO teamparticipation (id, team, person) VALUES (205, 243630, 26);
+INSERT INTO teamparticipation (id, team, person) VALUES (206, 243630, 27);
+INSERT INTO teamparticipation (id, team, person) VALUES (207, 243630, 28);
+INSERT INTO teamparticipation (id, team, person) VALUES (208, 243630, 29);
+INSERT INTO teamparticipation (id, team, person) VALUES (209, 243630, 38);
+INSERT INTO teamparticipation (id, team, person) VALUES (210, 243630, 63);
+INSERT INTO teamparticipation (id, team, person) VALUES (211, 243630, 70);
+INSERT INTO teamparticipation (id, team, person) VALUES (212, 243630, 243610);
+INSERT INTO teamparticipation (id, team, person) VALUES (213, 243630, 243611);
+INSERT INTO teamparticipation (id, team, person) VALUES (214, 243630, 243617);
+INSERT INTO teamparticipation (id, team, person) VALUES (215, 243630, 243622);
+INSERT INTO teamparticipation (id, team, person) VALUES (216, 243630, 243623);
 
 
 ALTER TABLE teamparticipation ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2009-07-17 00:26:05 +0000
+++ database/sampledata/current.sql	2009-07-19 04:41:14 +0000
@@ -4754,7 +4754,8 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243626, 'Launchpad Users', 12, NULL, 'launchpad-users', NULL, NULL, NULL, NULL, 2, NULL, '2008-11-26 18:19:53.547918', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243627, 'Ubuntu-branches-owner', NULL, NULL, 'ubuntu-branches-owner', NULL, NULL, NULL, NULL, 1, NULL, '2009-03-17 07:26:14.024613', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 1, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, 2436242);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243628, 'Ubuntu branches', 243627, 'Celebrity team that controls official source package branches.', 'ubuntu-branches', NULL, NULL, NULL, NULL, 3, NULL, '2009-03-17 07:27:39.306182', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
-INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'Ubuntu Security Team', 4, NULL, 'ubuntu-security', NULL, NULL, NULL, NULL, 2, NULL, '2009-07-14 20:23:59.698654', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243630, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 
 
 ALTER TABLE person ENABLE TRIGGER ALL;
@@ -9139,23 +9140,24 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (84, 243623, 243624, 3, '2008-06-27 14:49:38.698594', NULL, NULL, NULL, 243623, NULL, 243623, '2008-06-27 14:49:38.698594', NULL, NULL, '2008-06-27 14:49:38.698594', NULL, NULL, NULL, '2008-06-27 14:49:38.676264');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (85, 12, 243626, 3, '2008-11-26 18:19:53.849673', NULL, NULL, NULL, 12, NULL, 12, '2008-11-26 18:19:53.849673', NULL, NULL, '2008-11-26 18:19:53.849673', NULL, NULL, NULL, '2008-11-26 18:19:53.547918');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (86, 243627, 243628, 3, '2009-03-17 07:27:39.361471', NULL, NULL, NULL, 243627, NULL, 243627, '2009-03-17 07:27:39.361471', NULL, NULL, '2009-03-17 07:27:39.361471', NULL, NULL, NULL, '2009-03-17 07:27:39.306182');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (87, 1, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (88, 12, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (89, 16, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (90, 22, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (91, 23, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (92, 26, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (93, 27, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (94, 28, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (95, 29, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (96, 38, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (97, 63, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (98, 70, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (99, 243610, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (100, 243611, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (101, 243617, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243622, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (103, 243623, 243629, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (87, 4, 243629, 3, '2009-07-14 20:23:59.769346', NULL, NULL, NULL, 4, NULL, 4, '2009-07-14 20:23:59.769346', NULL, NULL, '2009-07-14 20:23:59.769346', NULL, NULL, NULL, '2009-07-14 20:23:59.698654');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (88, 1, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (89, 12, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (90, 16, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (91, 22, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (92, 23, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (93, 26, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (94, 27, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (95, 28, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (96, 29, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (97, 38, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (98, 63, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (99, 70, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (100, 243610, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (101, 243611, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243617, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (103, 243622, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (104, 243623, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
 
 
 ALTER TABLE teammembership ENABLE TRIGGER ALL;
@@ -9344,23 +9346,25 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (198, 243628, 243628);
 INSERT INTO teamparticipation (id, team, person) VALUES (199, 243628, 243627);
 INSERT INTO teamparticipation (id, team, person) VALUES (200, 243629, 243629);
-INSERT INTO teamparticipation (id, team, person) VALUES (201, 243629, 1);
-INSERT INTO teamparticipation (id, team, person) VALUES (202, 243629, 12);
-INSERT INTO teamparticipation (id, team, person) VALUES (203, 243629, 16);
-INSERT INTO teamparticipation (id, team, person) VALUES (204, 243629, 22);
-INSERT INTO teamparticipation (id, team, person) VALUES (205, 243629, 23);
-INSERT INTO teamparticipation (id, team, person) VALUES (206, 243629, 26);
-INSERT INTO teamparticipation (id, team, person) VALUES (207, 243629, 27);
-INSERT INTO teamparticipation (id, team, person) VALUES (208, 243629, 28);
-INSERT INTO teamparticipation (id, team, person) VALUES (209, 243629, 29);
-INSERT INTO teamparticipation (id, team, person) VALUES (210, 243629, 38);
-INSERT INTO teamparticipation (id, team, person) VALUES (211, 243629, 63);
-INSERT INTO teamparticipation (id, team, person) VALUES (212, 243629, 70);
-INSERT INTO teamparticipation (id, team, person) VALUES (213, 243629, 243610);
-INSERT INTO teamparticipation (id, team, person) VALUES (214, 243629, 243611);
-INSERT INTO teamparticipation (id, team, person) VALUES (215, 243629, 243617);
-INSERT INTO teamparticipation (id, team, person) VALUES (216, 243629, 243622);
-INSERT INTO teamparticipation (id, team, person) VALUES (217, 243629, 243623);
+INSERT INTO teamparticipation (id, team, person) VALUES (201, 243629, 4);
+INSERT INTO teamparticipation (id, team, person) VALUES (202, 243630, 243630);
+INSERT INTO teamparticipation (id, team, person) VALUES (203, 243630, 1);
+INSERT INTO teamparticipation (id, team, person) VALUES (204, 243630, 12);
+INSERT INTO teamparticipation (id, team, person) VALUES (205, 243630, 16);
+INSERT INTO teamparticipation (id, team, person) VALUES (206, 243630, 22);
+INSERT INTO teamparticipation (id, team, person) VALUES (207, 243630, 23);
+INSERT INTO teamparticipation (id, team, person) VALUES (208, 243630, 26);
+INSERT INTO teamparticipation (id, team, person) VALUES (209, 243630, 27);
+INSERT INTO teamparticipation (id, team, person) VALUES (210, 243630, 28);
+INSERT INTO teamparticipation (id, team, person) VALUES (211, 243630, 29);
+INSERT INTO teamparticipation (id, team, person) VALUES (212, 243630, 38);
+INSERT INTO teamparticipation (id, team, person) VALUES (213, 243630, 63);
+INSERT INTO teamparticipation (id, team, person) VALUES (214, 243630, 70);
+INSERT INTO teamparticipation (id, team, person) VALUES (215, 243630, 243610);
+INSERT INTO teamparticipation (id, team, person) VALUES (216, 243630, 243611);
+INSERT INTO teamparticipation (id, team, person) VALUES (217, 243630, 243617);
+INSERT INTO teamparticipation (id, team, person) VALUES (218, 243630, 243622);
+INSERT INTO teamparticipation (id, team, person) VALUES (219, 243630, 243623);
 
 
 ALTER TABLE teamparticipation ENABLE TRIGGER ALL;

=== added file 'database/schema/patch-2109-55-2.sql'
--- database/schema/patch-2109-55-2.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2109-55-2.sql	2009-06-30 06:33:22 +0000
@@ -0,0 +1,9 @@
+SET client_min_messages=ERROR;
+
+CREATE INDEX revisionauthor__lower_email__idx ON RevisionAuthor(lower(email));
+CREATE INDEX HWSubmission__lower_raw_emailaddress__idx
+    ON HWSubmission(lower(raw_emailaddress));
+CREATE INDEX question__status__datecreated__idx
+    ON Question(status, datecreated);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2109, 55, 2);

=== added file 'database/schema/patch-2109-61-1.sql'
--- database/schema/patch-2109-61-1.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2109-61-1.sql	2009-07-06 12:03:49 +0000
@@ -0,0 +1,71 @@
+SET client_min_messages=ERROR;
+
+DROP VIEW IF EXISTS POExport;
+
+CREATE VIEW POExport AS
+SELECT
+  ((COALESCE((potmsgset.id)::text, 'X'::text) || '.'::text) || COALESCE((translationmessage.id)::text, 'X'::text)) AS id,
+  POTemplate.productseries,
+  POTemplate.sourcepackagename,
+  POTemplate.distroseries,
+  POTemplate.id AS potemplate,
+  POTemplate.header AS template_header,
+  POTemplate.languagepack,
+  POFile.id AS pofile,
+  POFile.language,
+  POFile.variant,
+  POFile.topcomment AS translation_file_comment,
+  POFile.header AS translation_header,
+  POFile.fuzzyheader AS is_translation_header_fuzzy,
+  TranslationTemplateItem.sequence,
+  POTMsgSet.id AS potmsgset,
+  TranslationMessage.comment,
+  POTMsgSet.sourcecomment AS source_comment,
+  POTMsgSet.filereferences AS file_references,
+  POTMsgSet.flagscomment AS flags_comment,
+  POTMsgSet.context,
+  msgid_singular.msgid AS msgid_singular,
+  msgid_plural.msgid AS msgid_plural,
+  TranslationMessage.is_current,
+  TranslationMessage.is_imported,
+  TranslationMessage.potemplate AS diverged,
+  potranslation0.translation AS translation0,
+  potranslation1.translation AS translation1,
+  potranslation2.translation AS translation2,
+  potranslation3.translation AS translation3,
+  potranslation4.translation AS translation4,
+  potranslation5.translation AS translation5
+FROM POTMsgSet
+JOIN TranslationTemplateItem ON
+    TranslationTemplateItem.potmsgset = POTMsgSet.id
+JOIN POTemplate ON
+    POTemplate.id = TranslationTemplateItem.potemplate
+JOIN POFile ON
+    POTemplate.id = POFile.potemplate
+LEFT JOIN TranslationMessage ON
+    POTMsgSet.id = TranslationMessage.potmsgset AND
+    TranslationMessage.is_current IS TRUE AND
+    TranslationMessage.language = POFile.language AND
+    TranslationMessage.variant IS NOT DISTINCT FROM POFile.variant
+LEFT JOIN POMsgID AS msgid_singular ON
+    msgid_singular.id = POTMsgSet.msgid_singular
+LEFT JOIN POMsgID AS msgid_plural ON
+    msgid_plural.id = POTMsgSet.msgid_plural
+LEFT JOIN POTranslation AS potranslation0 ON
+    potranslation0.id = TranslationMessage.msgstr0
+LEFT JOIN POTranslation AS potranslation1 ON
+    potranslation1.id = TranslationMessage.msgstr1
+LEFT JOIN POTranslation AS potranslation2 ON
+    potranslation2.id = TranslationMessage.msgstr2
+LEFT JOIN POTranslation AS potranslation3 ON
+    potranslation3.id = TranslationMessage.msgstr3
+LEFT JOIN POTranslation AS potranslation4 ON
+    potranslation4.id = TranslationMessage.msgstr4
+LEFT JOIN POTranslation potranslation5 ON
+    potranslation5.id = TranslationMessage.msgstr5
+WHERE
+    TranslationMessage.potemplate IS NULL OR
+    TranslationMessage.potemplate = POFile.potemplate;
+
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2109, 61, 1);

=== added file 'database/schema/patch-2109-62-0.sql'
--- database/schema/patch-2109-62-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2109-62-0.sql	2009-07-09 13:40:12 +0000
@@ -0,0 +1,5 @@
+SET client_min_messages=ERROR;
+
+DROP VIEW IF EXISTS POExport;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2109, 62, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-07-17 18:46:25 +0000
+++ database/schema/security.cfg	2009-07-19 04:41:14 +0000
@@ -592,6 +592,7 @@
 public.revisioncache                    = SELECT, INSERT
 public.revisionparent                   = SELECT, INSERT
 public.revisionproperty                 = SELECT, INSERT
+public.seriessourcepackagebranch        = SELECT
 public.sourcepackagename                = SELECT
 public.staticdiff                       = SELECT, INSERT, DELETE
 public.validpersoncache                 = SELECT
@@ -1116,7 +1117,7 @@
 public.packageupload                    = SELECT, UPDATE
 public.packageuploadsource              = SELECT
 public.packageuploadbuild               = SELECT
-public.packageuploadcustom              = SELECT
+public.packageuploadcustom              = SELECT, UPDATE
 
 # Distribution/Publishing stuff
 public.archive                          = SELECT, UPDATE
@@ -1133,20 +1134,21 @@
 public.pocketchroot                     = SELECT
 public.sourcepackagerelease             = SELECT, UPDATE
 public.binarypackagerelease             = SELECT, UPDATE
-public.sourcepackagereleasefile         = SELECT
-public.binarypackagefile                = SELECT
+public.sourcepackagereleasefile         = SELECT, UPDATE
+public.binarypackagefile                = SELECT, UPDATE
 public.sourcepackagename                = SELECT
 public.binarypackagename                = SELECT
 public.binarypackagepublishinghistory   = SELECT
 public.sourcepackagepublishinghistory   = SELECT
 public.sourcepackagefilepublishing      = SELECT
 public.binarypackagefilepublishing      = SELECT
-public.securesourcepackagepublishinghistory = SELECT, INSERT
-public.securebinarypackagepublishinghistory = SELECT, INSERT
+public.securesourcepackagepublishinghistory = SELECT, INSERT, UPDATE
+public.securebinarypackagepublishinghistory = SELECT, INSERT, UPDATE
 public.component                        = SELECT
 public.section                          = SELECT
 public.componentselection               = SELECT
 public.sectionselection                 = SELECT
+public.packagediff                      = SELECT, UPDATE
 
 # Librarian stuff
 public.libraryfilealias                 = SELECT, INSERT
@@ -1602,6 +1604,7 @@
 public.product                          = SELECT
 public.productseries                    = SELECT
 public.revision                         = SELECT
+public.revisionauthor                   = SELECT, INSERT
 public.sourcepackagename                = SELECT
 public.staticdiff                       = SELECT, INSERT
 public.teammembership                   = SELECT

=== modified file 'database/schema/trusted.sql'
--- database/schema/trusted.sql	2009-07-17 00:26:05 +0000
+++ database/schema/trusted.sql	2009-07-19 04:41:14 +0000
@@ -409,13 +409,13 @@
 
     IF v_trash_old THEN
         -- Was this somebody's most-recently-changed message?
+        -- If so, delete the entry for that change.
         DELETE FROM POFileTranslator
         WHERE latest_message = OLD.id;
-
         IF FOUND THEN
-            -- Delete old records.
-
-            -- Insert a past record if there is one.
+            -- We deleted the entry for somebody's latest contribution.
+            -- Find that person's latest remaining contribution and
+            -- create a new record for that.
             INSERT INTO POFileTranslator (
                 person, pofile, latest_message, date_last_touched
                 )
@@ -427,25 +427,24 @@
                          new_latest_message.date_reviewed)
               FROM POFile
               JOIN TranslationTemplateItem AS old_template_item
-                ON (OLD.potmsgset =
-                     old_template_item.potmsgset) AND
-                   (old_template_item.potemplate = pofile.potemplate) AND
-                   (pofile.language
-                     IS NOT DISTINCT FROM OLD.language) AND
-                   (pofile.variant
-                     IS NOT DISTINCT FROM OLD.variant)
+                ON OLD.potmsgset = old_template_item.potmsgset AND
+                   old_template_item.potemplate = pofile.potemplate AND
+                   pofile.language = OLD.language AND
+                   pofile.variant IS NOT DISTINCT FROM OLD.variant
               JOIN TranslationTemplateItem AS new_template_item
                 ON (old_template_item.potemplate =
                      new_template_item.potemplate)
               JOIN TranslationMessage AS new_latest_message
-                ON (new_latest_message.potmsgset =
-                     new_template_item.potmsgset) AND
-                   (new_latest_message.language
-                     IS NOT DISTINCT FROM OLD.language AND
-                   (new_latest_message.variant)
-                     IS NOT DISTINCT FROM OLD.variant)
+                ON new_latest_message.potmsgset =
+                       new_template_item.potmsgset AND
+                   new_latest_message.language = OLD.language AND
+                   new_latest_message.variant IS NOT DISTINCT FROM OLD.variant
+              LEFT OUTER JOIN POfileTranslator AS ExistingEntry
+                ON ExistingEntry.person = OLD.submitter AND
+                   ExistingEntry.pofile = POFile.id
               WHERE
-                new_latest_message.submitter=OLD.submitter
+                new_latest_message.submitter = OLD.submitter AND
+                ExistingEntry IS NULL
               ORDER BY new_latest_message.submitter, pofile.id,
                        new_latest_message.date_created DESC,
                        new_latest_message.id DESC;

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2009-07-16 21:12:16 +0000
+++ lib/canonical/config/schema-lazr.conf	2009-07-22 13:02:10 +0000
@@ -2,6 +2,8 @@
 # The database user which will be used to expire questions.
 # datatype: string
 dbuser: answertracker
+storm_cache: generational
+storm_cache_size: 500
 
 # The number of days of inactivity required before a question in
 # the open or needs information state is expired.
@@ -31,6 +33,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: branchscanner
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -46,6 +50,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: fiera
+storm_cache: generational
+storm_cache_size: 500
 
 # datatype: string
 default_sender_address: [e-mail]
@@ -178,6 +184,8 @@
 # The database user to run this process as.
 # datatype: string
 dbuser: checkwatches
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -477,6 +485,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: create-merge-proposals
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -540,10 +550,17 @@
 soft_request_timeout: None
 
 # The Storm cache type to use. May be 'default', 'generational' or 'stupid'
+# datatype: string
 storm_cache: generational
 
-# The size of the Storm cache.
-storm_cache_size: 5000
+# The size of the Storm cache in objects. We start small, because this
+# is the default used by everything and we have no idea if we are
+# dealing with tiny objects or huge objects. Individual scripts can
+# easily increase the cache size if database performance is an issue
+# and RAM usage is not. See Bug #393625 for the issue that prompted
+# this change.
+# datatype: integer
+storm_cache_size: 500
 
 
 [debug]
@@ -609,13 +626,16 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: teammembership
+storm_cache: generational
+storm_cache_size: 500
 
 
 [gina]
 # The database user which will be used by this process.
 # datatype: string
 dbuser: gina
-
+storm_cache: generational
+storm_cache_size: 500
 
 [gina_target.template]
 # The distribution name (e.g. ubuntu) from where the packages
@@ -803,6 +823,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: karma
+storm_cache: generational
+storm_cache_size: 500
 
 # When calculating karma, if a categories scaling factor is
 # larger than this it is reduced down to this maximum. This is
@@ -821,6 +843,8 @@
 # datatype: string
 dbuser: launchpad_main
 auth_dbuser: launchpad_auth
+storm_cache: generational
+storm_cache_size: 10000
 
 # If true, Launchpad is running in read-only mode. Attempts to
 # write to the Launchpad database will be denied, and an explanatory
@@ -1019,10 +1043,6 @@
 # ba-ws.geonames.net.
 geonames_identity:
 
-storm_cache: generational
-storm_cache_size: 10000
-
-
 [launchpad_session]
 # The hostname where the session database is located.
 # If the value is empty or None, localhost via UNIX sockets
@@ -1051,6 +1071,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: librarian
+storm_cache: generational
+storm_cache_size: 500
 
 isolation_level: read_committed
 
@@ -1104,6 +1126,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: librariangc
+storm_cache: generational
+storm_cache_size: 500
 
 
 [librarian_server]
@@ -1304,6 +1328,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: mp-creation-job
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -1323,7 +1349,6 @@
 # datatype: integer
 retained_days: 366
 
-
 [personalpackagearchive]
 # Directory to be created to store PPAs.
 # datatype: string
@@ -1359,18 +1384,22 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: poimport
-
+storm_cache: generational
+storm_cache_size: 500
 
 [processmail]
 # The database user which will be used by this process.
 # datatype: string
 dbuser: processmail
-
+storm_cache: generational
+storm_cache_size: 500
 
 [productreleasefinder]
 # The database user which will be used by this process.
 # datatype: string
 dbuser: productreleasefinder
+storm_cache: generational
+storm_cache_size: 500
 
 [profiling]
 # When set to True, each requests will be profiled and the resulting data
@@ -1392,6 +1421,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: reclaim-branch-space
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -1434,9 +1465,14 @@
 translate_pages_max_batch_size: 50
 
 [rosettabranches]
+# XXX stub 20090722 bug=402891: Scripts need to use unique
+# database users but the rosetta branch scanner is incorrectly reusing an
+# existing database user.
 # The database user which will be used by the rosetta-branches cronscript.
 # datatype: string
 dbuser: branchscanner
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -1452,6 +1488,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: send-branch-mail
+storm_cache: generational
+storm_cache_size: 500
 
 # See [error_reports].
 error_dir: none
@@ -1467,6 +1505,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: shipit
+storm_cache: generational
+storm_cache_size: 500
 
 # datatype: string
 admins_email_address: [e-mail]
@@ -1501,7 +1541,8 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: statistician
-
+storm_cache: generational
+storm_cache_size: 500
 
 [supermirror]
 # The longest period of time, in seconds, that the scheduler will
@@ -1550,22 +1591,30 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: targetnamecacheupdater
+storm_cache: generational
+storm_cache_size: 500
 
 
 [updateremoteproduct]
 # The database user to run this process as.
 # datatype: string
 dbuser: updateremoteproduct
+storm_cache: generational
+storm_cache_size: 500
 
 [updatesourceforgeremoteproduct]
 # The database user to run this process as.
 # datatype: string
 dbuser: updatesourceforgeremoteproduct
+storm_cache: generational
+storm_cache_size: 500
 
 [uploader]
 # The database user which will be used by this process.
 # datatype: string
 dbuser: uploader
+storm_cache: generational
+storm_cache_size: 500
 
 # datatype: string
 default_recipient_name: none
@@ -1584,13 +1633,19 @@
 # The database user which will be used by this process.
 # datatype: string
 dbuser: queued
+storm_cache: generational
+storm_cache_size: 500
 
 
 [binaryfile_expire]
 dbuser: binaryfile-expire
+storm_cache: generational
+storm_cache_size: 500
 
 [generateppahtaccess]
 dbuser: generateppahtaccess
+storm_cache: generational
+storm_cache_size: 500
 
 [vhosts]
 # When true, use https URLs unless explicitly overridden.

=== modified file 'lib/canonical/launchpad/doc/celebrities.txt'
--- lib/canonical/launchpad/doc/celebrities.txt	2009-05-06 16:10:16 +0000
+++ lib/canonical/launchpad/doc/celebrities.txt	2009-07-15 02:58:08 +0000
@@ -200,3 +200,14 @@
     >>> ubuntu_branches = personset.getByName('ubuntu-branches')
     >>> celebs.ubuntu_branches == ubuntu_branches
     True
+
+
+== Ubuntu security team ==
+
+There is a celebrity representing the 'ubuntu-security' team, which is
+mainly used for granting special permissions on the ubuntu primary
+archive.
+
+    >>> ubuntu_security = personset.getByName('ubuntu-security')
+    >>> celebs.ubuntu_security == ubuntu_security
+    True

=== modified file 'lib/canonical/launchpad/doc/vocabularies.txt'
--- lib/canonical/launchpad/doc/vocabularies.txt	2009-06-02 08:20:49 +0000
+++ lib/canonical/launchpad/doc/vocabularies.txt	2009-07-03 11:34:14 +0000
@@ -457,6 +457,31 @@
 BranchVocabulary with respect to the tokens and privacy awareness.
 
 
+=== HostedBranchRestrictedOnOwner ===
+
+Here's a vocabulary for all hosted branches owned by the current user.
+
+    >>> from lp.code.enums import BranchType
+
+    >>> a_user = factory.makePerson(name='a-branching-user')
+    >>> product1 = factory.makeProduct(name='product-one')
+    >>> mirrored_branch = factory.makeBranch(
+    ...     owner=a_user, product=product1, name='mirrored',
+    ...     branch_type=BranchType.MIRRORED)
+    >>> product2 = factory.makeProduct(name='product-two')
+    >>> hosted_branch = factory.makeBranch(
+    ...     owner=a_user, product=product2, name='hosted')
+    >>> foreign_branch = factory.makeBranch()
+
+It returns branches owned by the user, but not ones owned by others, nor
+ones that aren't hosted on Launchpad.
+
+    >>> branch_vocabulary = vocabulary_registry.get(
+    ...     a_user, "HostedBranchRestrictedOnOwner")
+    >>> print_vocab_branches(branch_vocabulary, None)
+    ~a-branching-user/product-two/hosted
+
+
 === Processor ===
 
 All processors type available in Launchpad.

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2009-07-16 04:17:24 +0000
+++ lib/canonical/launchpad/icing/style.css	2009-07-21 03:23:28 +0000
@@ -1618,9 +1618,15 @@
   font-size: 1.5em;
   font-family: "URW Gothic L","MgOpen Moderna","Lucida Sans",sans-serif;
   text-align: center;
-  margin: 1em 0 1em 0;
-  padding: 0.2em;
+  margin: auto;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
   background-color: #ededed;
+  width: 90%;
+}
+#home-description .smaller {
+  font-size: 80%;
 }
 #home-stats {
   margin: auto;

=== added file 'lib/canonical/launchpad/images/edit-transparent.png'
Binary files lib/canonical/launchpad/images/edit-transparent.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/edit-transparent.png	2009-07-20 14:59:27 +0000 differ
=== modified file 'lib/canonical/launchpad/interfaces/launchpad.py'
--- lib/canonical/launchpad/interfaces/launchpad.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/interfaces/launchpad.py	2009-07-19 04:41:14 +0000
@@ -128,10 +128,10 @@
     ubuntu_branches = Attribute("The Ubuntu branches team")
     ubuntu_bugzilla = Attribute("The Ubuntu Bugzilla.")
     ubuntu_cdimage_mirror = Attribute("The main cdimage mirror for Ubuntu.")
+    ubuntu_security = Attribute("The 'ubuntu-security' team.")
     vcs_imports = Attribute("The 'vcs-imports' team.")
 
 
-
 class ICrowd(Interface):
 
     def __contains__(person_or_team_or_anything):

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-07-17 18:46:25 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-07-21 22:46:23 +0000
@@ -259,11 +259,6 @@
         subscriber: new Y.lp.Subscriber({uri: LP.client.links.me})
     });
 
-    // XXX deryck 2009-07-09 bug=397406 The classnames used to
-    // determine direct vs. dupe subscriptions are not set
-    // correctly and fix_subscription_link_classes works around
-    // this bug.
-    fix_subscription_link_classes(subscription);
     var is_direct = subscription.get(
         'link').get('parentNode').hasClass('subscribed-true');
     var has_dupes = subscription.get(
@@ -298,27 +293,6 @@
 }
 
 /*
- * XXX deryck 2009-07-09 bug=397406 The classnames used to
- * determine direct vs. dupe subscriptions are not set
- * correctly and fix_subscription_link_classes works around
- * this bug.
- *
- * @method fix_subscription_link_classes
- * @param subscription {Object} A Y.lp.Subscription object.
- */
-function fix_subscription_link_classes(subscription) {
-    var subscriber = subscription.get('subscriber');
-    var subscription_link = subscription.get('link');
-    var me_nodes = Y.all('.subscriber-' + subscriber.get('name'));
-    if (Y.Lang.isValue(me_nodes) && me_nodes.size() > 1) {
-        set_subscription_link_parent_class(subscription_link, true, true);
-        me_nodes.each(function(div) {
-            set_subscription_link_parent_class(div.query('img'), true, true);
-        });
-    }
-}
-
-/*
  * Set click handlers for unsubscribe remove icons.
  *
  * @method setup_unsubscribe_icon_handlers
@@ -1233,7 +1207,7 @@
         edit_icon.setAttribute('src', '/@@/edit');
     });
     content.on('mouseout', function(e) {
-        edit_icon.setAttribute('src', null);
+        edit_icon.setAttribute('src', '/@@/edit-transparent');
     });
     content.setStyle('cursor', 'pointer');
 };
@@ -1259,8 +1233,8 @@
     // canel clicks on the edit links. Users most likely don't
     // want to edit the bugtasks.
     if (Y.Lang.isValue(LP.client.cache.bug.duplicate_of_link)) {
-        status_content.on('click', function(e) { e.halt() });
-        importance_content.on('click', function(e) { e.halt() });
+        status_content.on('click', function(e) { e.halt(); });
+        importance_content.on('click', function(e) { e.halt(); });
         return;
     }
 

=== modified file 'lib/canonical/launchpad/javascript/lp/lp.js'
--- lib/canonical/launchpad/javascript/lp/lp.js	2009-07-13 10:52:46 +0000
+++ lib/canonical/launchpad/javascript/lp/lp.js	2009-07-21 17:14:29 +0000
@@ -516,7 +516,17 @@
     for (var i = 0; i < nodes.length; i++) {
         var node = nodes[i];
         if (node.focus) {
-            node.focus();
+            try {
+                // Trying to focus a hidden element throws an error in IE8.
+                if (node.offsetHeight !== 0) {
+                    node.focus();
+                }
+            } catch (e) {
+                YUI().use('console', function(Y) {
+                    Y.log('In setFocusByName(<' +
+                        node.tagName + ' type=' + node.type + '>): ' + e);
+                });
+            }
             break;
         }
     }

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-07-19 04:41:14 +0000
@@ -1136,6 +1136,9 @@
 
 productseries_linkbranch = ContextTitle('Link an existing branch to %s')
 
+productseries_link_translations_branch = ContextTitle(
+    "Set translations export branch for %s")
+
 productseries_index = ContextTitle('%s')
 
 productseries_delete = ContextTitle('Delete %s')

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-07-19 02:09:34 +0000
+++ lib/canonical/launchpad/security.py	2009-07-19 04:41:14 +0000
@@ -1333,10 +1333,18 @@
     usedfor = IPackageUpload
 
     def checkAuthenticated(self, user):
-        """Return True if user has an ArchivePermission or is an admin."""
+        """Return True if user has an ArchivePermission or is an admin.
+
+        If it's a delayed-copy, check if the user can upload to its targeted
+        archive.
+        """
         if AdminByAdminsTeam.checkAuthenticated(self, user):
             return True
 
+        if self.obj.is_delayed_copy:
+            archive_append = AppendArchive(self.obj.archive)
+            return archive_append.checkAuthenticated(user)
+
         permission_set = getUtility(IArchivePermissionSet)
         permissions = permission_set.componentsForQueueAdmin(
             self.obj.archive, user)
@@ -1907,6 +1915,9 @@
     PPA upload rights are managed via `IArchive.canUpload`;
 
     Appending to PRIMARY, PARTNER or COPY archives is restricted to owners.
+
+    Appending to ubuntu main archives can also be done by the
+    'ubuntu-security' celebrity.
     """
     permission = 'launchpad.Append'
     usedfor = IArchive
@@ -1918,6 +1929,12 @@
         if self.obj.is_ppa and self.obj.canUpload(user):
             return True
 
+        celebrities = getUtility(ILaunchpadCelebrities)
+        if (self.obj.is_main and
+            self.obj.distribution == celebrities.ubuntu and
+            user.inTeam(celebrities.ubuntu_security)):
+            return True
+
         return False
 
 

=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
--- lib/canonical/launchpad/templates/root-index.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/launchpad/templates/root-index.pt	2009-07-21 06:42:41 +0000
@@ -46,7 +46,6 @@
              alt=""
              style="margin: 0 9em 1em 0"/>
         <br />
-
         <input id="text" type="text" name="field.text" size="50" />
         <input type="submit" value="Search Launchpad" />
       </form>
@@ -59,11 +58,11 @@
         <strong tal:content="view/blueprint_count/fmt:intcomma">123</strong>&nbsp;blueprints,
         and&nbsp;counting...
       </div>
-      <div id="home-description">Launchpad is a unique collaboration and
-      <a href="http://bazaar-vcs.org/">Bazaar</a>
-      code hosting platform for software projects. <a
-      href="/+tour"
-      >Read more...</a></div>
+      <div id="home-description">
+        Launchpad is a code hosting and software collaboration platform.<br />
+        <span class="smaller">Launchpad is open source -- you can <a href="https://dev.launchpad.net/">join the community</a> of people
+        who help improve it.</span>
+      </div>
       <div id="home-page" style="width:90%; max-width:80em; margin:auto;">
         <div class="three column left" id="featured-projects">
           <h2>Featured projects</h2>

=== modified file 'lib/canonical/launchpad/tour/bugs'
--- lib/canonical/launchpad/tour/bugs	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/tour/bugs	2009-07-20 19:12:02 +0000
@@ -66,7 +66,7 @@
                         In Launchpad, you can share a bug report and its comment history with other communities interested in finding a fix.
                         Each project &mdash; or even different releases within a project &mdash; can track its own status, importance and assignee for that same bug report.
                         <br /><br />
-                        Even if the bug is tracked elsewhere &mdash; such as in Trac, Sourceforge or Bugzilla &mdash; Launchpad can pull in it status. Using our <a href="<a href="https://help.launchpad.net/Bugs/PluginAPISpec">bug tracker plugins</a> for Bugzilla and Trac you can share a comment history for the same bug tracked both in Launchpad and an external tracker.<br /><br />
+                        Even if the bug is tracked elsewhere &mdash; such as in Trac, Sourceforge or Bugzilla &mdash; Launchpad can pull in it status. Using our <a href="https://help.launchpad.net/Bugs/PluginAPISpec">bug tracker plugins</a> for Bugzilla and Trac you can share a comment history for the same bug tracked both in Launchpad and an external tracker.<br /><br />
 And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&rdquo; report that shows which of your bugs are marked fixed in other communities.
 
                         </p>

=== modified file 'lib/canonical/launchpad/utilities/celebrities.py'
--- lib/canonical/launchpad/utilities/celebrities.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/utilities/celebrities.py	2009-07-19 04:41:14 +0000
@@ -136,6 +136,7 @@
     ubuntu = CelebrityDescriptor(IDistributionSet, 'ubuntu')
     ubuntu_branches = CelebrityDescriptor(IPersonSet, 'ubuntu-branches')
     ubuntu_bugzilla = CelebrityDescriptor(IBugTrackerSet, 'ubuntu-bugzilla')
+    ubuntu_security = CelebrityDescriptor(IPersonSet, 'ubuntu-security')
     vcs_imports = CelebrityDescriptor(IPersonSet, 'vcs-imports')
 
     @property

=== modified file 'lib/canonical/launchpad/vocabularies/configure.zcml'
--- lib/canonical/launchpad/vocabularies/configure.zcml	2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/vocabularies/configure.zcml	2009-07-19 04:41:14 +0000
@@ -17,6 +17,12 @@
     />
 
   <utility
+    name="HostedBranchRestrictedOnOwner"
+    component="canonical.launchpad.vocabularies.HostedBranchRestrictedOnOwnerVocabulary"
+    provides="zope.schema.interfaces.IVocabularyFactory"
+    />
+
+  <utility
     name="BranchRestrictedOnProduct"
     component="canonical.launchpad.vocabularies.BranchRestrictedOnProductVocabulary"
     provides="zope.schema.interfaces.IVocabularyFactory"

=== modified file 'lib/canonical/launchpad/vocabularies/dbobjects.py'
--- lib/canonical/launchpad/vocabularies/dbobjects.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/launchpad/vocabularies/dbobjects.py	2009-07-19 04:41:14 +0000
@@ -11,6 +11,7 @@
 
 __all__ = [
     'BountyVocabulary',
+    'HostedBranchRestrictedOnOwnerVocabulary',
     'BranchRestrictedOnProductVocabulary',
     'BranchVocabulary',
     'BugNominatableSeriesesVocabulary',
@@ -76,11 +77,13 @@
     CountableIterator, IHugeVocabulary,
     NamedSQLObjectVocabulary, SQLObjectVocabularyBase)
 
+from lp.code.enums import BranchType
 from lp.code.interfaces.branch import IBranch
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distroseries import (
     DistroSeriesStatus, IDistroSeries)
+from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.project import IProject
@@ -186,6 +189,25 @@
         return getUtility(IAllBranches).inProduct(self.product)
 
 
+class HostedBranchRestrictedOnOwnerVocabulary(BranchVocabularyBase):
+    """A vocabulary for hosted branches owned by the current user.
+
+    These are branches that the user is guaranteed to be able to push
+    to.
+    """
+    def __init__(self, context=None):
+        """Pass a Person as context, or anything else for the current user."""
+        super(HostedBranchRestrictedOnOwnerVocabulary, self).__init__(context)
+        if IPerson.providedBy(self.context):
+            self.user = context
+        else:
+            self.user = getUtility(ILaunchBag).user
+
+    def _getCollection(self):
+        return getUtility(IAllBranches).ownedBy(self.user).withBranchType(
+            BranchType.HOSTED)
+
+
 class BugVocabulary(SQLObjectVocabularyBase):
 
     _table = Bug

=== modified file 'lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step2.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step2.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step2.py	2009-07-21 17:14:29 +0000
@@ -52,12 +52,17 @@
         validator='className|unseen')
     # Clicking on the href expands the search results.
     client.click(id='search-results-expander')
-    client.waits.sleep(milliseconds=u'1000')
+    client.waits.forElement(
+        xpath='//*[@id="search-results" and contains(@class, "lazr-opened")]',
+        milliseconds=u'1000')
     client.asserts.assertProperty(
         id=u'search-results',
         validator='className|lazr-opened')
     # Clicking it again hides the results.
     client.click(id='search-results-expander')
+    client.waits.forElement(
+        xpath='//*[@id="search-results" and contains(@class, "lazr-closed")]',
+        milliseconds=u'1000')
     client.asserts.assertProperty(
         id=u'search-results',
         validator='className|lazr-closed')

=== modified file 'lib/canonical/lazr/interfaces/feed.py'
--- lib/canonical/lazr/interfaces/feed.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/lazr/interfaces/feed.py	2009-07-21 07:27:48 +0000
@@ -133,14 +133,7 @@
     def getItems():
         """Get the individual items for the feed.
 
-        For instance, get all announcements for a project.  Each item should
-        be converted to a feed entry using itemToFeedEntry.
-        """
-
-    def itemToFeedEntry(item):
-        """Convert a single item to a formatted feed entry.
-
-        An individual entry will be an instance providing `IFeedEntry`.
+        Individual items will provide `IFeedEntry`.
         """
 
     def renderAtom():

=== removed symlink 'lib/canonical/shipit'
=== target was u'../../sourcecode/shipit'
=== added symlink 'lib/canonical/shipit'
=== target is u'../../sourcecode/shipit'
=== added symlink 'lib/canonical/signon'
=== target is u'../../sourcecode/canonical-identity-provider'
=== removed symlink 'lib/canonical/signon'
=== target was u'../../sourcecode/canonical-identity-provider'
=== modified file 'lib/canonical/widgets/product.py'
--- lib/canonical/widgets/product.py	2009-07-17 00:26:05 +0000
+++ lib/canonical/widgets/product.py	2009-07-21 03:56:03 +0000
@@ -362,7 +362,9 @@
         return self.template()
 
     def _renderTable(self, category, column_count=1):
-        html = ['<table id="%s">' % category]
+        # The tables are wrapped in divs, since IE8 does not respond
+        # to setting the table's height to zero.
+        html = ['<div id="%s"><table>' % category]
         rendered_items = self.items_by_category[category]
         row_count = int(math.ceil(len(rendered_items) / float(column_count)))
         for i in range(0, row_count):
@@ -373,7 +375,7 @@
                     break
                 html.append('<td>%s</td>' % rendered_items[index])
             html.append('</tr>')
-        html.append('</table>')
+        html.append('</table></div>')
         return '\n'.join(html)
 
 

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2009-07-17 00:26:05 +0000
+++ lib/lp/bugs/browser/bug.py	2009-07-20 16:59:49 +0000
@@ -385,8 +385,15 @@
 
     @cachedproperty
     def duplicate_subscribers(self):
-        """Caches the list of subscribers from duplicates."""
-        return frozenset(self.context.getSubscribersFromDuplicates())
+        """Caches the list of subscribers from duplicates.
+
+        Don't use getSubscribersFromDuplicates here because that method
+        omits a user if the user is also a direct or indirect subscriber.
+        getSubscriptionsFromDuplicates doesn't, so find person objects via
+        this method.
+        """
+        dupe_subscriptions = self.context.getSubscriptionsFromDuplicates()
+        return frozenset([sub.person for sub in dupe_subscriptions])
 
     def subscription_class(self, subscribed_person):
         """Returns a set of CSS class names based on subscription status.

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2009-07-17 18:46:25 +0000
+++ lib/lp/bugs/model/bug.py	2009-07-21 20:33:31 +0000
@@ -68,7 +68,6 @@
 from lp.bugs.interfaces.bugactivity import IBugActivitySet
 from lp.bugs.interfaces.bugattachment import (
     BugAttachmentType, IBugAttachmentSet)
-from lp.bugs.interfaces.bugbranch import IBugBranch
 from lp.bugs.interfaces.bugmessage import IBugMessageSet
 from lp.bugs.interfaces.bugnomination import (
     NominationError, NominationSeriesObsoleteError)
@@ -533,17 +532,6 @@
                 Bug.duplicateof = %d""" % self.id,
                 prejoins=["person"], clauseTables=["Bug"]))
 
-        # Direct and "also notified" subscribers take precedence
-        # over subscribers from duplicates.
-        duplicate_subscriptions -= set(self.getDirectSubscriptions())
-        also_notified_subscriptions = set()
-        for also_notified_subscriber in self.getAlsoNotifiedSubscribers():
-            for duplicate_subscription in duplicate_subscriptions:
-                if also_notified_subscriber == duplicate_subscription.person:
-                    also_notified_subscriptions.add(duplicate_subscription)
-                    break
-        duplicate_subscriptions -= also_notified_subscriptions
-
         # Only add a subscriber once to the list.
         duplicate_subscribers = set(
             sub.person for sub in duplicate_subscriptions)

=== modified file 'lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt'
--- lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2009-07-17 18:46:25 +0000
+++ lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2009-07-20 14:59:27 +0000
@@ -64,7 +64,7 @@
            style="float: left"
            tal:content="context/status/title" />
         <a href="+editstatus" style="margin-left: 3px">
-          <img class="editicon" />
+          <img class="editicon" src="/@@/edit-transparent" />
         </a>
       </div>
     </td>
@@ -78,7 +78,7 @@
            style="float: left"
            tal:content="context/importance/title" />
         <a href="+editstatus" style="margin-left: 3px">
-          <img class="editicon" />
+          <img class="editicon" src="/@@/edit-transparent" />
         </a>
       </div>
     </td>

=== modified file 'lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py'
--- lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py	2009-07-17 00:26:05 +0000
+++ lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py	2009-07-20 18:38:23 +0000
@@ -167,52 +167,81 @@
         xpath=SUBSCRIPTION_LINK, validator=u'Subscribe')
     client.asserts.assertNotNode(classname=FOO_BAR_CLASS)
 
-    # A bit of a corner case here, but make sure that when
-    # a user is subscribed to both the main bug and the dupe
-    # that the user is unsubscribed correctly.
-    client.open(url=BUG_URL % 5)
-    client.waits.forPageLoad(timeout=PAGE_LOAD)
-    client.waits.forElement(
-        id=u'subscribers-links', timeout=FOR_ELEMENT)
-    # Subscribe to the main bug, bug 5.
-    client.click(xpath=SUBSCRIPTION_LINK)
-    client.waits.sleep(milliseconds=SLEEP)
-    client.asserts.assertText(
-        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
-    # Go to bug 6, the dupe, and subscribe.
-    client.open(url=BUG_URL % 6)
-    client.waits.forPageLoad(timeout=PAGE_LOAD)
-    client.waits.forElement(
-        id=u'subscribers-links', timeout=FOR_ELEMENT)
-    client.click(xpath=SUBSCRIPTION_LINK)
-    # Now back to bug 5.  The first unsubscribe should remove
-    # the current bug direct subscription.
-    client.open(url=BUG_URL % 5)
-    client.waits.forPageLoad(timeout=PAGE_LOAD)
-    client.waits.forElement(
-        id=u'subscribers-links', timeout=FOR_ELEMENT)
-    client.asserts.assertText(
-        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
-    # Confirm there are 2 subscriber links: one in direct subscribers,
-    # and one in duplicate subscribers.
-    client.asserts.assertNode(
-        xpath=(u'//div[@id="subscribers-links"]'
-               '/div/a[@name="Foo Bar"]'))
-    client.asserts.assertNode(
-        xpath=(u'//div[@id="subscribers-from-duplicates"]'
-               '/div/a[@name="Foo Bar"]'))
-    # The first click unsubscribes the direct subscription, leaving the dupe.
-    client.click(xpath=SUBSCRIPTION_LINK)
-    client.waits.sleep(milliseconds=SLEEP)
-    client.asserts.assertNotNode(
-        xpath=(u'//div[@id="subscribers-links"]'
-               '/div/a[@name="Foo Bar"]'))
-    client.asserts.assertNode(
-        xpath=(u'//div[@id="subscribers-from-duplicates"]'
-               '/div/a[@name="Foo Bar"]'))
-    # The second unsubscribe removes the dupe/
-    client.click(xpath=SUBSCRIPTION_LINK)
-    client.waits.sleep(milliseconds=SLEEP)
-    client.asserts.assertNotNode(
-        xpath=(u'//div[@id="subscribers-from-duplicates"]'
-               '/div/a[@name="Foo Bar"]'))
+    # Subscribe/Unsubscribe link handling when dealing
+    # with duplicates...
+    #
+    # First test case, ensure unsubscribing works when
+    # dealing with a duplicate and an indirect subscription.
+    lpuser.SAMPLE_PERSON.ensure_login(client)
+    # Go to bug 6, the dupe, and subscribe.
+    client.open(url=BUG_URL % 6)
+    client.waits.forPageLoad(timeout=PAGE_LOAD)
+    client.waits.forElement(
+        id=u'subscribers-links', timeout=FOR_ELEMENT)
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertText(
+        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
+    # Now back to bug 5.
+    client.open(url=BUG_URL % 5)
+    client.waits.forPageLoad(timeout=PAGE_LOAD)
+    client.waits.forElement(
+        id=u'subscribers-links', timeout=FOR_ELEMENT)
+    # Confirm there are 2 subscriber links: one in duplicate subscribers,
+    # and one in indirect subscribers.
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-from-duplicates"]'
+               '/div/a[@name="Sample Person"]'))
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-indirect"]'
+               '/div/a[text() = "Sample Person"]'))
+    # Clicking "Unsubscribe" successfully removes the duplicate subscription,
+    # but the indirect subscription remains.
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertNotNode(
+        xpath=(u'//div[@id="subscribers-from-duplicates"]'
+               '/div/a[@name="Sample Person"]'))
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-indirect"]'
+               '/div/a[text() = "Sample Person"]'))
+
+    # Second test case, confirm duplicate handling is correct between direct
+    # and duplicate subscriptions.  Subscribe directly to bug 5.
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertText(
+        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
+    # Go to bug 6, the dupe, and subscribe.
+    client.open(url=BUG_URL % 6)
+    client.waits.forPageLoad(timeout=PAGE_LOAD)
+    client.waits.forElement(
+        id=u'subscribers-links', timeout=FOR_ELEMENT)
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertText(
+        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
+    # Now back to bug 5. Confirm there are 2 subscriptions.
+    client.open(url=BUG_URL % 5)
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-links"]'
+               '/div/a[@name="Sample Person"]'))
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-from-duplicates"]'
+               '/div/a[@name="Sample Person"]'))
+    # The first click unsubscribes the direct subscription, leaving
+    # the duplicate subscription.
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertNotNode(
+        xpath=(u'//div[@id="subscribers-links"]'
+               '/div/a[@name="Sample Person"]'))
+    client.asserts.assertNode(
+        xpath=(u'//div[@id="subscribers-from-duplicates"]'
+               '/div/a[@name="Sample Person"]'))
+    # The second unsubscribe removes the duplicate, too.
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertNotNode(
+        xpath=(u'//div[@id="subscribers-from-duplicates"]'
+               '/div/a[@name="Sample Person"]'))

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/browser/branch.py	2009-07-19 04:41:14 +0000
@@ -520,6 +520,15 @@
             return False
         return self.context.target.collection.getBranches().count() > 1
 
+    def translations_sources(self):
+        """Anything that automatically exports its translations here.
+
+        Produces a list, so that the template can easily check whether
+        there are any translations sources.
+        """
+        # Actually only ProductSeries currently do that.
+        return list(self.context.getProductSeriesPushingTranslations())
+
 
 class DecoratedMergeProposal:
     """Provide some additional attributes to a normal branch merge proposal.

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2009-07-17 00:26:05 +0000
+++ lib/lp/code/browser/configure.zcml	2009-07-20 18:22:54 +0000
@@ -508,14 +508,14 @@
         for="lp.code.interfaces.branchvisibilitypolicy.IHasBranchVisibilityPolicy"
         facet="overview"
         class="lp.code.browser.branchvisibilitypolicy.AddBranchVisibilityTeamPolicyView"
-        permission="launchpad.Admin"
+        permission="launchpad.Commercial"
         template="../templates/branch-visibility-edit.pt"/>
     <browser:page
         name="+removebranchvisibilitypolicy"
         for="lp.code.interfaces.branchvisibilitypolicy.IHasBranchVisibilityPolicy"
         facet="overview"
         class="lp.code.browser.branchvisibilitypolicy.RemoveBranchVisibilityTeamPolicyView"
-        permission="launchpad.Admin"
+        permission="launchpad.Commercial"
         template="../templates/branch-visibility-edit.pt"/>
     <browser:page
         name="+spark"

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2009-07-19 04:41:14 +0000
@@ -208,6 +208,27 @@
         view.initialize()
         self.assertFalse(view.show_merge_links)
 
+    def testNoProductSeriesPushingTranslations(self):
+        # By default, a branch view shows no product series pushing
+        # translations to the branch.
+        branch = self.factory.makeBranch()
+
+        view = BranchView(branch, self.request)
+        view.initialize()
+        self.assertEqual(list(view.translations_sources()), [])
+
+    def testProductSeriesPushingTranslations(self):
+        # If a product series exports its translations to the branch,
+        # the view shows it.
+        product = self.factory.makeProduct()
+        trunk = product.getSeries('trunk')
+        branch = self.factory.makeBranch(owner=product.owner)
+        removeSecurityProxy(trunk).translations_branch = branch
+
+        view = BranchView(branch, self.request)
+        view.initialize()
+        self.assertEqual(list(view.translations_sources()), [trunk])
+
 
 class TestBranchReviewerEditView(TestCaseWithFactory):
     """Test the BranchReviewerEditView view."""

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2009-07-17 00:26:05 +0000
+++ lib/lp/code/configure.zcml	2009-07-19 04:41:14 +0000
@@ -388,6 +388,7 @@
                     canBeDeleted
                     deletionRequirements
                     associatedProductSeries
+                    getProductSeriesPushingTranslations
                     associatedSuiteSourcePackages
                     subscribe
                     getSubscription

=== modified file 'lib/lp/code/feed/branch.py'
--- lib/lp/code/feed/branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/feed/branch.py	2009-07-21 07:27:48 +0000
@@ -40,6 +40,12 @@
 from lp.registry.interfaces.project import IProject
 
 
+def revision_feed_id(revision):
+    """Return a consistent id for a revision to use as an id."""
+    return "tag:launchpad.net,%s:/revision/%s" % (
+        revision.revision_date.date().isoformat(), revision.revision_id)
+
+
 class BranchFeedEntry(FeedEntry):
     """See `IFeedEntry`."""
     def construct_id(self):
@@ -248,16 +254,35 @@
         Called by getItems which may cache the results.
         """
         cache = self._getRevisionCache()
-        revisions = cache.public().getRevisions().config(limit=self.quantity)
+        revisions = cache.public().getRevisions()
         # Convert the items into their feed entry representation.
-        items = [self.itemToFeedEntry(item) for item in revisions]
+        items = []
+        for revision in revisions:
+            content_view = self._createView(revision)
+            if content_view is not None:
+                entry = self.createFeedEntry(content_view)
+                items.append(entry)
+            # If we've hit our limit, stop iterating the revisions.
+            if len(items) >= self.quantity:
+                break
         return items
 
-    def itemToFeedEntry(self, revision):
-        """See `IFeed`."""
-        id = "tag:launchpad.net,%s:/revision/%s" % (
-            revision.revision_date.date().isoformat(), revision.revision_id)
+    def _createView(self, revision):
+        """Make a view for this revision.
+
+        :return: A view class, or None.
+        """
         content_view = RevisionFeedContentView(revision, self.request, self)
+        # If there is no longer an associated branch for this, return None as
+        # we don't want to show this revision.
+        if content_view.branch is None:
+            return None
+        return content_view
+
+    def createFeedEntry(self, content_view):
+        """Create the FeedEntry for the specified view."""
+        revision = content_view.context
+        id = revision_feed_id(revision)
         content = content_view.render()
         content_data = FeedTypedData(content=content,
                                      content_type="html",

=== added directory 'lib/lp/code/feed/tests'
=== added file 'lib/lp/code/feed/tests/__init__.py'
--- lib/lp/code/feed/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/feed/tests/__init__.py	2009-07-20 05:51:06 +0000
@@ -0,0 +1,4 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test for feeds relating to Launchpad code live here."""

=== added file 'lib/lp/code/feed/tests/test_revision.py'
--- lib/lp/code/feed/tests/test_revision.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/feed/tests/test_revision.py	2009-07-21 03:30:59 +0000
@@ -0,0 +1,141 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the revision feeds."""
+
+__metaclass__ = type
+
+from datetime import datetime
+import unittest
+
+from pytz import UTC
+from zope.component import getUtility
+
+from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.code.feed.branch import (
+    ProductRevisionFeed, revision_feed_id, RevisionListingFeed)
+from lp.code.interfaces.revision import IRevisionSet
+from lp.testing import login_person, TestCaseWithFactory
+
+
+class TestRevisionFeedId(TestCaseWithFactory):
+    """Test the revision_feed_id function."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_format(self):
+        # The id contains the iso format of the date part of the revision
+        # date, and the revision id.
+        revision_date = datetime(2009, 07, 21, 12, tzinfo=UTC)
+        revision = self.factory.makeRevision(
+            revision_date=revision_date, rev_id="test_revision_id")
+        feed_id = revision_feed_id(revision)
+        self.assertEqual(
+            'tag:launchpad.net,2009-07-21:/revision/test_revision_id',
+            feed_id)
+
+
+class TestRevisionFeed(TestCaseWithFactory):
+    """Tests for the methods of the RevisionListingFeed base class."""
+
+    layer = DatabaseFunctionalLayer
+
+    def _createBranchWithRevision(self):
+        """Create a branch with a linked, cached revision.
+
+        :return: a tuple of (branch, revision)
+        """
+        revision = self.factory.makeRevision()
+        branch = self.factory.makeBranch()
+        branch.createBranchRevision(1, revision)
+        getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
+        return branch, revision
+
+    def _createFeed(self):
+        """Create and return a RevisionListingFeed instance."""
+        # The FeedBase class determins the feed type by the end of the
+        # requested URL, so forcing .atom here.
+        return RevisionListingFeed(
+            None, LaunchpadTestRequest(
+                SERVER_URL="http://example.com/fake.atom"))
+
+    def test_createView(self):
+        # Revisions that are linked to branches are shown in the feed.
+
+        # Since we are calling into a base class that would normally take a
+        # context and a request, we need to give it something - None should be
+        # fine.
+        branch, revision = self._createBranchWithRevision()
+        revision_feed = self._createFeed()
+        view = revision_feed._createView(revision)
+        self.assertEqual(revision, view.context)
+        self.assertEqual(branch, view.branch)
+
+    def test_createView_revision_not_in_branch(self):
+        # If a revision is in the RevisionCache table, but no longer
+        # associated with a public branch, then the createView call will
+        # return None to indicate not do show this revision.
+        branch, revision = self._createBranchWithRevision()
+        # Now delete the branch.
+        login_person(branch.owner)
+        branch.destroySelf()
+        revision_feed = self._createFeed()
+        view = revision_feed._createView(revision)
+        self.assertIs(None, view)
+
+
+class TestProductRevisionFeed(TestCaseWithFactory):
+    """Tests for the ProductRevisionFeed."""
+
+    layer = DatabaseFunctionalLayer
+
+    def _createBranchWithRevision(self, product):
+        """Create a branch with a linked, cached revision.
+
+        :return: a tuple of (branch, revision)
+        """
+        revision = self.factory.makeRevision()
+        branch = self.factory.makeProductBranch(product=product)
+        branch.createBranchRevision(1, revision)
+        getUtility(IRevisionSet).updateRevisionCacheForBranch(branch)
+        return branch, revision
+
+    def _createFeed(self, product):
+        """Create and return a ProductRevisionFeed instance."""
+        # The FeedBase class determins the feed type by the end of the
+        # requested URL, so forcing .atom here.
+        return ProductRevisionFeed(
+            product, LaunchpadTestRequest(
+                SERVER_URL="http://example.com/fake.atom"))
+
+    def test_getItems_empty(self):
+        # If there are no revisions for a product, there are no items.
+        product = self.factory.makeProduct()
+        feed = self._createFeed(product)
+        self.assertEqual([], feed.getItems())
+
+    def test_getItems_revisions(self):
+        # If there are revisions in branches for the project, these are
+        # returned in the feeds items.
+        product = self.factory.makeProduct()
+        branch, revision = self._createBranchWithRevision(product)
+        feed = self._createFeed(product)
+        [item] = feed.getItems()
+        self.assertEqual(revision_feed_id(revision), item.id)
+
+    def test_getItems_skips_revisions_not_in_branches(self):
+        # If a revision was added to a project, but the only branch that
+        # referred to that revision was subsequently removed, the revision
+        # does not show in the feed.
+        product = self.factory.makeProduct()
+        branch, revision = self._createBranchWithRevision(product)
+        # Now delete the branch.
+        login_person(branch.owner)
+        branch.destroySelf()
+        feed = self._createFeed(product)
+        self.assertEqual([], feed.getItems())
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/interfaces/branch.py	2009-07-19 04:41:14 +0000
@@ -780,6 +780,15 @@
         series as a branch.
         """
 
+    def getProductSeriesPushingTranslations():
+        """Return sequence of product series pushing translations here.
+
+        These are any `ProductSeries` that have this branch as their
+        translations_branch.  It should normally be at most one, but
+        there's nothing stopping people from combining translations
+        branches.
+        """
+
     def associatedSuiteSourcePackages():
         """Return the suite source packages that this branch is linked to."""
 

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/model/branch.py	2009-07-19 04:41:14 +0000
@@ -484,6 +484,9 @@
                     spec_link.destroySelf))
         for series in self.associatedProductSeries():
             alteration_operations.append(ClearSeriesBranch(series, self))
+        for series in self.getProductSeriesPushingTranslations():
+            alteration_operations.append(
+                ClearSeriesTranslationsBranch(series, self))
 
         series_set = getUtility(IFindOfficialBranchLinks)
         alteration_operations.extend(
@@ -529,6 +532,14 @@
             ProductSeries,
             ProductSeries.branch == self)
 
+    def getProductSeriesPushingTranslations(self):
+        """See `IBranch`."""
+        # Imported here to avoid circular import.
+        from lp.registry.model.productseries import ProductSeries
+        return Store.of(self).find(
+            ProductSeries,
+            ProductSeries.translations_branch == self)
+
     def associatedSuiteSourcePackages(self):
         """See `IBranch`."""
         series_set = getUtility(IFindOfficialBranchLinks)
@@ -910,6 +921,21 @@
         self.affected_object.syncUpdate()
 
 
+class ClearSeriesTranslationsBranch(DeletionOperation):
+    """Deletion operation that clears a series' translations branch."""
+
+    def __init__(self, series, branch):
+        DeletionOperation.__init__(
+            self, series,
+            _('This series exports its translations to this branch.'))
+        self.branch = branch
+
+    def __call__(self):
+        if self.affected_object.branch == self.branch:
+            self.affected_object.branch = None
+        self.affected_object.syncUpdate()
+
+
 class ClearOfficialPackageBranch(DeletionOperation):
     """Deletion operation that clears an official package branch."""
 

=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2009-07-17 18:46:25 +0000
+++ lib/lp/code/model/directbranchcommit.py	2009-07-21 04:21:23 +0000
@@ -46,6 +46,7 @@
     """
     is_open = False
     is_locked = False
+    commit_builder = None
 
     def __init__(self, db_branch, committer=None):
         """Create context for direct commit to branch.
@@ -73,6 +74,9 @@
             committer = db_branch.owner
         self.committer = committer
 
+        # Directories we create on the branch, and their ids.
+        self.path_ids = {}
+
         mirrorer = make_branch_mirrorer(self.db_branch.branch_type)
         self.bzrbranch = mirrorer.open(self.db_branch.getPullURL())
         self.bzrbranch.lock_write()
@@ -81,30 +85,40 @@
         try:
             self.revision_tree = self.bzrbranch.basis_tree()
             self.transform_preview = TransformPreview(self.revision_tree)
+            assert self.transform_preview.find_conflicts() == [], (
+                "TransformPreview is not in a consistent state.")
 
             self.is_open = True
         except:
             self.unlock()
-            self.is_locked = False
             raise
 
         self.files = set()
 
     def _getDir(self, path):
         """Get trans_id for directory "path."  Create if necessary."""
-        dir = self.revision_tree.path2id(path)
-        if dir:
+        path_id = self.path_ids.get(path)
+        if path_id:
+            # This is a path we've just created in the branch.
+            return path_id
+
+        if self.revision_tree.path2id(path):
+            # This is a path that was already in the branch.
             return self.transform_preview.trans_id_tree_path(path)
 
+        # Look up (or create) parent directory.
         parent_dir, dirname = os.path.split(path)
         if dirname:
             parent_id = self._getDir(parent_dir)
         else:
             parent_id = None
 
+        # Create new directory.
         dirfile_id = gen_file_id(path)
-        return self.transform_preview.new_directory(
+        path_id = self.transform_preview.new_directory(
             dirname, parent_id, dirfile_id)
+        self.path_ids[path] = path_id
+        return path_id
 
     def writeFile(self, path, contents):
         """Write file to branch; may be an update or a new file.
@@ -151,6 +165,7 @@
         assert self.is_open, "Committing closed DirectBranchCommit."
         assert self.is_locked, "Not locked at commit time."
 
+        builder = None
         try:
             self._checkForRace()
 
@@ -170,6 +185,7 @@
             builder.finish_inventory()
 
             new_rev_id = builder.commit(commit_message)
+            builder = None
 
             revno, old_rev_id = self.bzrbranch.last_revision_info()
             self.bzrbranch.set_last_revision_info(revno + 1, new_rev_id)
@@ -177,11 +193,14 @@
             IMasterObject(self.db_branch).requestMirror()
 
         finally:
+            if builder:
+                builder.abort()
             self.unlock()
             self.is_open = False
 
     def unlock(self):
         """Release commit lock, if held."""
         if self.is_locked:
+            self.transform_preview.finalize()
             self.bzrbranch.unlock()
             self.is_locked = False

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/model/tests/test_branch.py	2009-07-19 04:41:14 +0000
@@ -558,6 +558,14 @@
                          " is not deletable.")
         self.assertRaises(CannotDeleteBranch, self.branch.destroySelf)
 
+    def test_productSeriesTranslationsBranchDisablesDeletion(self):
+        self.product.development_focus.translations_branch = self.branch
+        syncUpdate(self.product.development_focus)
+        self.assertEqual(self.branch.canBeDeleted(), False,
+                         "A branch that is a translations branch for a "
+                         "product series is not deletable.")
+        self.assertRaises(CannotDeleteBranch, self.branch.destroySelf)
+
     def test_revisionsDeletable(self):
         """A branch that has some revisions can be deleted."""
         revision = self.factory.makeRevision()

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2009-07-19 04:41:14 +0000
@@ -622,6 +622,8 @@
         bmp = self.factory.makeBranchMergeProposal(target_branch=job.branch,
                                                    registrant=hacker)
         bmp.source_branch.last_scanned_id = 'rev3-id'
+        transaction.commit()
+        self.layer.switchDbUser(config.sendbranchmail.dbuser)
         message = job.getRevisionMessage('rev2d-id', 1)
         self.assertEqual(
         'Merge authors:\n'

=== modified file 'lib/lp/code/stories/branches/xx-branch-visibility-policy.txt'
--- lib/lp/code/stories/branches/xx-branch-visibility-policy.txt	2009-07-09 19:54:12 +0000
+++ lib/lp/code/stories/branches/xx-branch-visibility-policy.txt	2009-07-20 18:22:54 +0000
@@ -1,7 +1,7 @@
 = Branch Visibility Policy Pages =
 
 Controlling the branch visibility policies for products and projects is only
-available to launchpad admins.
+available to launchpad admins and launchpad commercial admins.
 
 Not to anonymous people.
 
@@ -43,14 +43,19 @@
     ...
     Unauthorized: ...
 
-Launchpad admins however, can get to it.
+Launchpad admins however, can get to the page to the branch visibility
+overview page and to the page to actually modify the policies.
 
     >>> admin_browser.open('http://code.launchpad.dev/firefox')
     >>> admin_browser.getLink('Define branch visibility').click()
     >>> print admin_browser.url
     http://launchpad.dev/firefox/+branchvisibility
 
-And members of the Launchpad Commercial team can view the page.
+    >>> admin_browser.getLink('Customise policy for Mozilla Firefox').click()
+    >>> print admin_browser.url
+    http://launchpad.dev/firefox/+addbranchvisibilitypolicy
+
+And members of the Launchpad Commercial team can view the pages.
 
     >>> commercial_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
@@ -59,6 +64,10 @@
     >>> print commercial_browser.url
     http://launchpad.dev/firefox/+branchvisibility
 
+    >>> commercial_browser.getLink('Customise policy for Mozilla Firefox').click()
+    >>> print commercial_browser.url
+    http://launchpad.dev/firefox/+addbranchvisibilitypolicy
+
 
 == Default policies ==
 
@@ -68,6 +77,8 @@
 specify any branch visibility policy items and there is an inherited branch
 visibility policy, then that policy is used.
 
+    >>> admin_browser.open('http://launchpad.dev/firefox/+branchvisibility')
+
     >>> print extract_text(find_tag_by_id(admin_browser.contents, 'inherited'))
     Using inherited policy from the Mozilla Project.
 
@@ -192,6 +203,14 @@
 
 See?  All still there.
 
+Before we remove them, let's ensure that the commercial admins can see
+the removal page.
+
+    >>> commercial_browser.open('http://launchpad.dev/firefox/+branchvisibility')
+    >>> commercial_browser.getLink('Remove policy items').click()
+    >>> print commercial_browser.url
+    http://launchpad.dev/firefox/+removebranchvisibilitypolicy
+
 Now to remove two.  The override for Everyone, and Launchpad Devs.
 
     >>> admin_browser.getControl('Everyone: Public').click()
@@ -204,13 +223,15 @@
     Ubuntu Gnome Team: Private
 
 As you can see there is still a default visibility of Public.  This
-is now implicit rather than explicit.  So if we go bact to remove more
+is now implicit rather than explicit.  So if we go back to remove more
 items, there is only one more policy item to remove.  Once that is removed
-Firefox will go back to inheriting the polices of Mozilla.
-
-    >>> admin_browser.getLink('Remove policy items').click()
-    >>> admin_browser.getControl('Ubuntu Gnome Team: Private').click()
-    >>> admin_browser.getControl('Remove Selected Policy Items').click()
-
-    >>> print_tag_with_id(admin_browser.contents, 'inherited')
+Firefox will go back to inheriting the polices of Mozilla. Let's let
+the commercial admin do the removal to ensure he has the permission.
+
+    >>> commercial_browser.open('http://launchpad.dev/firefox/+branchvisibility')
+    >>> commercial_browser.getLink('Remove policy items').click()
+    >>> commercial_browser.getControl('Ubuntu Gnome Team: Private').click()
+    >>> commercial_browser.getControl('Remove Selected Policy Items').click()
+
+    >>> print_tag_with_id(commercial_browser.contents, 'inherited')
     Using inherited policy from the Mozilla Project.

=== modified file 'lib/lp/code/templates/branch-index.pt'
--- lib/lp/code/templates/branch-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/code/templates/branch-index.pt	2009-07-19 04:41:14 +0000
@@ -449,6 +449,17 @@
 
   </div>
 
+  <div
+    id="translations-sources"
+    tal:define="translations_sources view/translations_sources"
+    tal:condition="translations_sources">
+    <h2>Automatic translations commits</h2>
+    <ul>
+      <tal:sources-list repeat="source translations_sources">
+        <li tal:content="structure source/fmt:link">~foo/example/branch</li>
+      </tal:sources-list>
+    </ul>
+  </div>
 
   <div id="recent-revisions">
   <h2 style="clear: both">Recent revisions</h2>

=== modified file 'lib/lp/code/tests/test_directbranchcommit.py'
--- lib/lp/code/tests/test_directbranchcommit.py	2009-07-17 18:46:25 +0000
+++ lib/lp/code/tests/test_directbranchcommit.py	2009-07-21 04:21:23 +0000
@@ -13,17 +13,13 @@
 from canonical.testing.layers import ZopelessDatabaseLayer
 
 
-class TestDirectBranchCommit(TestCaseWithFactory):
-    """Test `DirectBranchCommit`."""
-
-    layer = ZopelessDatabaseLayer
-
+class DirectBranchCommitTestCase(TestCaseWithFactory):
+    """Base class for `DirectBranchCommit` tests."""
     db_branch = None
     committer = None
 
     def setUp(self):
-        super(TestDirectBranchCommit, self).setUp()
-
+        super(DirectBranchCommitTestCase, self).setUp()
         self.useBzrBranches()
 
         self.series = self.factory.makeProductSeries()
@@ -33,8 +29,10 @@
         self.series.translations_branch = self.db_branch
 
         self._setUpCommitter()
+        self.addCleanup(self._tearDownCommitter)
 
     def _setUpCommitter(self, update_last_scanned_id=True):
+        """Clean up any existing `DirectBranchCommit`, set up a new one."""
         if self.committer:
             self.committer.unlock()
 
@@ -43,15 +41,22 @@
             self.db_branch.last_scanned_id = (
                 self.committer.bzrbranch.last_revision())
 
-    def tearDown(self):
-        self.committer.unlock()
+    def _tearDownCommitter(self):
+        if self.committer:
+            self.committer.unlock()
 
     def _getContents(self):
         """Return branch contents as dict mapping filenames to contents."""
         return map_branch_contents(self.committer.db_branch.getPullURL())
 
+
+class TestDirectBranchCommit(DirectBranchCommitTestCase):
+    """Test `DirectBranchCommit`."""
+
+    layer = ZopelessDatabaseLayer
+
     def test_DirectBranchCommit_commits_no_changes(self):
-        # Committing to an empty branch leaves the branch empty.
+        # Committing to an empty branch leaves an empty branch empty.
         self.committer.commit('')
         self.assertEqual({}, self._getContents())
 
@@ -94,6 +99,19 @@
         }
         self.assertEqual(expected, self._getContents())
 
+    def test_DirectBranchCommit_reuses_new_directories(self):
+        # If a directory doesn't exist in the committed branch, creating
+        # it twice would be an error.  DirectBranchCommit doesn't do
+        # that.
+        self.committer.writeFile('foo/x.txt', 'x')
+        self.committer.writeFile('foo/y.txt', 'y')
+        self.committer.commit('')
+        expected = {
+            'foo/x.txt': 'x',
+            'foo/y.txt': 'y',
+        }
+        self.assertEqual(expected, self._getContents())
+
     def test_DirectBranchCommit_writes_new_file_twice(self):
         # If you write the same new file multiple times before
         # committing, the original wins.
@@ -123,5 +141,65 @@
         self.assertRaises(ConcurrentUpdateError, self.committer.commit, '')
 
 
+class TestDirectBranchCommit_getDir(DirectBranchCommitTestCase):
+    """Test `DirectBranchCommit._getDir`."""
+
+    layer = ZopelessDatabaseLayer
+
+    def test_getDir_creates_root(self):
+        # An id is created even for the branch root directory.
+        self.assertFalse('' in self.committer.path_ids)
+        root_id = self.committer._getDir('')
+        self.assertNotEqual(None, root_id)
+        self.assertTrue('' in self.committer.path_ids)
+        self.assertEqual(self.committer.path_ids[''], root_id)
+        self.committer.commit('')
+
+    def test_getDir_creates_dir(self):
+        # _getDir will create a new directory, under the root.
+        self.assertFalse('dir' in self.committer.path_ids)
+        dir_id = self.committer._getDir('dir')
+        self.assertTrue('' in self.committer.path_ids)
+        self.assertTrue('dir' in self.committer.path_ids)
+        self.assertEqual(self.committer.path_ids['dir'], dir_id)
+        self.assertNotEqual(self.committer.path_ids[''], dir_id)
+        self.committer.commit('')
+
+    def test_getDir_creates_subdir(self):
+        # _getDir will create nested directories.
+        subdir_id = self.committer._getDir('dir/subdir')
+        self.assertTrue('' in self.committer.path_ids)
+        self.assertTrue('dir' in self.committer.path_ids)
+        self.assertTrue('dir/subdir' in self.committer.path_ids)
+        self.assertEqual(self.committer.path_ids['dir/subdir'], subdir_id)
+        self.committer.commit('')
+
+    def test_getDir_finds_existing_dir(self):
+        # _getDir finds directories that already existed in a previously
+        # committed version of the branch.
+        existing_id = self.committer._getDir('po')
+        self._setUpCommitter()
+        dir_id = self.committer._getDir('po')
+        self.assertEqual(existing_id, dir_id)
+        self.committer.commit('')
+
+    def test_getDir_creates_dir_in_existing_dir(self):
+        # _getDir creates directories inside ones that already existed
+        # in a previously committed version of the branch.
+        existing_id = self.committer._getDir('po')
+        self._setUpCommitter()
+        new_dir_id = self.committer._getDir('po/main/files')
+        self.assertTrue('po/main' in self.committer.path_ids)
+        self.assertTrue('po/main/files' in self.committer.path_ids)
+        self.assertEqual(self.committer.path_ids['po/main/files'], new_dir_id)
+        self.committer.commit('')
+
+    def test_getDir_reuses_new_id(self):
+        # If a directory was newly created, _getDir will reuse its id.
+        dir_id = self.committer._getDir('foo/bar')
+        self.assertEqual(dir_id, self.committer._getDir('foo/bar'))
+        self.committer.commit('')
+
+
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2009-07-17 00:26:05 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2009-07-19 04:41:14 +0000
@@ -12,16 +12,16 @@
 import zope.component.event
 from zope.component import getUtility
 
+from canonical.config import config
+from canonical.launchpad.interfaces import (
+    IBugBranchSet, IBugSet, NotFoundError)
+from canonical.testing.layers import LaunchpadZopelessLayer
+
 from lp.codehosting.scanner.buglinks import got_new_revision, BugBranchLinker
 from lp.codehosting.scanner.fixture import make_zope_event_fixture
 from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
-from canonical.config import config
-from canonical.launchpad.interfaces import (
-    IBugBranchSet, IBugSet, ILaunchpadCelebrities,
-    NotFoundError)
+from lp.soyuz.interfaces.publishing import PackagePublishingPocket
 from lp.testing import TestCase
-from lp.testing.factory import LaunchpadObjectFactory
-from canonical.testing import LaunchpadZopelessLayer
 
 
 class RevisionPropertyParsing(TestCase):
@@ -153,6 +153,27 @@
         self.syncBazaarBranchToDatabase(self.bzr_branch, self.db_branch)
         self.assertBugBranchLinked(self.bug1, self.db_branch)
 
+    def makePackageBranch(self):
+        LaunchpadZopelessLayer.switchDbUser(self.lp_db_user)
+        try:
+            branch = self.factory.makePackageBranch()
+            branch.sourcepackage.setBranch(
+                PackagePublishingPocket.RELEASE, branch, branch.owner)
+            LaunchpadZopelessLayer.txn.commit()
+        finally:
+            LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
+        return branch
+
+    def test_linking_bug_to_official_package_branch(self):
+        # We can link a bug to an official package branch. Test added to catch
+        # bug 391303.
+        self.commitRevision(
+            rev_id='rev1',
+            revprops={'bugs': '%s fixed' % self.getBugURL(self.bug1)})
+        branch = self.makePackageBranch()
+        self.syncBazaarBranchToDatabase(self.bzr_branch, branch)
+        self.assertBugBranchLinked(self.bug1, branch)
+
     def test_knownMainlineRevisionsDoesntMakeLink(self):
         """Don't add BugBranches for known mainline revision."""
         self.commitRevision(

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-07-18 00:05:49 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-07-19 04:41:14 +0000
@@ -1753,6 +1753,13 @@
         permission="launchpad.Admin"
         template="../templates/productseries-review.pt"/>
     <browser:page
+        for="lp.registry.interfaces.productseries.IProductSeries"
+        name="+link-translations-branch"
+        class="lp.registry.browser.productseries.LinkTranslationsBranchView"
+        template="../templates/productseries-link-translations-branch.pt"
+        facet="translations"
+        permission="launchpad.Edit"/>
+    <browser:page
         name="+ask-a-question-button"
         for="lp.registry.interfaces.productseries.IProductSeries"
         class="canonical.launchpad.browser.AskAQuestionButtonView"

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/browser/productseries.py	2009-07-21 22:27:22 +0000
@@ -7,6 +7,7 @@
 
 __all__ = [
     'get_series_branch_error',
+    'LinkTranslationsBranchView',
     'ProductSeriesBreadcrumbBuilder',
     'ProductSeriesBugsMenu',
     'ProductSeriesDeleteView',
@@ -47,14 +48,13 @@
 from lp.code.interfaces.codeimport import (
     ICodeImportSet)
 from lp.services.worlddata.interfaces.country import ICountry
-from lp.bugs.interfaces.bugtask import BugTaskSearchParams, IBugTaskSet
+from lp.bugs.interfaces.bugtask import IBugTaskSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.browser import StatusCount
 from lp.translations.interfaces.potemplate import IPOTemplateSet
 from lp.translations.interfaces.productserieslanguage import (
     IProductSeriesLanguageSet)
 from lp.services.worlddata.interfaces.language import ILanguageSet
-from canonical.launchpad.searchbuilder import any
 from canonical.launchpad.webapp import (
     action, ApplicationMenu, canonical_url, custom_widget,
     enabled_with_permission, LaunchpadEditFormView,
@@ -69,6 +69,7 @@
 
 from lp.registry.browser import (
     MilestoneOverlayMixin, RegistryDeleteViewMixin)
+from lp.registry.interfaces.distroseries import DistroSeriesStatus
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageNameSet)
@@ -417,6 +418,17 @@
         return (branch is not None and
                 check_permission('launchpad.View', branch))
 
+    @property
+    def is_obsolete(self):
+        """Return True if the series is OBSOLETE"
+
+        Obsolete series do not need to display as much information as other
+        series. Accessing private bugs is an expensive operation and showing
+        them for obsolete series can be a problem if many series are being
+        displayed.
+        """
+        return self.context.status == DistroSeriesStatus.OBSOLETE
+
     @cachedproperty
     def bugtask_status_counts(self):
         """A list StatusCounts summarising the targeted bugtasks."""
@@ -585,6 +597,27 @@
         """Do nothing and go back to the product series page."""
 
 
+class LinkTranslationsBranchView(LaunchpadEditFormView):
+    """View to set the series' translations export branch."""
+
+    schema = IProductSeries
+    field_names = ['translations_branch']
+
+    @property
+    def next_url(self):
+        return canonical_url(self.context) + '/+translations-settings'
+
+    @action(_('Update'), name='update')
+    def update_action(self, action, data):
+        self.updateContextFromData(data)
+        self.request.response.addInfoNotification(
+            'Translations export branch updated.')
+
+    @action('Cancel', name='cancel', validator='validate_cancel')
+    def cancel_action(self, action, data):
+        """Do nothing and go back to the settings page."""
+
+
 class ProductSeriesLinkBranchFromCodeView(ProductSeriesLinkBranchView):
     """Set the branch link from the code overview page."""
 

=== modified file 'lib/lp/registry/browser/tests/productrelease-views.txt'
--- lib/lp/registry/browser/tests/productrelease-views.txt	2009-06-18 08:58:59 +0000
+++ lib/lp/registry/browser/tests/productrelease-views.txt	2009-07-22 04:08:03 +0000
@@ -119,7 +119,7 @@
                 var select_menu = get_by_id('field.milestone_for_release');
                 var create_milestone_link = Y.Node.create(
                     '<a href="+addmilestone" id="create-milestone-link" ' +
-                    'class="add js-action">Create milestone</a>'); ...
+                    'class="add js-action sprite">Create milestone</a>'); ...
 
 
 == Editing a a product release ==

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2009-07-07 11:24:01 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2009-07-21 16:30:28 +0000
@@ -60,6 +60,22 @@
     >>> print view.milestone_table_class
     listing
 
+Obsolete series are less interesting that other series. The ProductSeriesView
+has an is_obsolete property that templates can check when choosing the content
+to display.
+
+    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+
+    >>> print series.status
+    Active Development
+    >>> view.is_obsolete
+    False
+
+    >>> series.status = DistroSeriesStatus.OBSOLETE
+    >>> view = create_view(series, '+index')
+    >>> view.is_obsolete
+    True
+
 
 == Delete ProductSeries ==
 

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/configure.zcml	2009-07-19 04:41:14 +0000
@@ -1302,7 +1302,7 @@
         <require
             permission="launchpad.Edit"
             set_attributes="product name owner driver summary branch
-                            status releasefileglob
+                            translations_branch status releasefileglob
                             translations_autoimport_mode"/>
         <require
             permission="launchpad.AnyPerson"

=== modified file 'lib/lp/registry/doc/person.txt'
--- lib/lp/registry/doc/person.txt	2009-07-16 22:17:03 +0000
+++ lib/lp/registry/doc/person.txt	2009-07-18 01:03:09 +0000
@@ -809,6 +809,7 @@
     Ubuntu branches (ubuntu-branches): []
     Ubuntu Doc Team (doc): [u'[e-mail]']
     Ubuntu Gnome Team (name18): []
+    Ubuntu Security Team (ubuntu-security): []
     Ubuntu Team (ubuntu-team): [u'[e-mail]']
     Ubuntu Translators (ubuntu-translators): []
     Ubuntu-branches-owner (ubuntu-branches-owner): [u'[e-mail]']
@@ -844,6 +845,7 @@
     testing Spanish team (testing-spanish-team): []
     Ubuntu Doc Team (doc): [u'[e-mail]']
     Ubuntu Gnome Team (name18): []
+    Ubuntu Security Team (ubuntu-security): []
     Ubuntu Team (ubuntu-team): [u'[e-mail]']
     Warty Gnome Team (warty-gnome): []
     Warty Security Team (name20): []
@@ -864,6 +866,7 @@
     testing Spanish team (testing-spanish-team): []
     Ubuntu Doc Team (doc): [u'[e-mail]']
     Ubuntu Gnome Team (name18): []
+    Ubuntu Security Team (ubuntu-security): []
     Ubuntu Team (ubuntu-team): [u'[e-mail]']
     Warty Gnome Team (warty-gnome): []
     Warty Security Team (name20): []
@@ -921,6 +924,7 @@
     Simple Team (simple-team): []
     testing Spanish team (testing-spanish-team): []
     Ubuntu Gnome Team (name18): []
+    Ubuntu Security Team (ubuntu-security): []
     Ubuntu Team (ubuntu-team): [u'[e-mail]']
     Warty Gnome Team (warty-gnome): []
     Warty Security Team (name20): []
@@ -939,6 +943,7 @@
     Simple Team (simple-team): []
     testing Spanish team (testing-spanish-team): []
     Ubuntu Gnome Team (name18): []
+    Ubuntu Security Team (ubuntu-security): []
     Ubuntu Team (ubuntu-team): [u'[e-mail]']
     Warty Gnome Team (warty-gnome): []
     Warty Security Team (name20): []

=== modified file 'lib/lp/registry/doc/vocabularies.txt'
--- lib/lp/registry/doc/vocabularies.txt	2009-07-17 16:22:12 +0000
+++ lib/lp/registry/doc/vocabularies.txt	2009-07-18 06:35:05 +0000
@@ -743,7 +743,8 @@
 
     >>> [(p.name, getattr(p.teamowner, 'name', None))
     ...  for p in vocab.search('ubuntu-team')]
-    [(u'doc', None), (u'name18', u'sabdfl'), (u'ubuntu-team', u'sabdfl')]
+    [(u'doc', None), (u'name18', u'sabdfl'),
+     (u'ubuntu-security', u'kamion'), (u'ubuntu-team', u'sabdfl')]
 
 But it doesn't include merged accounts:
 
@@ -780,7 +781,7 @@
     >>> sorted(person.name for person in vocab.search('team'))
     [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
      u'otherteam', u'simple-team', u'testing-spanish-team',
-     u'ubuntu-team', u'warty-gnome']
+     u'ubuntu-security', u'ubuntu-team', u'warty-gnome']
 
 Logging in as 'owner', who is a member of myteam shows that the token
 lookup still omits myteam.
@@ -789,7 +790,7 @@
     >>> sorted(person.name for person in vocab.search('team'))
     [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
      u'otherteam', u'simple-team', u'testing-spanish-team',
-     u'ubuntu-team', u'warty-gnome']
+     u'ubuntu-security', u'ubuntu-team', u'warty-gnome']
 
 A PRIVATE team is displayed when the logged in user is a member of the team.
 
@@ -802,17 +803,19 @@
     ...     owner=commercial,
     ...     visibility=PersonVisibility.PRIVATE)
     >>> sorted(person.name for person in vocab.search('team'))
-    [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
-     u'otherteam', u'private-team', u'simple-team', u'testing-spanish-team',
+    [u'hwdb-team', u'name18', u'name20', u'name21',
+     u'no-team-memberships', u'otherteam', u'private-team',
+     u'simple-team', u'testing-spanish-team', u'ubuntu-security',
      u'ubuntu-team', u'warty-gnome']
 
 The PRIVATE team is also displayed for Launchpad admins.
 
     >>> login('[e-mail]')
     >>> sorted(person.name for person in vocab.search('team'))
-    [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
-     u'otherteam', u'private-team', u'simple-team', u'testing-spanish-team',
-     u'ubuntu-team', u'warty-gnome']
+    [u'hwdb-team', u'name18', u'name20', u'name21',
+     u'no-team-memberships', u'otherteam',
+     u'private-team', u'simple-team', u'testing-spanish-team',
+     u'ubuntu-security', u'ubuntu-team', u'warty-gnome']
 
 The PRIVATE team can be looked up via getTermByToken for a member of the team.
 
@@ -826,7 +829,7 @@
     >>> sorted(person.name for person in vocab.search('team'))
     [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
      u'otherteam', u'simple-team', u'testing-spanish-team',
-     u'ubuntu-team', u'warty-gnome']
+     u'ubuntu-security', u'ubuntu-team', u'warty-gnome']
 
 The anonymous user will not see the private team either.
 
@@ -834,7 +837,7 @@
     >>> sorted(person.name for person in vocab.search('team'))
     [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
      u'otherteam', u'simple-team', u'testing-spanish-team',
-     u'ubuntu-team', u'warty-gnome']
+     u'ubuntu-security', u'ubuntu-team', u'warty-gnome']
 
 Attempting to lookup the team via getTermByToken results in a
 LookupError, the same as if the team didn't exist, which is really
@@ -854,7 +857,6 @@
     >>> sorted(person.name for person in vocab.search(''))
     [...u'private-team'...]
 
-
 A search for 'support' will give us only the persons which have support
 as part of their name or displayname, or the beginning of
 one of its email addresses.
@@ -890,8 +892,9 @@
     >>> login(ANONYMOUS)
     >>> [person.displayname for person in vocab.search('team')]
     [u'HWDB Team', u'Hoary Gnome Team', u'No Team Memberships',
-     u'Other Team', u'Simple Team', u'Ubuntu Gnome Team', u'Ubuntu Team',
-     u'Warty Gnome Team', u'Warty Security Team', u'testing Spanish team']
+     u'Other Team', u'Simple Team', u'Ubuntu Gnome Team',
+     u'Ubuntu Security Team', u'Ubuntu Team', u'Warty Gnome Team',
+     u'Warty Security Team', u'testing Spanish team']
 
     >>> login(ANONYMOUS)
     >>> vocab.LIMIT
@@ -920,9 +923,10 @@
 search for 'team' should give us some of them:
 
     >>> sorted(person.name for person in vocab.search('team'))
-    [u'hwdb-team', u'name18', u'name20', u'name21', u'no-team-memberships',
-     u'otherteam', u'simple-team', u'testing-spanish-team', u'ubuntu-team',
-     u'warty-gnome']
+    [u'hwdb-team', u'name18', u'name20', u'name21',
+     u'no-team-memberships', u'otherteam',
+     u'simple-team', u'testing-spanish-team', u'ubuntu-security',
+     u'ubuntu-team', u'warty-gnome']
 
 
 === ValidTeam ===
@@ -961,6 +965,7 @@
      (u'ShipIt Administrators', u'Mark Shuttleworth'),
      (u'Simple Team', u'One Membership'),
      (u'Ubuntu Gnome Team', u'Mark Shuttleworth'),
+     (u'Ubuntu Security Team', u'Colin Watson'),
      (u'Ubuntu Team', u'Mark Shuttleworth'),
      (u'Ubuntu Translators', u'Rosetta Administrators'),
      (u'Ubuntu branches', u'Ubuntu-branches-owner'),
@@ -980,6 +985,7 @@
     ...        for team in vocab.search('spanish | ubuntu'))
     [(u'Mirror Administrators', u'Mark Shuttleworth'),
      (u'Ubuntu Gnome Team', u'Mark Shuttleworth'),
+     (u'Ubuntu Security Team', u'Colin Watson'),
      (u'Ubuntu Team', u'Mark Shuttleworth'),
      (u'Ubuntu Translators', u'Rosetta Administrators'),
      (u'Ubuntu branches', u'Ubuntu-branches-owner'),
@@ -992,6 +998,7 @@
      (u'Other Team', u'Owner'),
      (u'Simple Team', u'One Membership'),
      (u'Ubuntu Gnome Team', u'Mark Shuttleworth'),
+     (u'Ubuntu Security Team', u'Colin Watson'),
      (u'Ubuntu Team', u'Mark Shuttleworth'),
      (u'Warty Gnome Team', u'Mark Shuttleworth'),
      (u'Warty Security Team', u'Mark Shuttleworth'),
@@ -1008,6 +1015,7 @@
      (u'Private Team', u'Commercial Member'),
      (u'Simple Team', u'One Membership'),
      (u'Ubuntu Gnome Team', u'Mark Shuttleworth'),
+     (u'Ubuntu Security Team', u'Colin Watson'),
      (u'Ubuntu Team', u'Mark Shuttleworth'),
      (u'Warty Gnome Team', u'Mark Shuttleworth'),
      (u'Warty Security Team', u'Mark Shuttleworth'),
@@ -1060,7 +1068,7 @@
     >>> team in vocab
     False
     >>> [person.name for person in vocab.search('ubuntu-team')]
-    [u'name18']
+    [u'name18', u'ubuntu-security']
 
 'ubuntu-team' is a member of 'guadamen', so 'guadamen' can't be a member
 of 'ubuntu-team'.
@@ -1103,7 +1111,7 @@
     >>> team in vocab
     False
     >>> [person.name for person in vocab.search('ubuntu-team')]
-    [u'name18']
+    [u'name18', u'ubuntu-security']
 
 'name16' is a valid owner for 'ubuntu-team'.
 

=== modified file 'lib/lp/registry/interfaces/productseries.py'
--- lib/lp/registry/interfaces/productseries.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/interfaces/productseries.py	2009-07-19 04:41:14 +0000
@@ -251,6 +251,15 @@
             "A Bazaar branch to commit translation snapshots to. "
             "Leave blank to disable."))
 
+    translations_branch = ReferenceChoice(
+        title=_("Translations export branch"),
+        vocabulary='HostedBranchRestrictedOnOwner',
+        schema=IBranch,
+        required=False,
+        description=_(
+            "A Bazaar branch to commit translation snapshots to.  "
+            "Leave blank to disable."))
+
     def getRelease(version):
         """Get the release in this series that has the specified version.
         Return None is there is no such release.

=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-series.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-series.txt	2009-06-29 23:15:46 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-series.txt	2009-07-21 16:30:28 +0000
@@ -54,12 +54,12 @@
     >>> print series_1_0['class']
     unhighlighted series
 
-Any user can see that obsolete series are dimmed.
+Any user can see that obsolete series are dimmed. Obsolete series do not
+show bug status counts because it is expensive to retrieve the information.
 
     >>> series_xxx = find_tag_by_id(content, 'series-xxx')
     >>> print extract_text(series_xxx)
     xxx series Obsolete
-    Bugs targeted: None
     Blueprints targeted: None
     Use true GTK UI.
 

=== modified file 'lib/lp/registry/templates/codeofconduct-admin.pt'
--- lib/lp/registry/templates/codeofconduct-admin.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/codeofconduct-admin.pt	2009-07-22 14:19:22 +0000
@@ -10,12 +10,8 @@
   i18n:domain="launchpad"
 >
   <body>
-    <metal:heading fill-slot="pageheading">
+    <div metal:fill-slot="main">
       <h1>Administer code of conduct signatures</h1>
-    </metal:heading>
-
-<div metal:fill-slot="main">
-
       <p>
         As an admin, you can
         approve or reject code of conduct signatures,
@@ -90,7 +86,6 @@
         </p>
       </tal:results>
 
-</div>
-
-</body>
+    </div>
+  </body>
 </html>

=== modified file 'lib/lp/registry/templates/productrelease-add-from-series.pt'
--- lib/lp/registry/templates/productrelease-add-from-series.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/productrelease-add-from-series.pt	2009-07-21 17:29:12 +0000
@@ -51,7 +51,7 @@
             var select_menu = get_by_id('field.milestone_for_release');
             var create_milestone_link = Y.Node.create(
                 '<a href="+addmilestone" id="create-milestone-link" ' +
-                'class="add js-action">Create milestone</a>');
+                'class="add js-action sprite">Create milestone</a>');
             select_menu.ancestor().appendChild(create_milestone_link);
             var config = {
                 milestone_form_uri: milestone_form_uri,

=== added file 'lib/lp/registry/templates/productseries-link-translations-branch.pt'
--- lib/lp/registry/templates/productseries-link-translations-branch.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/productseries-link-translations-branch.pt	2009-07-03 09:50:12 +0000
@@ -0,0 +1,25 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  omit-tag="">
+
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  xml:lang="en"
+  lang="en"
+  dir="ltr"
+  metal:use-macro="view/macro:page/onecolumn"
+  i18n:domain="launchpad"
+>
+
+<body>
+<div metal:fill-slot="main">
+  <div metal:use-macro="context/@@launchpad_form/form">
+    <h1 metal:fill-slot="heading"
+      >Set translations export branch for this series</h1>
+  </div>
+</div>
+</body>
+</html>
+</tal:root>

=== modified file 'lib/lp/registry/templates/productseries-status.pt'
--- lib/lp/registry/templates/productseries-status.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/productseries-status.pt	2009-07-21 18:17:49 +0000
@@ -6,24 +6,27 @@
   tal:define="
     series context;
     is_focus context/is_development_focus;
-    bug_count_status view/bugtask_status_counts;
     spec_count_status view/specification_status_counts;"
   >
   <metal:series use-macro="series/@@+macros/detailed_display">
     <div metal:fill-slot="extra">
       <div>
-        Bugs targeted:
-        <tal:statuses repeat="count_status bug_count_status">
-          <span tal:attributes="class string:status${count_status/status/name}">
-            <strong tal:content="count_status/count">2</strong>
-            <tal:status replace="count_status/status/title" /><tal:comma
-              condition="not: repeat/count_status/end">,</tal:comma>
-          </span>
-        </tal:statuses>
-        <tal:no-statuses condition="not: bug_count_status">
-          None
-        </tal:no-statuses>
-        <br />
+        <tal:not-obsolete
+          condition="not: view/is_obsolete"
+          define="bug_count_status view/bugtask_status_counts;">
+          Bugs targeted:
+          <tal:statuses repeat="count_status bug_count_status">
+            <span tal:attributes="class string:status${count_status/status/name}">
+              <strong tal:content="count_status/count">2</strong>
+              <tal:status replace="count_status/status/title" /><tal:comma
+                condition="not: repeat/count_status/end">,</tal:comma>
+            </span>
+          </tal:statuses>
+          <tal:no-statuses condition="not: bug_count_status">
+            None
+          </tal:no-statuses>
+          <br />
+        </tal:not-obsolete>
         Blueprints targeted:
         <tal:statuses repeat="count_status spec_count_status">
           <span tal:attributes="class string:specdelivery${count_status/status/name}">

=== modified file 'lib/lp/registry/vocabularies.py'
--- lib/lp/registry/vocabularies.py	2009-07-18 00:05:49 +0000
+++ lib/lp/registry/vocabularies.py	2009-07-23 17:41:28 +0000
@@ -422,9 +422,13 @@
         """The storm store."""
         return getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
 
-    @property
-    def _private_team_query(self):
-        """Return query for private teams the logged in user belongs to."""
+    def _privateTeamQueryAndTables(self):
+        """Return query tables for private teams.
+
+        The teams are based on membership by the user.
+        Returns a tuple of (query, tables).
+        """
+        tables = []
         logged_in_user = getUtility(ILaunchBag).user
         if logged_in_user is not None:
             celebrities = getUtility(ILaunchpadCelebrities)
@@ -433,22 +437,22 @@
                 # visible.
                 private_query = AND(
                     Not(Person.teamowner == None),
-                    Person.visibility == PersonVisibility.PRIVATE
-                    )
+                    Person.visibility == PersonVisibility.PRIVATE)
             else:
                 private_query = AND(
                     TeamParticipation.person == logged_in_user.id,
                     Not(Person.teamowner == None),
-                    Person.visibility == PersonVisibility.PRIVATE
-                    )
+                    Person.visibility == PersonVisibility.PRIVATE)
+                tables = [Join(TeamParticipation,
+                               TeamParticipation.teamID == Person.id)]
         else:
             private_query = False
-        return private_query
+        return (private_query, tables)
 
     def _doSearch(self, text=""):
         """Return the people/teams whose fti or email address match :text:"""
 
-        logged_in_user = getUtility(ILaunchBag).user
+        private_query, private_tables = self._privateTeamQueryAndTables()
         exact_match = None
 
         # Short circuit if there is no search text - all valid people and
@@ -458,14 +462,13 @@
                 Person,
                 Join(self.cache_table_name,
                      SQL("%s.id = Person.id" % self.cache_table_name)),
-                Join(TeamParticipation,
-                     TeamParticipation.teamID == Person.id),
                 ]
+            tables.extend(private_tables)
             result = self.store.using(*tables).find(
                 Person,
                 And(
                     Or(Person.visibility == PersonVisibility.PUBLIC,
-                       self._private_team_query,
+                       private_query,
                        ),
                     self.extra_clause
                     )
@@ -549,11 +552,9 @@
             public_result.order_by()
 
             # Next search for the private teams.
-            private_tables = [
-                Person,
-                Join(TeamParticipation,
-                     TeamParticipation.teamID == Person.id),
-                ]
+            private_query, private_tables = self._privateTeamQueryAndTables()
+            private_tables = [Person] + private_tables
+
             # Searching for private teams that match can be easier since we
             # are only interested in teams.  Teams can have email addresses
             # but we're electing to ignore them here.
@@ -567,7 +568,7 @@
                 Person,
                 And(
                     Person.id.is_in(private_inner_select),
-                    self._private_team_query,
+                    private_query,
                     )
                 )
 
@@ -642,16 +643,13 @@
     def _doSearch(self, text=""):
         """Return the teams whose fti, IRC, or email address match :text:"""
 
+        private_query, private_tables = self._privateTeamQueryAndTables()
         base_query = Or(
             Person.visibility == PersonVisibility.PUBLIC,
-            self._private_team_query,
+            private_query,
             )
 
-        tables = [
-            Person,
-            LeftJoin(TeamParticipation,
-                     TeamParticipation.teamID == Person.id),
-            ]
+        tables = [Person] + private_tables
 
         if not text:
             query = And(base_query,
@@ -660,19 +658,21 @@
         else:
             name_match_query = SQL("Person.fti @@ ftq(%s)" % quote(text))
 
-            email_match_query = And(
-                EmailAddress.person == Person.id,
-                StartsWith(Lower(EmailAddress.email), text),
-                )
-
-            tables.append(EmailAddress)
-
-            query = And(base_query,
-                        self.extra_clause,
-                        Or(name_match_query, email_match_query),
-                        )
+            email_storm_query = self.store.find(
+                EmailAddress.personID,
+                StartsWith(Lower(EmailAddress.email), text))
+            email_subquery = Alias(email_storm_query._get_select(),
+                                   'EmailAddress')
+            tables += [
+                LeftJoin(email_subquery, EmailAddress.person == Person.id),
+                ]
+
             result = self.store.using(*tables).find(
-                Person, query)
+                Person,
+                And(base_query,
+                    self.extra_clause,
+                    Or(name_match_query,
+                       EmailAddress.person != None)))
 
         # XXX: BradCrittenden 2009-05-07 bug=373228: A bug in Storm prevents
         # setting the 'distinct' and 'limit' options in a single call to

=== modified file 'lib/lp/services/inlinehelp/javascript/inlinehelp.js'
--- lib/lp/services/inlinehelp/javascript/inlinehelp.js	2009-06-30 21:06:27 +0000
+++ lib/lp/services/inlinehelp/javascript/inlinehelp.js	2009-07-20 23:17:14 +0000
@@ -24,8 +24,10 @@
       page elements.
     */
     // The button is inserted in the page dynamically:
+    // Changed from an <input type=button> to a <button> since
+    // IE8 doesn't handle style.css's input{visibility:inherit} correctly.
     $('help-close').innerHTML =
-        '<input id="help-close-btn" type="button" value="Continue">';
+        '<button id="help-close-btn" value="Continue">';
     forEach(findHelpLinks(), setupHelpTrigger);
     initHelpPane();
 }

=== modified file 'lib/lp/soyuz/browser/queue.py'
--- lib/lp/soyuz/browser/queue.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/browser/queue.py	2009-07-19 04:41:14 +0000
@@ -186,7 +186,12 @@
         if len(uploads) == 0:
             return None
 
-        upload_ids = [upload.id for upload in uploads]
+        # Operate only on upload and/or processed delayed-copies.
+        upload_ids = [
+            upload.id
+            for upload in uploads
+            if not (upload.is_delayed_copy and
+                    upload.status != PackageUploadStatus.DONE)]
         binary_file_set = getUtility(IBinaryPackageFileSet)
         binary_files = binary_file_set.getByPackageUploadIDs(upload_ids)
         source_file_set = getUtility(ISourcePackageReleaseFileSet)
@@ -456,3 +461,22 @@
             self.sourcepackagerelease = self.sources[0].sourcepackagerelease
         else:
             self.sourcepackagerelease = None
+
+    @property
+    def pending_delayed_copy(self):
+        """Whether the context is a delayed-copy pending processing."""
+        return (
+            self.is_delayed_copy and self.status != PackageUploadStatus.DONE)
+
+    @property
+    def changesfile(self):
+        """Return the upload changesfile object, even for delayed-copies.
+
+        If the context `PackageUpload` is a delayed-copy, which doesn't
+        have '.changesfile' by design, return the changesfile originally
+        used to upload the contained source.
+        """
+        if self.is_delayed_copy:
+            return self.sources[0].sourcepackagerelease.upload_changesfile
+        return self.context.changesfile
+

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2009-07-17 13:11:44 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2009-07-18 01:03:09 +0000
@@ -907,11 +907,11 @@
     WidgetInputError: ('destination_archive', u'Destination PPA', )
 
 
-=== Copy privacy mismatch ===
+=== Copy private files to public archives ===
 
-Users are only allowed to copy private sources into private PPAs,
-otherwise builders won't be able to retrieve the files for
-building. See `testCopyFromPrivateToPublicPPAs` for more information.
+Users are allowed to copy private sources into private PPAs, however
+it happens via 'delayed-copies' not the usual direct copying method.
+See more information in scripts/packagecopier.py
 
 First we will make Celso's PPA private.
 
@@ -954,14 +954,24 @@
     ...         'field.actions.copy': 'Copy',
     ...         })
 
-The action cannot be performed due to the 'private mismatch'
-error. Nothing was copied to Ubuntu-team PPA.
+    >>> len(view.errors)
+    0
+
+The action is performed as a delayed-copy, and the user is informed of
+it via a page notification.
 
     >>> from canonical.launchpad.testing.pages import extract_text
-    >>> for error in view.errors:
-    ...     print extract_text(error)
-    The following source cannot be copied:
-    private 1.0 in hoary (cannot copy private files into public archives)
-
-    >>> ubuntu_team_ppa.getPublishedSources().count()
-    0
+    >>> for notification in view.request.response.notifications:
+    ...     print extract_text(notification.message)
+    Packages copied to PPA for Ubuntu Team:
+    Delayed copy of private - 1.0 (source)
+
+The delayed-copy request is waiting to be processed in the ACCEPTED
+upload queue.
+
+    >>> from lp.soyuz.interfaces.queue import IPackageUploadSet
+    >>> copy = getUtility(IPackageUploadSet).findSourceUpload(
+    ...     'private', '1.0', ubuntu_team_ppa, ubuntu)
+
+    >>> print copy.status.name
+    ACCEPTED

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2009-07-11 14:46:40 +0000
+++ lib/lp/soyuz/doc/archive.txt	2009-07-20 19:13:31 +0000
@@ -2065,6 +2065,42 @@
     >>> cprov_archive.buildd_secret = ''
     >>> cprov_archive.private = False
 
+Another important aspect of the upload permission for ubuntu main
+archives (PRIMARY, PARTNER and DEBUG) is that in addition to owners
+and users which were specifically granted permissions, members of the
+ubuntu-security' team also have 'launchpad.Append' on them.
+
+In the sampledata, Carlos does not have permission to append contents
+to the Ubuntu main archives.
+
+    >>> primary, partner, debug = ubuntu.all_distro_archives
+
+    >>> login('[e-mail]')
+    >>> check_permission('launchpad.Append', primary)
+    False
+    >>> check_permission('launchpad.Append', partner)
+    False
+    >>> check_permission('launchpad.Append', debug)
+    False
+
+When Carlos becomes a member of the 'ubuntu-security' team he is
+allowed to append to ubuntu main archives. In practice it means that
+Carlos can now *copy* packages directly to ubuntu.
+
+    # Make Carlos a member of the ubuntu-security team.
+    >>> login('[e-mail]')
+    >>> ubuntu_security = getUtility(IPersonSet).getByName(
+    ...     'ubuntu-security')
+    >>> ubuntu_security.addMember(carlos, cprov)
+
+    >>> login('[e-mail]')
+    >>> check_permission('launchpad.Append', primary)
+    True
+    >>> check_permission('launchpad.Append', partner)
+    True
+    >>> check_permission('launchpad.Append', debug)
+    True
+
 
 == Rebuild archives ==
 
@@ -2080,6 +2116,7 @@
 Creating new COPY archive without passing a name results in an
 AssertionError.
 
+    >>> login('[e-mail]')
     >>> rebuild_archive = getUtility(IArchiveSet).new(
     ...     owner=cprov, purpose=ArchivePurpose.COPY,
     ...     distribution=ubuntutest)
@@ -2227,7 +2264,6 @@
     ...
     DistroSeriesNotFound: badseries
 
-
 We can also specify a single source to be copied with the `syncSource`
 call.  This allows a version to be specified so older versions can be
 pulled.
@@ -2312,6 +2348,38 @@
     ...
     CannotCopy: Destination pocket must be 'release' for a PPA.
 
+syncSource() will always use only the latest publication of the
+specific source, ignoring the previous ones. Multiple publications can
+be resulted from copies and/or overrides of the copy candidates in the
+source archive.
+
+    # Create a copy candidate (override_1.0) in ubuntu primary archive
+    # and override its section. Resulting in 2 publications in the
+    # source archive.
+    >>> from lp.soyuz.interfaces.section import ISectionSet
+    >>> source_old = test_publisher.getPubSource(
+    ...     sourcename="overridden", version="1.0")
+    >>> python_section = getUtility(ISectionSet).ensure('python')
+    >>> copy_candidate = source_old.changeOverride(new_section=python_section)
+
+    >>> source_archive = copy_candidate.archive
+    >>> source_archive.getPublishedSources(name="overridden").count()
+    2
+
+    >>> print copy_candidate.section.name
+    python
+
+When syncing 'overridden_1.0' to Mark's PPA, the latest publication,
+the one published in 'python' section, will be used.
+
+    >>> sabdfl.archive.syncSource(
+    ...     source_name='overridden', version='1.0',
+    ...     from_archive=source_archive, to_pocket='release')
+
+    >>> [copy] = sabdfl.archive.getPublishedSources(name="overridden")
+    >>> print copy.section.name
+    python
+
 
 == Publish flag ==
 

=== modified file 'lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt'
--- lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt	2009-05-06 20:53:05 +0000
+++ lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt	2009-07-16 00:00:27 +0000
@@ -49,18 +49,18 @@
 Launchpad-bugs-fixed header.  This is required so that we have some data
 for close_bugs to operate on.
 
-    >>> from canonical.launchpad.interfaces import (
-    ...     PackagePublishingPocket, PackageUploadStatus)
-
+    >>> from canonical.launchpad.interfaces import PackagePublishingPocket
     >>> def add_package_upload(
     ...        source_release, fixing_text,
     ...        pocket=PackagePublishingPocket.RELEASE,
-    ...        archive=None):
+    ...        archive=None, distroseries=None):
     ...     """Create a PackageUpload record."""
     ...     changes = changes_template % fixing_text
+    ...     if distroseries is None:
+    ...         distroseries = ubuntu_hoary
     ...     if archive is None:
-    ...         archive = ubuntu_hoary.main_archive
-    ...     queue_item = ubuntu_hoary.createQueueEntry(
+    ...         archive = distroseries.main_archive
+    ...     queue_item = distroseries.createQueueEntry(
     ...         archive=archive,
     ...         pocket=pocket,
     ...         changesfilename='%s.changes' % source_release.name,
@@ -68,7 +68,6 @@
     ...     source_queue = queue_item.addSource(source_release)
     ...     return queue_item
 
-
 Throughout this document we'll now create PackageUpload records for various
 packages in the sample data (e.g. pmount, cdrkit) using this helper function.
 
@@ -215,7 +214,7 @@
     >>> cdrkit_bug_id = cdrkit_ubuntu.createBug(bug_params).id
 
     >>> queue_item_id = add_package_upload(
-    ...     cdrkit_release, cdrkit_bug_id, 
+    ...     cdrkit_release, cdrkit_bug_id,
     ...     pocket=PackagePublishingPocket.PROPOSED).id
 
     >>> close_bugs_and_check_status([cdrkit_bug_id], queue_item_id)
@@ -226,7 +225,7 @@
 #295621).
 
     >>> queue_item_id = add_package_upload(
-    ...     cdrkit_release, cdrkit_bug_id, 
+    ...     cdrkit_release, cdrkit_bug_id,
     ...     pocket=PackagePublishingPocket.BACKPORTS).id
 
     >>> close_bugs_and_check_status([cdrkit_bug_id], queue_item_id)
@@ -246,6 +245,28 @@
     Before: NEW
     After: NEW
 
+Delayed-copies to allowed archives and pockets will close bugs when
+processed.
+
+    # Create the cdrkit 'original upload' in ubuntu/breezy-autotest
+    # with an appropriate 'changelog_entry'.
+    >>> original_upload = add_package_upload(
+    ...     cdrkit_release, cdrkit_bug_id,
+    ...     distroseries=cdrkit_release.upload_distroseries)
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> removeSecurityProxy(cdrkit_release).changelog_entry = 'Something!'
+
+    # Create a delayed-copy for cdrkit in ubuntu/hoary.
+    >>> from lp.soyuz.interfaces.queue import IPackageUploadSet
+    >>> delayed_copy = getUtility(IPackageUploadSet).createDelayedCopy(
+    ...     archive=ubuntu.main_archive, distroseries=ubuntu_hoary,
+    ...     pocket=PackagePublishingPocket.RELEASE, signing_key=None)
+    >>> unused = delayed_copy.addSource(cdrkit_release)
+
+    >>> close_bugs_and_check_status([cdrkit_bug_id], delayed_copy.id)
+    Before: NEW
+    After: FIXRELEASED
+
 It's possible to specify more than one bug in the Launchpad-bugs-fixed
 header, each will be marked as Fix Released. If a nonexistent bug,
 '666', is specified, it's ignored.

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue.txt'
--- lib/lp/soyuz/doc/distroseriesqueue.txt	2009-07-16 03:31:45 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue.txt	2009-07-16 15:06:35 +0000
@@ -1093,16 +1093,16 @@
 
    >>> unused = delayed_copy.addSource(a_source_release)
 
-IPackageUpload.acceptFromCopy() checks and accepts a delayed-copy
-record. It also closes related bug reports and grant karma to people
-related with the upload, although it doesn't send any emails.
+IPackageUpload.acceptFromCopy() simply checks and accepts a
+delayed-copy record. Bugs mentioned in the changelog are closed by
+`process-accepted` (transition to ACCEPTED to DONE) see
+closing-bugs-from-changelogs.txt for more information.
+
+   >>> print delayed_copy.status.name
+   NEW
 
    >>> delayed_copy.acceptFromCopy()
 
-   >>> transaction.commit()
-   >>> pop_notifications()
-   []
-
    >>> print delayed_copy.status.name
    ACCEPTED
 

=== modified file 'lib/lp/soyuz/interfaces/queue.py'
--- lib/lp/soyuz/interfaces/queue.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/interfaces/queue.py	2009-07-19 04:41:14 +0000
@@ -274,19 +274,25 @@
          * Publish and close bugs for 'single-source' uploads.
          * Skip bug-closing for PPA uploads.
          * Grant karma to people involved with the upload.
+
+        :raises: AssertionError if the context is a delayed-copy.
         """
 
     def acceptFromCopy():
         """Perform upload acceptance for a delayed-copy record.
 
          * Move the upload to accepted queue in all cases.
-         * Close bugs for uploaded sources (skip imported ones).
+
+        :raises: AssertionError if the context is not a delayed-copy or
+            has no sources associated to it.
         """
 
     def acceptFromQueue(announce_list, logger=None, dry_run=False):
         """Call setAccepted, do a syncUpdate, and send notification email.
 
          * Grant karma to people involved with the upload.
+
+        :raises: AssertionError if the context is a delayed-copy.
         """
 
     def rejectFromQueue(logger=None, dry_run=False):

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2009-07-18 21:19:37 +0000
+++ lib/lp/soyuz/model/archive.py	2009-07-20 18:05:13 +0000
@@ -1082,9 +1082,9 @@
             raise SourceNotFound(e)
 
         source = from_archive.getPublishedSources(
-            name=source_name, version=version, exact_match=True)
+            name=source_name, version=version, exact_match=True)[0]
 
-        self._copySources(source, to_pocket, to_series, include_binaries)
+        self._copySources([source], to_pocket, to_series, include_binaries)
 
     def _copySources(self, sources, to_pocket, to_series=None,
                      include_binaries=False):

=== modified file 'lib/lp/soyuz/model/archivepermission.py'
--- lib/lp/soyuz/model/archivepermission.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/model/archivepermission.py	2009-07-21 08:27:00 +0000
@@ -121,10 +121,8 @@
         clauses = ["""
             ArchivePermission.archive = %s AND
             ArchivePermission.permission = %s AND
-            EXISTS (SELECT TeamParticipation.person
-                    FROM TeamParticipation
-                    WHERE TeamParticipation.person = %s AND
-                          TeamParticipation.team = ArchivePermission.person)
+            ArchivePermission.person = TeamParticipation.team AND
+            TeamParticipation.person = %s
             """ % sqlvalues(archive, permission, person)
             ]
 
@@ -149,7 +147,7 @@
 
         query = " AND ".join(clauses)
         auth = ArchivePermission.select(
-            query, clauseTables=["TeamParticipation"], distinct=True,
+            query, clauseTables=["TeamParticipation"],
             prejoins=prejoins)
 
         return auth
@@ -337,11 +335,11 @@
             SELECT ap.id
             FROM archivepermission ap, teamparticipation tp
             WHERE
-                (ap.person = ? OR (ap.person = tp.team AND tp.person = ?))
+                ap.person = tp.team AND tp.person = ?
                 AND ap.archive = ?
                 AND ap.packageset IS NOT NULL
         '''
-        query = SQL(query, (person.id, person.id, archive.id))
+        query = SQL(query, (person.id, archive.id))
         return store.find(ArchivePermission, In(ArchivePermission.id, query))
 
     def uploadersForPackageset(
@@ -375,10 +373,10 @@
             SELECT ap.id
             FROM archivepermission ap, teamparticipation tp
             WHERE
-                (ap.person = ? OR (ap.person = tp.team AND tp.person = ?))
+                ap.person = tp.team AND tp.person = ?
                 AND ap.packageset = ? AND ap.archive = ?
         '''
-        query = SQL(query, (person.id, person.id, packageset.id, archive.id))
+        query = SQL(query, (person.id, packageset.id, archive.id))
         permissions = list(
             store.find(ArchivePermission, In(ArchivePermission.id, query)))
         if len(permissions) > 0:
@@ -444,14 +442,14 @@
                 archivepermission ap, teamparticipation tp,
                 packagesetsources pss, flatpackagesetinclusion fpsi
             WHERE
-                (ap.person = ? OR (ap.person = tp.team AND tp.person = ?))
+                ap.person = tp.team AND tp.person = ?
                 AND ap.packageset = fpsi.parent
                 AND pss.packageset = fpsi.child
                 AND pss.sourcepackagename = ?
                 AND ap.archive = ?
         '''
         query = SQL(
-            query, (person.id, person.id, sourcepackagename.id, archive.id))
+            query, (person.id, sourcepackagename.id, archive.id))
         return store.find(ArchivePermission, In(ArchivePermission.id, query))
 
     def packagesetsForSource(
@@ -491,9 +489,9 @@
             # Query parameters for the first WHERE clause.
             (archive.id, sourcepackagename.id) +
             # Query parameters for the second WHERE clause.
-            (sourcepackagename.id,) + (person.id,)*2 + archive_params + 
+            (sourcepackagename.id,) + (person.id,) + archive_params + 
             # Query parameters for the third WHERE clause.
-            (sourcepackagename.id,) + (person.id,)*2 + archive_params)
+            (sourcepackagename.id,) + (person.id,) + archive_params)
 
         query = '''
         SELECT CASE
@@ -511,7 +509,7 @@
               teamparticipation tp
             WHERE
               pss.sourcepackagename = %s
-              AND (ap.person = %s OR (ap.person = tp.team AND tp.person = %s))
+              AND ap.person = tp.team AND tp.person = %s
               AND pss.packageset = ap.packageset AND ap.explicit = TRUE
               AND ap.permission = %s AND ap.archive = %s)
           ELSE (
@@ -521,7 +519,7 @@
               teamparticipation tp, flatpackagesetinclusion fpsi
             WHERE
               pss.sourcepackagename = %s
-              AND (ap.person = %s OR (ap.person = tp.team AND tp.person = %s))
+              AND ap.person = tp.team AND tp.person = %s
               AND pss.packageset = fpsi.child AND fpsi.parent = ap.packageset
               AND ap.permission = %s AND ap.archive = %s)
         END AS number_of_permitted_package_sets;

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/model/queue.py	2009-07-19 04:41:14 +0000
@@ -57,7 +57,8 @@
     PackageUploadStatus, PackageUploadCustomFormat)
 from lp.registry.interfaces.person import IPersonSet
 from lp.soyuz.interfaces.publishing import (
-    PackagePublishingPocket, PackagePublishingStatus, pocketsuffix)
+    ISourcePackagePublishingHistory, PackagePublishingPocket,
+    PackagePublishingStatus, pocketsuffix)
 from lp.soyuz.interfaces.queue import (
     IPackageUpload, IPackageUploadBuild, IPackageUploadCustom,
     IPackageUploadQueue, IPackageUploadSource, IPackageUploadSet,
@@ -368,21 +369,8 @@
         assert self.is_delayed_copy, 'Can only process delayed-copies.'
         assert self.sources.count() == 1, (
             'Source is mandatory for delayed copies.')
-
         self.setAccepted()
 
-        # XXX cprov 2009-06-22 bug=390851: self.sourcepackagerelease
-        # is cached, we cannot rely on it.
-        sourcepackagerelease = self.sources[0].sourcepackagerelease
-
-        # Close bugs if possible, skip imported sources.
-        original_changesfile = sourcepackagerelease.upload_changesfile
-        if original_changesfile is not None:
-            changesfile_object = StringIO.StringIO(
-                original_changesfile.read())
-            close_bugs_for_queue_item(
-                self, changesfile_object=changesfile_object)
-
     def rejectFromQueue(self, logger=None, dry_run=False):
         """See `IPackageUpload`."""
         self.setRejected()
@@ -538,6 +526,11 @@
                 for new_file in update_files_privacy(pub_record):
                     debug(logger,
                           "Re-uploaded %s to librarian" % new_file.filename)
+                if ISourcePackagePublishingHistory.providedBy(pub_record):
+                    pas_verify = BuildDaemonPackagesArchSpecific(
+                        config.builddmaster.root, self.distroseries)
+                    pub_record.createMissingBuilds(
+                        pas_verify=pas_verify, logger=logger)
 
         self.setDone()
 

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2009-07-20 15:05:42 +0000
@@ -35,7 +35,6 @@
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue)
-from canonical.librarian.interfaces import ILibrarianClient
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
@@ -574,12 +573,9 @@
         return change
 
     def attachTranslationFiles(self, tarball_alias, is_published,
-        importer=None):
+                               importer=None):
         """See ISourcePackageRelease."""
-        client = getUtility(ILibrarianClient)
-
-        tarball_file = client.getFileByAlias(tarball_alias.id)
-        tarball = tarball_file.read()
+        tarball = tarball_alias.read()
 
         if importer is None:
             importer = getUtility(ILaunchpadCelebrities).rosetta_experts

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2009-07-19 04:41:14 +0000
@@ -30,11 +30,13 @@
     build_package_location)
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, CannotCopy)
-from lp.soyuz.interfaces.build import BuildSetStatus
+from lp.soyuz.interfaces.build import (
+    BuildStatus, BuildSetStatus)
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
     active_publishing_status)
-from lp.soyuz.interfaces.queue import IPackageUploadSet
+from lp.soyuz.interfaces.queue import (
+    IPackageUpload, IPackageUploadSet)
 from lp.soyuz.scripts.ftpmasterbase import (
     SoyuzScript, SoyuzScriptError)
 from lp.soyuz.scripts.processaccepted import (
@@ -74,8 +76,8 @@
 
     return new_lfa
 
-# XXX cprov 2009-06-12: These two functions could be incorporated in
-# ISPPH and BPPH. I just don't see a clear benefit in doing that right now.
+# XXX cprov 2009-06-12: this function should be incorporated in
+# IPublishing.
 def update_files_privacy(pub_record):
     """Update file privacy according the publishing detination
 
@@ -133,23 +135,43 @@
     return re_uploaded_files
 
 
+# XXX cprov 2009-07-01: should be part of `ISourcePackagePublishingHistory`.
+def has_restricted_files(source):
+    """Whether or not a given source files has restricted files."""
+    for source_file in source.sourcepackagerelease.files:
+        if source_file.libraryfile.restricted:
+            return True
+
+    for binary in source.getBuiltBinaries():
+        for binary_file in binary.binarypackagerelease.files:
+            if binary_file.libraryfile.restricted:
+                return True
+
+    return False
+
+
 class CheckedCopy:
     """Representation of a copy that was checked and approved.
 
     Decorates `ISourcePackagePublishingHistory`, tweaking
     `getStatusSummaryForBuilds` to return `BuildSetStatus.NEEDSBUILD`
     for source-only copies.
+
+    It also store the 'delayed' boolean, which controls the way this source
+    should be copied to the destionation archive (see `_do_delayed_copy` and
+    `_do_direct_copy`)
     """
     delegates(ISourcePackagePublishingHistory)
 
-    def __init__(self, context, include_binaries):
+    def __init__(self, context, include_binaries, delayed):
         self.context = context
         self.include_binaries = include_binaries
+        self.delayed = delayed
 
     def getStatusSummaryForBuilds(self):
         """Always `BuildSetStatus.NEEDSBUILD` for source-only copies."""
         if self.include_binaries:
-            self.context.getStatusSummaryForBuilds()
+            return self.context.getStatusSummaryForBuilds()
         else:
             return {'status': BuildSetStatus.NEEDSBUILD}
 
@@ -160,9 +182,10 @@
     Allows the checker function to identify conflicting copy candidates
     within the copying batch.
     """
-    def __init__(self, archive, include_binaries):
+    def __init__(self, archive, include_binaries, allow_delayed_copies=True):
         self.archive = archive
         self.include_binaries = include_binaries
+        self.allow_delayed_copies = allow_delayed_copies
         self._inventory = {}
 
     def _getInventoryKey(self, candidate):
@@ -174,11 +197,18 @@
         return (
             candidate.source_package_name, candidate.source_package_version)
 
-    def addCopy(self, source):
+    def addCopy(self, source, delayed):
         """Story a copy in the inventory as a `CheckedCopy` instance."""
         inventory_key = self._getInventoryKey(source)
+        checked_copy = CheckedCopy(source, self.include_binaries, delayed)
         candidates = self._inventory.setdefault(inventory_key, [])
-        candidates.append(CheckedCopy(source, self.include_binaries))
+        candidates.append(checked_copy)
+
+    def getCheckedCopies(self):
+        """Return a list of copies allowed to be performed."""
+        for copies in self._inventory.values():
+            for copy in copies:
+                yield copy
 
     def getConflicts(self, candidate):
         """Conflicting `CheckedCopy` objects in the inventory.
@@ -356,34 +386,27 @@
                     "version older than the %s published in %s" %
                     (ancestry.displayname, ancestry.distroseries.name))
 
-
-def check_privacy_mismatch(source, archive):
-    """Whether or not source files match the archive privacy.
-
-    Public source files can be copied to any archive, it does not
-    represent a 'privacy mismatch'.
-
-    On the other hand, private source files can be copied to private
-    archives where builders will fetch it directly from the repository
-    and not from the restricted librarian.
-    """
-    if archive.private:
-        return False
-
-    for source_file in source.sourcepackagerelease.files:
-        if source_file.libraryfile.restricted:
-            return True
-
-    for binary in source.getBuiltBinaries():
-        for binary_file in binary.binarypackagerelease.files:
-            if binary_file.libraryfile.restricted:
-                return True
-
-    return False
+        delayed = (
+            self.allow_delayed_copies and
+            not self.archive.private and
+            has_restricted_files(source))
+
+        if delayed:
+            upload_conflict = getUtility(IPackageUploadSet).findSourceUpload(
+                name=source.sourcepackagerelease.name,
+                version=source.sourcepackagerelease.version,
+                archive=self.archive, distribution=series.distribution)
+            if upload_conflict is not None:
+                raise CannotCopy(
+                    'same version already uploaded and waiting in '
+                    'ACCEPTED queue')
+
+        # Copy is approved, update the copy inventory.
+        self.addCopy(source, delayed)
 
 
 def do_copy(sources, archive, series, pocket, include_binaries=False,
-            deny_privacy_mismatch=True):
+            allow_delayed_copies=True):
     """Perform the complete copy of the given sources incrementally.
 
     Verifies if each copy can be performed using `CopyChecker` and
@@ -402,9 +425,9 @@
     :param: include_binaries: optional boolean, controls whether or
         not the published binaries for each given source should be also
         copied along with the source.
-    :param deny_privacy_mismatch: boolean indicating whether or not private
-        sources can be copied to public archives. Defaults to True, only
-        set as False in the UnembargoPackage context.
+    :param allow_delayed_copies: boolean indicating whether or not private
+        sources can be copied to public archives using delayed_copies.
+        Defaults to True, only set as False in the UnembargoPackage context.
 
     :raise CannotCopy when one or more copies were not allowed. The error
         will contain the reason why each copy was denied.
@@ -415,42 +438,35 @@
     """
     copies = []
     errors = []
-    copy_checker = CopyChecker(archive, include_binaries)
+    copy_checker = CopyChecker(
+        archive, include_binaries, allow_delayed_copies)
 
     for source in sources:
         if series is None:
             destination_series = source.distroseries
         else:
             destination_series = series
-
         try:
             copy_checker.checkCopy(source, destination_series, pocket)
         except CannotCopy, reason:
             errors.append("%s (%s)" % (source.displayname, reason))
             continue
 
-        # For now, deny copies implying in file privacy mismatch.
-        if (deny_privacy_mismatch and
-            check_privacy_mismatch(source, archive)):
-            errors.append(
-                "%s (cannot copy private files into public archives)" %
-                source.displayname)
-            continue
-
-        # Update the copy inventory.
-        copy_checker.addCopy(source)
-
     if len(errors) != 0:
         raise CannotCopy("\n".join(errors))
 
-    for source in sources:
+    for source in copy_checker.getCheckedCopies():
         if series is None:
             destination_series = source.distroseries
         else:
             destination_series = series
-
-        sub_copies = _do_direct_copy(
-            source, archive, destination_series, pocket, include_binaries)
+        if source.delayed:
+            delayed_copy = _do_delayed_copy(
+                source, archive, destination_series, pocket, include_binaries)
+            sub_copies = [delayed_copy]
+        else:
+            sub_copies = _do_direct_copy(
+                source, archive, destination_series, pocket, include_binaries)
 
         copies.extend(sub_copies)
 
@@ -534,6 +550,21 @@
     return copies
 
 
+class DelayedCopy:
+    """Decorates `IPackageUpload` with a more descriptive 'displayname'."""
+
+    delegates(IPackageUpload)
+
+    def __init__(self, context):
+        self.context = context
+
+    @property
+    def displayname(self):
+        return 'Delayed copy of %s (%s)' % (
+            self.context.sourcepackagerelease.title,
+            self.context.displayarchs)
+
+
 def _do_delayed_copy(source, archive, series, pocket, include_binaries):
     """Schedule the given source for copy.
 
@@ -571,6 +602,8 @@
     # If binaries are included in the copy we include binary custom files.
     if include_binaries:
         for build in source.getBuilds():
+            if build.buildstate != BuildStatus.FULLYBUILT:
+                continue
             delayed_copy.addBuild(build)
             original_build_upload = build.package_upload
             for custom in original_build_upload.customfiles:
@@ -586,11 +619,7 @@
     # the destination context.
     delayed_copy.acceptFromCopy()
 
-    # XXX cprov 2009-06-22 bug=390845: `IPackageUpload.displayname`
-    # implementation is very poor, if we can't fix in place we should
-    # build a decorated object implemented a more complete 'displayname'
-    # property.
-    return delayed_copy
+    return DelayedCopy(delayed_copy)
 
 
 class PackageCopier(SoyuzScript):
@@ -609,7 +638,7 @@
 
     usage = '%prog -s warty mozilla-firefox --to-suite hoary'
     description = 'MOVE or COPY a published package to another suite.'
-    deny_privacy_mismatch = True
+    allow_delayed_copies = True
 
     def add_my_options(self):
 
@@ -707,11 +736,15 @@
             copies = do_copy(
                 sources, self.destination.archive,
                 self.destination.distroseries, self.destination.pocket,
-                self.options.include_binaries, self.deny_privacy_mismatch)
+                self.options.include_binaries, self.allow_delayed_copies)
         except CannotCopy, error:
             self.logger.error(str(error))
             return []
 
+        self.logger.info("Copied:")
+        for copy in copies:
+            self.logger.info('\t%s' % copy.displayname)
+
         if len(copies) == 1:
             self.logger.info(
                 "%s package successfully copied." % len(copies))
@@ -772,7 +805,7 @@
     description = ("Unembargo packages in a private PPA by copying to the "
                    "specified location and re-uploading any files to the "
                    "unrestricted librarian.")
-    deny_privacy_mismatch = False
+    allow_delayed_copies = False
 
     def add_my_options(self):
         """Add -d, -s, dry-run and confirmation options."""

=== modified file 'lib/lp/soyuz/scripts/processaccepted.py'
--- lib/lp/soyuz/scripts/processaccepted.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/processaccepted.py	2009-07-19 04:41:14 +0000
@@ -20,6 +20,8 @@
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.publishing import PackagePublishingPocket
 from lp.soyuz.interfaces.queue import IPackageUploadSet
+
+
 def get_bugs_from_changes_file(changes_file):
     """Parse the changes file and return a list of bugs referenced by it.
 
@@ -54,6 +56,7 @@
         queue_item = getUtility(IPackageUploadSet).get(queue_id)
         close_bugs_for_queue_item(queue_item)
 
+
 def can_close_bugs(target):
     """Whether or not bugs should be closed in the given target.
 
@@ -74,6 +77,7 @@
 
     return True
 
+
 def close_bugs_for_queue_item(queue_item, changesfile_object=None):
     """Close bugs for a given queue item.
 
@@ -96,12 +100,17 @@
         return
 
     if changesfile_object is None:
-        changesfile_object = queue_item.changesfile
+        if queue_item.is_delayed_copy:
+            sourcepackagerelease = queue_item.sources[0].sourcepackagerelease
+            changesfile_object = sourcepackagerelease.upload_changesfile
+        else:
+            changesfile_object = queue_item.changesfile
 
     for source_queue_item in queue_item.sources:
         close_bugs_for_sourcepackagerelease(
             source_queue_item.sourcepackagerelease, changesfile_object)
 
+
 def close_bugs_for_sourcepublication(source_publication):
     """Close bugs for a given sourcepublication.
 
@@ -121,6 +130,7 @@
     close_bugs_for_sourcepackagerelease(
         sourcepackagerelease, changesfile_object)
 
+
 def close_bugs_for_sourcepackagerelease(source_release, changesfile_object):
     """Close bugs for a given source.
 

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-07-17 00:26:05 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-07-19 04:41:14 +0000
@@ -28,7 +28,8 @@
 from lp.soyuz.adapters.packagelocation import PackageLocationError
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, CannotCopy)
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.build import (
+    BuildSetStatus, BuildStatus)
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
@@ -42,7 +43,7 @@
 from lp.soyuz.model.processor import ProcessorFamily
 from lp.soyuz.scripts.ftpmasterbase import SoyuzScriptError
 from lp.soyuz.scripts.packagecopier import (
-    CopyChecker, _do_delayed_copy, _do_direct_copy, PackageCopier,
+    CopyChecker, do_copy, _do_delayed_copy, _do_direct_copy, PackageCopier,
     re_upload_file, UnembargoSecurityPackage, update_files_privacy)
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import (
@@ -387,33 +388,81 @@
 class CopyCheckerHarness:
     """Basic checks common for all scenarios."""
 
-    def assertCanCopySourceOnly(self):
-        """checkCopy() for source-only copy returns None."""
+    def assertCanCopySourceOnly(self, delayed=False):
+        """Source-only copy is allowed.
+
+        Initialise a `CopyChecker` and assert a `checkCopy` call returns
+        None (more importantly, doesn't raise `CannotCopy`) in the test
+        suite context.
+
+        Also assert that:
+         * 1 'CheckedCopy' was allowed and stored as so.
+         * Since it was source-only, the `CheckedCopy` objects is in
+           NEEDSBUILD state.
+         * Finally check whether is a delayed-copy or not according to the
+           given state.
+        """
         copy_checker = CopyChecker(self.archive, include_binaries=False)
         self.assertIs(
             None,
             copy_checker.checkCopy(self.source, self.series, self.pocket))
-
-    def assertCanCopyBinaries(self):
-        """checkCopy() for copy including binaries returns None."""
+        checked_copies = list(copy_checker.getCheckedCopies())
+        self.assertEquals(1, len(checked_copies))
+        [checked_copy] = checked_copies
+        self.assertEquals(
+            BuildSetStatus.NEEDSBUILD,
+            checked_copy.getStatusSummaryForBuilds()['status'])
+        self.assertEquals(delayed, checked_copy.delayed)
+
+    def assertCanCopyBinaries(self, delayed=False):
+        """Source and binary copy is allowed.
+
+        Initialise a `CopyChecker` and assert a `checkCopy` call returns
+        None (more importantly, doesn't raise `CannotCopy`) in the test
+        suite context.
+
+        Also assert that:
+         * 1 'CheckedCopy' was allowed and stored as so.
+         * The `CheckedCopy` objects is in FULLYBUILT_PENDING or FULLYBUILT
+           status, so there are binaries to be copied.
+         * Finally check whether is a delayed-copy or not according to the
+           given state.
+        """
         copy_checker = CopyChecker(self.archive, include_binaries=True)
         self.assertIs(
             None,
             copy_checker.checkCopy(self.source, self.series, self.pocket))
+        checked_copies = list(copy_checker.getCheckedCopies())
+        self.assertEquals(1, len(checked_copies))
+        [checked_copy] = checked_copies
+        self.assertTrue(
+            checked_copy.getStatusSummaryForBuilds()['status'] >=
+            BuildSetStatus.FULLYBUILT_PENDING)
+        self.assertEquals(delayed, checked_copy.delayed)
 
     def assertCannotCopySourceOnly(self, msg):
-        """checkCopy() for source-only copy raises CannotCopy."""
+        """`CopyChecker.checkCopy()` for source-only copy raises CannotCopy.
+
+        No `CheckedCopy` is stored.
+        """
         copy_checker = CopyChecker(self.archive, include_binaries=False)
         self.assertRaisesWithContent(
             CannotCopy, msg,
             copy_checker.checkCopy, self.source, self.series, self.pocket)
+        checked_copies = list(copy_checker.getCheckedCopies())
+        self.assertEquals(0, len(checked_copies))
 
     def assertCannotCopyBinaries(self, msg):
-        """checkCopy() for copy including binaries raises CannotCopy."""
+        """`CopyChecker.checkCopy()` including binaries raises CannotCopy.
+
+        No `CheckedCopy` is stored.
+        """
         copy_checker = CopyChecker(self.archive, include_binaries=True)
         self.assertRaisesWithContent(
             CannotCopy, msg,
             copy_checker.checkCopy, self.source, self.series, self.pocket)
+        checked_copies = list(copy_checker.getCheckedCopies())
+        self.assertEquals(0, len(checked_copies))
 
     def test_cannot_copy_binaries_from_building(self):
         [build] = self.source.createMissingBuilds()
@@ -549,6 +598,32 @@
             status=PackagePublishingStatus.PUBLISHED)
         self.assertCanCopySourceOnly()
 
+    def switchToAPrivateSource(self):
+        """Override the probing source with a private one."""
+        private_archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest,
+            purpose=ArchivePurpose.PPA)
+        private_archive.buildd_secret = 'x'
+        private_archive.private = True
+
+        self.source = self.test_publisher.getPubSource(
+            archive=private_archive)
+
+    def test_can_copy_only_source_from_private_archives(self):
+        # Source-only copies from private archives to public ones
+        # are allowed and result in a delayed-copy.
+        self.switchToAPrivateSource()
+        self.assertCanCopySourceOnly(delayed=True)
+
+    def test_can_copy_binaries_from_private_archives(self):
+        # Source and binary copies from private archives to public ones
+        # are allowed and result in a delayed-copy.
+        self.switchToAPrivateSource()
+        self.test_publisher.getPubBinaries(
+            pub_source=self.source,
+            status=PackagePublishingStatus.PUBLISHED)
+        self.assertCanCopyBinaries(delayed=True)
+
 
 class CopyCheckerTestCase(TestCaseWithFactory):
 
@@ -658,7 +733,6 @@
             None,
             copy_checker.checkCopy(
                 source, source.distroseries, source.pocket))
-        copy_checker.addCopy(source)
 
         # The second source-only copy, for hoary-test, fails, since it
         # conflicts with the just-approved copy.
@@ -669,6 +743,73 @@
             copy_checker.checkCopy,
             copied_source, copied_source.distroseries, copied_source.pocket)
 
+    def test_checkCopy_identifies_delayed_copies_conflicts(self):
+        # checkCopy() detects copy conflicts in the upload queue for
+        # delayed-copies. This is mostly caused by previous delayed-copies
+        # that are waiting to be processed.
+
+        # Create a private archive with a restricted source publication.
+        private_archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest,
+            purpose=ArchivePurpose.PPA)
+        private_archive.buildd_secret = 'x'
+        private_archive.private = True
+        source = self.test_publisher.getPubSource(archive=private_archive)
+
+        archive = self.test_publisher.ubuntutest.main_archive
+        series = source.distroseries
+        pocket = source.pocket
+
+        # Commit so the just-created files are accessible and perform
+        # the delayed-copy.
+        self.layer.txn.commit()
+        do_copy([source], archive, series, pocket, include_binaries=False)
+
+        # Repeating the copy is denied.
+        copy_checker = CopyChecker(archive, include_binaries=False)
+        self.assertRaisesWithContent(
+            CannotCopy,
+            'same version already uploaded and waiting in ACCEPTED queue',
+            copy_checker.checkCopy, source, series, pocket)
+
+    def test_checkCopy_suppressing_delayed_copies(self):
+        # `CopyChecker` by default will request delayed-copies when it's
+        # the case (restricted files being copied to public archives).
+        # However this feature can be turned off, and the operation can
+        # be performed as a direct-copy by passing 'allow_delayed_copies'
+        # as False when initialising `CopyChecker`.
+        # This aspect is currently only used in `UnembargoSecurityPackage`
+        # script class, because it performs the file privacy fixes in
+        # place.
+
+        # Create a private archive with a restricted source publication.
+        private_archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest,
+            purpose=ArchivePurpose.PPA)
+        private_archive.buildd_secret = 'x'
+        private_archive.private = True
+        source = self.test_publisher.getPubSource(archive=private_archive)
+
+        archive = self.test_publisher.ubuntutest.main_archive
+        series = source.distroseries
+        pocket = source.pocket
+
+        # Normally `CopyChecker` would store a delayed-copy representing
+        # this operation, since restricted files are being copied to
+        # public archives.
+        copy_checker = CopyChecker(archive, include_binaries=False)
+        copy_checker.checkCopy(source, series, pocket)
+        [checked_copy] = list(copy_checker.getCheckedCopies())
+        self.assertTrue(checked_copy.delayed)
+
+        # When 'allow_delayed_copies' is off, a direct-copy will be
+        # scheduled.
+        copy_checker = CopyChecker(
+            archive, include_binaries=False, allow_delayed_copies=False)
+        copy_checker.checkCopy(source, series, pocket)
+        [checked_copy] = list(copy_checker.getCheckedCopies())
+        self.assertFalse(checked_copy.delayed)
+
 
 class DoDirectCopyTestCase(TestCaseWithFactory):
 
@@ -722,6 +863,7 @@
 class DoDelayedCopyTestCase(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
+    dbuser = config.archivepublisher.dbuser
 
     def setUp(self):
         super(DoDelayedCopyTestCase, self).setUp()
@@ -763,22 +905,32 @@
         self.test_publisher.breezy_autotest.status = (
             DistroSeriesStatus.CURRENT)
 
+        # Setup and execute the delayed copy procedure.
+        copy_archive = self.test_publisher.ubuntutest.main_archive
+        copy_series = source.distroseries
+        copy_pocket = PackagePublishingPocket.SECURITY
+
         # Commit for making the just-create library files available.
         self.layer.txn.commit()
-
-        # Setup and execute the delayed copy procedure.
-        copy_archive = self.test_publisher.ubuntutest.main_archive
-        copy_series = source.distroseries
-        copy_pocket = PackagePublishingPocket.SECURITY
+        self.layer.switchDbUser(self.dbuser)
 
         delayed_copy = _do_delayed_copy(
             source, copy_archive, copy_series, copy_pocket, True)
 
+        self.layer.txn.commit()
+        self.layer.switchDbUser('launchpad')
+
         # A delayed-copy `IPackageUpload` record is returned.
         self.assertTrue(delayed_copy.is_delayed_copy)
         self.assertEquals(
             PackageUploadStatus.ACCEPTED, delayed_copy.status)
 
+        # The returned object has a more descriptive 'displayname'
+        # attribute than plain `IPackageUpload` instances.
+        self.assertEquals(
+            'Delayed copy of foo - 666 (source, i386, raw-dist-upgrader)',
+            delayed_copy.displayname)
+
         # It is targeted to the right publishing context.
         self.assertEquals(copy_archive, delayed_copy.archive)
         self.assertEquals(copy_series, delayed_copy.distroseries)
@@ -801,6 +953,68 @@
             [custom_file],
             [custom.libraryfilealias for custom in delayed_copy.customfiles])
 
+    def createPartiallyBuiltDelayedCopyContext(self):
+        """Allow tests on delayed-copies of partially built sources.
+
+        Create an architecture-specific source publication in a private PPA
+        capable of building for i386 and hppa architectures.
+
+        Upload and publish only the i386 binary, letting the hppa build
+        in pending status.
+        """
+        self.test_publisher.prepareBreezyAutotest()
+
+        ppa = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest,
+            purpose=ArchivePurpose.PPA)
+        ppa.buildd_secret = 'x'
+        ppa.private = True
+        ppa.require_virtualized = False
+
+        source = self.test_publisher.getPubSource(
+            archive=ppa, architecturehintlist='any')
+
+        [build_hppa, build_i386] = source.createMissingBuilds()
+        lazy_bin = self.test_publisher.uploadBinaryForBuild(
+            build_i386, 'lazy-bin')
+        self.test_publisher.publishBinaryInArchive(lazy_bin, source.archive)
+        changes_file_name = '%s_%s_%s.changes' % (
+            lazy_bin.name, lazy_bin.version, build_i386.arch_tag)
+        package_upload = self.test_publisher.addPackageUpload(
+            ppa, build_i386.distroarchseries.distroseries,
+            build_i386.pocket, changes_file_content='anything',
+            changes_file_name=changes_file_name)
+        package_upload.addBuild(build_i386)
+
+        return source
+
+    def test_do_delayed_copy_of_partially_built_sources(self):
+        # delayed-copies of partially built sources are allowed and only
+        # the FULLYBUILT builds are copied.
+        source = self.createPartiallyBuiltDelayedCopyContext()
+
+        # Setup and execute the delayed copy procedure.
+        copy_archive = self.test_publisher.ubuntutest.main_archive
+        copy_series = source.distroseries
+        copy_pocket = PackagePublishingPocket.RELEASE
+
+        # Make new libraryfiles available by committing the transaction.
+        self.layer.txn.commit()
+
+        # Perform the delayed-copy including binaries.
+        delayed_copy = _do_delayed_copy(
+            source, copy_archive, copy_series, copy_pocket, True)
+
+        # Only the i386 build is included in the delayed-copy.
+        # For the record, later on, when the delayed-copy gets processed,
+        # a new hppa build record will be created in the destination
+        # archive context. Also after this point, the same delayed-copy
+        # request will be denied by `CopyChecker`.
+        [build_hppa, build_i386] = source.getBuilds()
+        self.assertEquals(
+            [build_i386],
+            [pub.build for pub in delayed_copy.builds])
+
 
 class CopyPackageScriptTestCase(unittest.TestCase):
     """Test the copy-package.py script."""
@@ -1772,15 +1986,7 @@
             copy_helper.mainTask)
 
     def testCopyFromPrivateToPublicPPAs(self):
-        """Check if copying private sources into public archives is denied.
-
-        Private source files can only be published in private archives,
-        because builders do not have access to the restricted librarian.
-
-        Builders only fetch the sources files from the repository itself
-        for private PPAs. If we copy a restricted file into a public PPA
-        builders will not be able to fetch it.
-        """
+        """Copies from private to public archives are allowed."""
         # Set up a private PPA.
         cprov = getUtility(IPersonSet).getByName("cprov")
         cprov.archive.buildd_secret = "secret"
@@ -1794,6 +2000,7 @@
             archive=cprov.archive, version='1.0', distroseries=hoary)
         ppa_binaries = test_publisher.getPubBinaries(
             pub_source=ppa_source, distroseries=hoary)
+        self.layer.txn.commit()
 
         # Run the copy package script storing the logged information.
         copy_helper = self.getCopier(
@@ -1801,12 +2008,20 @@
             from_suite='hoary', to_suite='hoary')
         copied = copy_helper.mainTask()
 
-        # Nothing was copied and an error message was printed explaining why.
-        self.assertEqual(len(copied), 0)
+        # The private files are copied via a delayed-copy request.
+        self.assertEqual(len(copied), 1)
         self.assertEqual(
-            copy_helper.logger.buffer.getvalue().splitlines()[-1],
-            'ERROR: foo 1.0 in hoary '
-            '(cannot copy private files into public archives)')
+            ['INFO: FROM: cprov: hoary-RELEASE',
+             'INFO: TO: Primary Archive for Ubuntu Linux: hoary-RELEASE',
+             'INFO: Copy candidates:',
+             'INFO: \tfoo 1.0 in hoary',
+             'INFO: \tfoo-bin 1.0 in hoary hppa',
+             'INFO: \tfoo-bin 1.0 in hoary i386',
+             'INFO: Copied:',
+             'INFO: \tDelayed copy of foo - 1.0 (source, i386)',
+             'INFO: 1 package successfully copied.',
+             ],
+            copy_helper.logger.buffer.getvalue().splitlines())
 
     def testUnembargoing(self):
         """Test UnembargoSecurityPackage, which wraps PackagerCopier."""

=== added file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt'
--- lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt	2009-07-16 18:07:13 +0000
@@ -0,0 +1,128 @@
+Displaying delayed-copies
+=========================
+
+Delayed copies can be browsed in the UI as if they were normal uploads.
+
+We will create a testing delayed-copy for Ubuntu/breezy-autotest.
+
+    # Create a delayed-copy in ubuntu/breezy-autotest.
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
+    >>> from lp.soyuz.interfaces.queue import IPackageUploadSet
+    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
+    >>> login('[e-mail]')
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> cprov.archive.buildd_secret = 'x'
+    >>> cprov.archive.private = True
+    >>> cprov.archive.require_virtualized = False
+    >>> stp = SoyuzTestPublisher()
+    >>> stp.prepareBreezyAutotest()
+    >>> [bin_hppa, bin_i386] = stp.getPubBinaries(archive=cprov.archive)
+    >>> build = bin_hppa.binarypackagerelease.build
+    >>> breezy_autotest = ubuntu.getSeries('breezy-autotest')
+    >>> delayed_copy = getUtility(IPackageUploadSet).createDelayedCopy(
+    ...     archive=ubuntu.main_archive, distroseries=breezy_autotest,
+    ...     pocket=PackagePublishingPocket.RELEASE, signing_key=None)
+    >>> unused = delayed_copy.addSource(build.sourcepackagerelease)
+    >>> unused = delayed_copy.addBuild(build)
+    >>> transaction.commit()
+    >>> delayed_copy.acceptFromCopy()
+    >>> logout()
+
+Any user accessing the breezy-autotest ACCEPTED queue will notice the
+delayed-copy. They show up in the ACCEPTED distro series queue while
+they are pending processing.
+
+    >>> anon_browser.open(
+    ...     "http://launchpad.dev/ubuntu/breezy-autotest/+queue")
+    >>> anon_browser.getControl(
+    ...     name="queue_state", index=0).displayValue = ['Accepted']
+    >>> anon_browser.getControl("Update").click()
+
+It's is listed as a normal upload, however there is no link to the
+'changesfile'.
+
+    >>> for row in find_tags_by_class(anon_browser.contents, "queue-row"):
+    ...     print extract_text(row)
+    Package                 Version  Component Section Priority Pocket  When
+    foo, foo (source, i386) 666      main      base    low      Release ...
+
+    >>> anon_browser.getLink('foo, foo')
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+On the corresponding expandable area, below the row, there is no file
+information, since the delayed-copy is still pending processing. A
+user can simply view where the delayed copy came from.
+
+    >>> print extract_text(
+    ...     first_tag_by_class(anon_browser.contents,
+    ...                        'queue-%s' % delayed_copy.id))
+    Copied from PPA for Celso Providelo
+
+The delayed-copy source archive is not linked, since the requester has
+no permission to view it.
+
+    >>> anon_browser.getLink('PPA for Celso Providelo')
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+While the delayed-copy is still in ACCEPTED state, i.e not processed,
+authenticated users with permission to view the archive from where the
+delayed-copy was issued can additionally access a link to its original
+archive, nothing else.
+
+    >>> cprov_browser = setupBrowser(
+    ...       auth="Basic [e-mail]:cprov")
+    >>> cprov_browser.open(anon_browser.url)
+
+    >>> for row in find_tags_by_class(cprov_browser.contents, "queue-row"):
+    ...     print extract_text(row)
+    Package                 Version  Component Section Priority Pocket  When
+    foo, foo (source, i386) 666      main      base    low      Release ...
+
+    >>> anon_browser.getLink('foo, foo')
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+    >>> print extract_text(
+    ...     first_tag_by_class(cprov_browser.contents,
+    ...                        'queue-%s' % delayed_copy.id))
+    Copied from PPA for Celso Providelo
+
+    >>> print cprov_browser.getLink('PPA for Celso Providelo').url
+    http://launchpad.dev/~cprov/+archive/ppa
+
+When the delayed-copy is processed (moved to DONE queue) its contents
+becomes available to everyone.
+
+    # Process the delayed-copy.
+    >>> login('[e-mail]')
+    >>> stp.addFakeChroots(breezy_autotest)
+    >>> unused = delayed_copy.realiseUpload()
+    >>> transaction.commit()
+    >>> logout()
+
+Any user can access the DONE queue and access the delayed-copy
+'changesfile' and view its files in the expandable area.
+
+    >>> anon_browser.getControl(
+    ...     name="queue_state", index=0).displayValue = ['Done']
+    >>> anon_browser.getControl("Update").click()
+
+    >>> print anon_browser.getLink('foo, foo').url
+    http://localhost:58000/.../foo_666_source.changes
+
+    >>> extra_information = find_tags_by_class(
+    ...     anon_browser.contents, 'queue-%s' % delayed_copy.id)
+    >>> for info in extra_information:
+    ...     print extract_text(info)
+    foo_666.dsc (28 bytes)
+    foo-bin_666_all.deb (18 bytes)   666   main   base   standard
+

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt	2009-07-01 13:16:44 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt	2009-07-16 00:31:36 +0000
@@ -135,15 +135,15 @@
   >>> anon_browser.getControl(name="queue_text").value = ''
   >>> anon_browser.getControl("Update").click()
 
-  >>> print find_tag_by_id(anon_browser.contents, 'queue-alsa-utils-4-arrow')
+  >>> print find_tag_by_id(anon_browser.contents, 'queue-4-arrow')
   <img width="14" height="14" src="/@@/treeCollapsed" alt="view files"
-       id="queue-alsa-utils-4-arrow" />
+       id="queue-4-arrow" />
 
 The 'filelist' is expanded as one or more table rows, right below the
 clicked item:
 
   >>> filelist = find_tags_by_class(
-  ...     anon_browser.contents, 'queue-alsa-utils-4')
+  ...     anon_browser.contents, 'queue-4')
 
 It contains a list of files related to the queue item clicked, followed
 by its size, one file per line:
@@ -164,7 +164,7 @@
 candidates).  The binary items will also individually show their
 version, component, section and priority.
 
-  >>> [filelist] = find_tags_by_class(anon_browser.contents, 'queue-pmount-2')
+  >>> [filelist] = find_tags_by_class(anon_browser.contents, 'queue-2')
   >>> print extract_text(filelist)
   pmount_1.0-1_all.deb (18 bytes) NEW 0.1-1 main base important
 
@@ -409,7 +409,7 @@
 values:
 
   >>> filelist = find_tags_by_class(
-  ...     anon_browser.contents, 'queue-pmount-2')
+  ...     anon_browser.contents, 'queue-2')
   >>> for row in filelist:
   ...     print extract_text(row)
   pmount_1.0-1_all.deb (18 bytes) NEW 0.1-1 restricted admin extra

=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2009-07-17 18:25:27 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2009-07-18 11:51:59 +0000
@@ -834,33 +834,47 @@
     <BLANKLINE>
 
 
-=== Copy privacy mismatch ===
-
-A CannotCopy error, giving the reason "Cannot copy private source into
-public archives." is raised if such operation is requested.
-
-When we try to copy the private source to the primary archive, which
-is public, the 'privacy mismatch' error is raised. The behaviour is
-the same for `syncSource` or `syncSources` operations.
+=== Copying private file to public archives ===
+
+Copying private sources to public archives works fine with
+`syncSource` or `syncSources` operations.
+
+We use `syncSource` to copy 'private - 1.0' source from Celso's
+private PPA to the ubuntu primary archive.
 
     >>> print cprov_webservice.named_post(
     ...     ubuntu['main_archive_link'], 'syncSource', {},
-    ...     source_name='private', version="1.0", to_pocket='release',
+    ...     source_name='private', version='1.0', to_pocket='release',
     ...     from_archive=cprov_archive['self_link'],
     ...     to_series="hoary")
-    HTTP/1.1 400 Bad Request
+    HTTP/1.1 200 Ok
     ...
-    CannotCopy: private 1.0 in hoary
-    (cannot copy private files into public archives)
-    <BLANKLINE>
+
+In the same way we can use 'syncSources' for syncing an subsequent
+version.
+
+    >>> login('[e-mail]')
+    >>> unused = test_publisher.getPubSource(
+    ...     sourcename="private", version="1.1", archive=cprov.archive)
+    >>> logout()
 
     >>> print cprov_webservice.named_post(
     ...     ubuntu['main_archive_link'], 'syncSources', {},
     ...     source_names=['private'], to_pocket='release',
     ...     from_archive=cprov_archive['self_link'],
     ...     to_series="hoary")
+    HTTP/1.1 200 Ok
+    ...
+
+Although if we try to copy an old version, by repeating the copy an
+error is returned.
+
+    >>> print cprov_webservice.named_post(
+    ...     ubuntu['main_archive_link'], 'syncSource', {},
+    ...     source_name='private', version='1.1', to_pocket='release',
+    ...     from_archive=cprov_archive['self_link'],
+    ...     to_series="hoary")
     HTTP/1.1 400 Bad Request
     ...
-    CannotCopy: private 1.0 in hoary
-    (cannot copy private files into public archives)
-    <BLANKLINE>
+    CannotCopy: private 1.1 in hoary
+    (same version already uploaded and waiting in ACCEPTED queue)

=== modified file 'lib/lp/soyuz/templates/distroseries-queue.pt'
--- lib/lp/soyuz/templates/distroseries-queue.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroseries-queue.pt	2009-07-19 04:41:14 +0000
@@ -72,8 +72,7 @@
        </thead>
        <tbody class="lesser">
          <tal:batch repeat="packageupload batch">
-           <tal:block
-                define="filelist_class string:queue-${packageupload/displayname}-${packageupload/id}">
+           <tal:block define="filelist_class string:queue-${packageupload/id}">
              <tr class="queue-row">
                 <tal:comment condition="nothing">
                   Every column is top-padded apart from the checkbox
@@ -203,6 +202,28 @@
     :packageupload: A PackageUpload record for which we display files.
   </tal:comment>
 
+    <tal:copy condition="packageupload/pending_delayed_copy">
+      <tr tal:attributes="class string:${filelist_class}"
+          tal:define="archive
+                      packageupload/sourcepackagerelease/upload_archive"
+          style="display:none">
+        <td />
+        <td tal:condition="view/availableActions" />
+        <td>Copied from
+          <tal:linked condition="archive/required:launchpad.View">
+            <a tal:attributes="href archive/fmt:url"
+               tal:content="archive/displayname" />
+          </tal:linked>
+          <tal:not_linked
+            condition="not: archive/required:launchpad.View"
+            replace="archive/displayname">
+          </tal:not_linked>
+        </td>
+        <td colspan="6" />
+      </tr>
+    </tal:copy>
+
+    <tal:upload condition="not: packageupload/pending_delayed_copy">
       <tr tal:repeat="file packageupload/source_files"
           tal:attributes="class string:${filelist_class}"
           style="display:none">
@@ -230,7 +251,7 @@
           <td tal:condition="view/availableActions"/>
           <td>
             <a tal:attributes="href file/libraryfile/http_url">
-              <tal:filename content="file/libraryfile/filename"/>
+              <tal:filename replace="file/libraryfile/filename"/>
             </a>
             (<tal:size replace="file/libraryfile/content/filesize/fmt:bytes" />)
             <span style="color: red" tal:condition="is_new">NEW</span>
@@ -260,6 +281,7 @@
         <td colspan="6"/>
       </tr>
     </tal:custom>
+    </tal:upload>
 
 </metal:macro>
 
@@ -287,12 +309,16 @@
          alt="[Debian Description Translation Project Indexes]"
          src="/@@/ubuntu-icon"
          title="Debian Description Translation Project Indexes"/>
-    <a tal:attributes="href packageupload/changesfile/http_url;
-                       title string:Changes file for ${packageupload/displayname}">
-      <tal:name replace="string: ${packageupload/displayname}"/>
+    <a tal:condition="not: packageupload/pending_delayed_copy"
+       tal:content="packageupload/displayname"
+       tal:attributes="
+         href packageupload/changesfile/http_url;
+         title string:Changes file for ${packageupload/displayname};">
     </a>
-    <tal:version replace="
-          string: (${packageupload/displayarchs})"/>
+    <tal:pending_delayed_copy_title
+      condition="packageupload/pending_delayed_copy"
+      replace="packageupload/displayname" />
+    <tal:arches replace="string: (${packageupload/displayarchs})"/>
   </div>
 </metal:macro>
 

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2009-07-17 02:25:09 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2009-07-19 04:41:14 +0000
@@ -16,6 +16,7 @@
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.distroseries import DistroSeriesStatus
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingPocket, PackagePublishingStatus)
 from lp.soyuz.interfaces.queue import (
@@ -24,13 +25,13 @@
 from lp.testing import TestCaseWithFactory
 
 
-class TestPackageUpload(TestCaseWithFactory):
+class PackageUploadTestCase(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
     dbuser = config.uploadqueue.dbuser
 
     def setUp(self):
-        super(TestPackageUpload, self).setUp()
+        super(PackageUploadTestCase, self).setUp()
         self.test_publisher = SoyuzTestPublisher()
 
     def createEmptyDelayedCopy(self):
@@ -65,11 +66,15 @@
             'Source is mandatory for delayed copies.',
             delayed_copy.acceptFromCopy)
 
-    def createDelayedCopy(self):
+    def createDelayedCopy(self, source_only=False):
         """Return a delayed-copy targeted to ubuntutest/breezy-autotest.
 
-        The delayed-copy is target to the SECURITY pocket with:
+        The delayed-copy is targeted to the SECURITY pocket with:
+
           * source foo - 1.1
+
+        And if 'source_only' is False, the default behavior, also attach:
+
           * binaries foo - 1.1 in i386 and hppa
           * a DIST_UPGRADER custom file
 
@@ -83,16 +88,6 @@
         ppa.private = True
 
         source = self.test_publisher.getPubSource(archive=ppa, version='1.1')
-        self.test_publisher.getPubBinaries(pub_source=source)
-        custom_path = datadir(
-            'dist-upgrader/dist-upgrader_20060302.0120_all.tar.gz')
-        custom_file = self.factory.makeLibraryFileAlias(
-            filename='dist-upgrader_20060302.0120_all.tar.gz',
-            content=open(custom_path).read(), restricted=True)
-        [build] = source.getBuilds()
-        build.package_upload.addCustom(
-            custom_file, PackageUploadCustomFormat.DIST_UPGRADER)
-
         delayed_copy = getUtility(IPackageUploadSet).createDelayedCopy(
             self.test_publisher.ubuntutest.main_archive,
             self.test_publisher.breezy_autotest,
@@ -100,11 +95,21 @@
             self.test_publisher.person.gpgkeys[0])
 
         delayed_copy.addSource(source.sourcepackagerelease)
-        for build in source.getBuilds():
-            delayed_copy.addBuild(build)
-            for custom in build.package_upload.customfiles:
-                delayed_copy.addCustom(
-                    custom.libraryfilealias, custom.customformat)
+        if not source_only:
+            self.test_publisher.getPubBinaries(pub_source=source)
+            custom_path = datadir(
+                'dist-upgrader/dist-upgrader_20060302.0120_all.tar.gz')
+            custom_file = self.factory.makeLibraryFileAlias(
+                filename='dist-upgrader_20060302.0120_all.tar.gz',
+                content=open(custom_path).read(), restricted=True)
+            [build] = source.getBuilds()
+            build.package_upload.addCustom(
+                custom_file, PackageUploadCustomFormat.DIST_UPGRADER)
+            for build in source.getBuilds():
+                delayed_copy.addBuild(build)
+                for custom in build.package_upload.customfiles:
+                    delayed_copy.addCustom(
+                        custom.libraryfilealias, custom.customformat)
 
         # Commit for using just-created library files.
         self.layer.txn.commit()
@@ -136,6 +141,10 @@
         # and has their files privacy adjusted according test destination
         # context.
 
+        # Add a cleanup for removing the repository where the custom upload
+        # was published.
+        self.addCleanup(self.removeRepository)
+
         # Create the default delayed-copy context.
         delayed_copy = self.createDelayedCopy()
 
@@ -158,23 +167,27 @@
         self.test_publisher.getPubBinaries(
             pub_source=ancestry_source,
             status=PackagePublishingStatus.PUBLISHED)
+        package_diff = ancestry_source.sourcepackagerelease.requestDiffTo(
+            requester=self.test_publisher.person,
+            to_sourcepackagerelease=delayed_copy.sourcepackagerelease)
+        package_diff.diff_content = self.factory.makeLibraryFileAlias(
+            restricted=True)
 
         # Accept and publish the delayed-copy.
         delayed_copy.acceptFromCopy()
         self.assertEquals(
             PackageUploadStatus.ACCEPTED, delayed_copy.status)
 
+        self.layer.txn.commit()
+        self.layer.switchDbUser(self.dbuser)
+
         logger = BufferLogger()
         pub_records = delayed_copy.realiseUpload(logger=logger)
         self.assertEquals(
             PackageUploadStatus.DONE, delayed_copy.status)
 
-        # Commit for comparing objects correctly.
         self.layer.txn.commit()
-
-        # Add a cleanup for removing the repository where the custom upload
-        # was published.
-        self.addCleanup(self.removeRepository)
+        self.layer.switchDbUser('launchpad')
 
         # One source and 2 binaries are pending publication. They all were
         # overridden to multiverse and had their files moved to the public
@@ -192,6 +205,9 @@
                 pub_record, delayed_copy.archive, delayed_copy.pocket,
                 ancestry_source.component, False)
 
+        # The package diff file is now public.
+        self.assertFalse(package_diff.diff_content.restricted)
+
         # The custom file was also published.
         custom_path = os.path.join(
             config.archivepublisher.root,
@@ -200,6 +216,30 @@
         self.assertEquals(
             ['20060302.0120', 'current'], sorted(os.listdir(custom_path)))
 
+    def test_realiseUpload_for_source_only_delayed_copies(self):
+        # Source-only delayed-copies results in the source published
+        # in the destination archive and its corresponding build
+        # recors ready to be dispatched.
+
+        # Create the default delayed-copy context.
+        delayed_copy = self.createDelayedCopy(source_only=True)
+        self.test_publisher.breezy_autotest.status = (
+            DistroSeriesStatus.CURRENT)
+        self.layer.txn.commit()
+
+        # Accept and publish the delayed-copy.
+        delayed_copy.acceptFromCopy()
+        logger = BufferLogger()
+        pub_records = delayed_copy.realiseUpload(logger=logger)
+
+        # Only the source is published and the needed builds are created
+        # in the destination archive.
+        self.assertEquals(1, len(pub_records))
+        [pub_record] = pub_records
+        [build] = pub_record.getBuilds()
+        self.assertEquals(
+            BuildStatus.NEEDSBUILD, build.buildstate)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/translations/doc/sourcepackagerelease-translations.txt'
--- lib/lp/translations/doc/sourcepackagerelease-translations.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/doc/sourcepackagerelease-translations.txt	2009-07-20 15:05:42 +0000
@@ -2,66 +2,85 @@
 
 It's time to check the translation upload function.
 
+We need a test tarball uploaded into librarian to run this test. We
+will upload the same sampledata tarball twice, one public and one
+restricted `LibraryFileAlias` objects.
+
    >>> import os.path
-   >>> import transaction
-   >>> from canonical.launchpad.database import SourcePackageRelease
-   >>> from lp.translations.interfaces.translationimportqueue import (
-   ...     ITranslationImportQueue)
-   >>> from canonical.librarian.interfaces import ILibrarianClient
-   >>> translation_import_queue = getUtility(ITranslationImportQueue)
-   >>> client = getUtility(ILibrarianClient)
-
-We need a test tarball uploaded into librarian to run this test.
-
    >>> import lp.translations
-   >>> test_file_name = os.path.join(
+   >>> tarball_path = os.path.join(
    ...     os.path.dirname(lp.translations.__file__),
    ...     'doc/sourcepackagerelease-translations.tar.gz')
-   >>> file = open(test_file_name)
-   >>> size = len(file.read())
-   >>> file.seek(0)
-   >>> alias = client.addFile(
+   >>> tarball = open(tarball_path)
+   >>> tarball_size = len(tarball.read())
+   >>> tarball.seek(0)
+
+   >>> from canonical.launchpad.interfaces.librarian import (
+   ...     ILibraryFileAliasSet)
+   >>> public_translation = getUtility(ILibraryFileAliasSet).create(
    ...     name='test.tar.gz',
-   ...     size=size,
-   ...     file=file,
+   ...     size=tarball_size,
+   ...     file=tarball,
    ...     contentType='application/x-gtar')
 
-We need the commit to see the upload.
+   >>> tarball.seek(0)
+   >>> restricted_translation = getUtility(ILibraryFileAliasSet).create(
+   ...     name='test.tar.gz',
+   ...     size=tarball_size,
+   ...     file=tarball,
+   ...     contentType='application/x-gtar',
+   ...     restricted=True)
+
+Commit, so uploaded contents are available in the current test.
 
    >>> transaction.commit()
 
-Now we do the upload. It's necessary to retrive an ILibraryFileAlias
-correspondent to the alias (long) we already have.
-
-   >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet
-   >>> file_alias = getUtility(ILibraryFileAliasSet)[alias]
-
+We will use an arbitrary source package release from the sampledata.
+
+   >>> from canonical.launchpad.database import SourcePackageRelease
    >>> spr_test = SourcePackageRelease.get(20)
-   >>> spr_test.name
-   u'pmount'
-
-Before the final upload, the queue should be empty.
-
+   >>> print spr_test.title
+   pmount - 0.1-1
+
+And the 'katie' celebrity as the user responsible for the transalation.
+
+   >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
+   >>> katie = getUtility(ILaunchpadCelebrities).katie
+
+Before the final upload, we can see that the translation queue for the
+testing source package is empty.
+
+   >>> from lp.translations.interfaces.translationimportqueue import (
+   ...     ITranslationImportQueue)
+   >>> translation_import_queue = getUtility(ITranslationImportQueue)
    >>> translation_import_queue.getAllEntries(
    ...     target=spr_test.sourcepackage).count()
    0
 
-   >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
-   >>> katie = getUtility(ILaunchpadCelebrities).katie
-   >>> spr_test.attachTranslationFiles(file_alias, True, katie)
-
-The commit is needed to see the new entries
-
-   >>> transaction.commit()
-
-And the queue should have a new entry.
-
-   >>> for entry in translation_import_queue.getAllEntries(
-   ...     target=spr_test.sourcepackage):
+Now we bind both uploaded translations, the public and the restricted
+ones, to the testing source package.
+
+   >>> spr_test.attachTranslationFiles(public_translation, True, katie)
+
+   >>> spr_test.attachTranslationFiles(restricted_translation, True, katie)
+
+And the queue should have 2 entries, which exactly the same contents.
+
+   >>> queue_entries = translation_import_queue.getAllEntries(
+   ...     target=spr_test.sourcepackage)
+
+   >>> queue_entries.count()
+   2
+
+   >>> for entry in queue_entries:
    ...     print entry.path, entry.importer.name
    something/en-US.xpi  katie
    po/es.po             katie
 
+Commit, so the uploaded traslations become available to the scripts.
+
+   >>> transaction.commit()
+
 Now, we need to do the final import. It's done as a two steps procedure.
 
 The first one, approves the import.

=== modified file 'lib/lp/translations/interfaces/potmsgset.py'
--- lib/lp/translations/interfaces/potmsgset.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/interfaces/potmsgset.py	2009-07-19 04:41:14 +0000
@@ -93,10 +93,16 @@
         """
 
     def getCurrentTranslationMessage(potemplate, language, variant=None):
-        """Returns a TranslationMessage marked as being currently used."""
+        """Returns a TranslationMessage marked as being currently used.
+
+        Diverged messages are preferred.
+        """
 
     def getImportedTranslationMessage(potemplate, language, variant=None):
-        """Returns a TranslationMessage as imported from the package."""
+        """Returns a TranslationMessage as imported from the package.
+
+        Diverged messages are preferred.
+        """
 
     def getSharedTranslationMessage(language, variant=None):
         """Returns a shared TranslationMessage."""

=== modified file 'lib/lp/translations/model/potmsgset.py'
--- lib/lp/translations/model/potmsgset.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/model/potmsgset.py	2009-07-19 04:41:14 +0000
@@ -210,10 +210,13 @@
                 'There is already a translation message in our database.')
         return DummyTranslationMessage(pofile, self)
 
-    def _getUsedTranslationMessage(
-        self, potemplate, language, variant, current=True):
+    def _getUsedTranslationMessage(self, potemplate, language, variant,
+                                   current=True):
         """Get a translation message which is either used in
-        Launchpad (current=True) or in an import (current=False)."""
+        Launchpad (current=True) or in an import (current=False).
+        
+        Prefers a diverged message if present.
+        """
         # Change 'is_current IS TRUE' and 'is_imported IS TRUE' conditions
         # carefully: they need to match condition specified in indexes,
         # or Postgres may not pick them up (in complicated queries,
@@ -239,17 +242,12 @@
             clauses.append(
                 'TranslationMessage.variant=%s' % sqlvalues(variant))
 
-        # This returns at most two messages:
-        # 1. a current translation for this particular potemplate.
-        # 2. a shared current translation for this.
-        messages = list(TranslationMessage.select(
-            ' AND '.join(clauses),
-            orderBy=['-COALESCE(potemplate, -1)']))
-        if len(messages) > 0:
-            return messages[0]
-        else:
-            return None
+        order_by = '-COALESCE(potemplate, -1)'
 
+        # This should find at most two messages: zero or one shared
+        # message, and zero or one diverged one.
+        return TranslationMessage.selectFirst(
+            ' AND '.join(clauses), orderBy=[order_by])
 
     def getCurrentTranslationMessage(self, potemplate,
                                      language, variant=None):
@@ -481,12 +479,8 @@
                 translations[pluralform] is not None):
                 translation = translations[pluralform]
                 # Find or create a POTranslation for the specified text
-                try:
-                    potranslations[pluralform] = (
-                        POTranslation.byTranslation(translation))
-                except SQLObjectNotFound:
-                    potranslations[pluralform] = (
-                        POTranslation(translation=translation))
+                potranslations[pluralform] = (
+                    POTranslation.getOrCreateTranslation(translation))
             else:
                 potranslations[pluralform] = None
         return potranslations

=== modified file 'lib/lp/translations/model/translationmessage.py'
--- lib/lp/translations/model/translationmessage.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/model/translationmessage.py	2009-07-19 04:41:14 +0000
@@ -14,6 +14,7 @@
 import pytz
 
 from sqlobject import BoolCol, ForeignKey, SQLObjectNotFound, StringCol
+from storm.expr import And
 from storm.locals import SQL
 from storm.store import Store
 from zope.interface import implements
@@ -85,7 +86,7 @@
         return self.potmsgset.makeHTMLID('_'.join(elements))
 
     def setPOFile(self, pofile):
-        """See `ITransationMessage`."""
+        """See `ITranslationMessage`."""
         self.browser_pofile = pofile
 
 
@@ -449,6 +450,28 @@
             # suggestions will always be shared.
             self.destroySelf()
 
+    def findIdenticalMessage(self, target_potmsgset, target_potemplate):
+        """See `ITranslationMessage`."""
+        store = Store.of(self)
+
+        forms_match = (TranslationMessage.msgstr0 == self.msgstr0)
+        for form in xrange(1, TranslationConstants.MAX_PLURAL_FORMS):
+            form_name = 'msgstr%d' % form
+            form_value = getattr(self, form_name)
+            forms_match = And(
+                forms_match,
+                getattr(TranslationMessage, form_name) == form_value)
+
+        twins = store.find(TranslationMessage, And(
+            TranslationMessage.potmsgset == target_potmsgset,
+            TranslationMessage.potemplate == target_potemplate,
+            TranslationMessage.language == self.language,
+            TranslationMessage.variant == self.variant,
+            TranslationMessage.id != self.id,
+            forms_match))
+
+        return twins.order_by(TranslationMessage.id).first()
+
 
 class TranslationMessageSet:
     """See `ITranslationMessageSet`."""

=== modified file 'lib/lp/translations/scripts/message_sharing_migration.py'
--- lib/lp/translations/scripts/message_sharing_migration.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/scripts/message_sharing_migration.py	2009-07-19 04:41:14 +0000
@@ -2,11 +2,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
-__all__ = [
-    'MessageSharingMerge',
-    'merge_potmsgsets',
-    'merge_translationmessages',
-    ]
+__all__ = [ 'MessageSharingMerge' ]
 
 
 from zope.component import getUtility
@@ -90,106 +86,62 @@
         merge_pofiletranslators(item.potmsgset, representative_template)
 
 
-def merge_potmsgsets(potemplates):
-    """Merge POTMsgSets for given sequence of sharing templates."""
-
-    # Map each POTMsgSet key (context, msgid, plural) to its
-    # representative POTMsgSet.
-    representatives = {}
-
-    # Map each representative POTMsgSet to a list of subordinate
-    # POTMsgSets it represents.
-    subordinates = {}
-
-    # Map each representative POTMsgSet to its representative
-    # POTemplate.
-    representative_templates = {}
-
-    # Figure out representative potmsgsets and their subordinates.  Go
-    # through the templates, starting at the most representative and
-    # moving towards the least representative.  For any unique potmsgset
-    # key we find, the first POTMsgSet is the representative one.
-    order_check = OrderingCheck(
-        cmp=getUtility(IPOTemplateSet).compareSharingPrecedence)
-    for template in potemplates:
-        order_check.check(template)
-        for potmsgset in template.getPOTMsgSets(False):
-            key = get_potmsgset_key(potmsgset)
-            if key not in representatives:
-                representatives[key] = potmsgset
-                representative_templates[potmsgset] = template
-            representative = representatives[key]
-            if representative in subordinates:
-                subordinates[representative].append(potmsgset)
-            else:
-                subordinates[representative] = []
-
-    for representative, potmsgsets in subordinates.iteritems():
-        # Merge each subordinate POTMsgSet into its representative.
-        seen_potmsgsets = set([representative])
-        for subordinate in potmsgsets: