Merge lp:~julian-edwards/launchpad/ppa-deletion-ui into lp:launchpad/db-devel

[Julian Edwards]

Add a web user interface to delete PPAs.

Adds a trivial UI for PPA deletion.

[Paul Hummer (rockstar)]

<rockstar> bigjools, so, I don't feel like I know enough about Soyuz to really grok what I'm trying to review here (and there's no movie/screen shot). How can I get to the view?
<bigjools> rockstar: go to http://launchpad.dev/~cprov/+archive/ppa
<bigjools> sorry I assume too much :)
<rockstar> bigjools, :) It's okay.
<rockstar> bigjools, so, once a PPA is requested for deletion, can it be uploaded to?
<rockstar> Also, "Delete PPA" shouldn't show if the deletion request has already been made.
<bigjools> OTP, will type when I can :)
<rockstar> I also wonder if a red notification for "Deletion in progress" is probably better, since it's more likely to grab your attention.
<rockstar> Although the red often means "It's broken. It's broken! It's BROKEN!!!!"

So, the more I think about it, I think blue is the wrong notification color. We need some way of saying "THIS PPA IS GOING AWAY." I'd suggest we make it a red box.

review: Needs Information (ui*)

[Paul Hummer (rockstar)]

<rockstar> bigjools, also, the "Delete PPA" link shouldn't show if the deletion has already been requested.
<bigjools> rockstar: I thought about that, it was easier to leave it and make the page template different!
<bigjools> generally I really hate links appearing and disappearing with no explanation :/
<bigjools> but I can change it
<bigjools> one day I hope we'll present disabled links
<rockstar> bigjools, grey it out then?
<bigjools> rockstar: does Link do that?
<rockstar> bigjools, I don't think so, but it should... :)
<bigjools> heh
<rockstar> bigjools, basically, you shouldn't be able to click it if it's no longer deletable (because it's already deleted)
<bigjools> I didn't think about it too hard because it won't be around longer than 5 minutes
<bigjools> in any case we're changing tack slightly, and only removing the repository, the PPA will be disabled and hidden
<rockstar> bigjools, yeah, I figured that, but to the user, it's "deleted"
<bigjools> rockstar: yeah
<bigjools> rockstar: so I'll make the whole thing disappear and redirect to the user's profile page, what do you think?
<rockstar> bigjools, yeah, that's probably a good idea.
<rockstar> And then the info notification is something like "The PPA deletion has been requested."
<bigjools> right
<bigjools> in red?
<bigjools> :)
<rockstar> bigjools, no, at that point, blue is fine.
<bigjools> rockstar: cool, thanks for the pre-imp

[Michael Nelson (michael.nelson)]

Great points Paul and Julian.

I'm just taking a look now, as by the time Paul's day starts, mine will be ending. The UI looks great and the redirection seems natural. I've got notes below, but basically I'm happy to ui=me - unless Paul disagrees of course - with the Delete menu item moved as below, and the Edit/Copy/Delete menu items disabled when the PPA is deleted/deleting.

Great stuff!

Details:
When first browsing:

https://launchpad.dev/~cprov/+archive/ppa

I was a bit surprised to see the Delete action as the first presented.

{{{
11:49 < noodles> bigjools: did you intend for the Delete link to be the first presented in the menu? Or is it just because you've listed it alphabetically in the ArchiveIndexActionsMenu?
11:49 < bigjools> noodles: that did cross my mind, I was considering moving it but was waiting for someone to comment first
11:49 < noodles> I'm wondering if it should be the last action (ie. after 'manage_subscribers' on ArchiveIndexActionsMenu.links)
11:49 < bigjools> and you did :)
11:50 < noodles> Great.
}}}

I agree, when deleting the archive, redirecting to the profile and including the blue info box is a good solution. Works well.

At that point though, I'm wasn't sure there was any reason for presenting the link on the profile page allowing me to view the empty PPA, but Julian clarified that - the history is still viewable at:
https://launchpad.dev/~cprov/+archive/ppa/+packages?field.status_filter=

{{{
11:56 < noodles> bigjools: Is there any reason to present the PPA after the deletion has been requested? Why have a disabled-like PPA link on the profile that can be clicked on and viewed in it's empty state with the "This archive has been deleted" message?
11:57 < bigjools> so you can go in and view its history even after deletion
11:58 < bigjools> StevenK: looks good
11:58 < noodles> bigjools: ah, I misunderstood. So it will stay there permanently? OK.
11:58 < bigjools> StevenK: when that's done, you need to run process-accepted to make it do the re-upload between the librarians
11:59 < bigjools> noodles: yes - this is what wgrant wanted, and is the simpler first step before complete obliteration of all archive objects
}}}

which leaves me wondering whether, rather than saying (on the PPA index page), "This archive has been deleted.", we said "This archive has been deleted ([link]View deleted packages[/link])." which would (1) indicate that there is useful information still available and (2) save you from having to know to click on the Packages link and update the filter to be able to see them. See what you both think. (it would be nice if this extra link only appeared on the index page)

Note: you can use view.archive_label instead of 'archive' in your message if you want it to automatically use "PPA" or "archive".

The only other thoughts I had were around the presentation of the menu options, such as "Copy packages", "Delete packages", "Change details" and "Edit dependencies".

I'm assuming we want to disable the last 3 (currently I can click on Change details and "re-enable" my PPA, which then means that the "This PPA has been deleted" msg no longer appears, even though I assume it's still deleted). Note, disabl...

review: Approve (ui)

[Julian Edwards (julian-edwards)]

Ok guys, how is it looking now?

[Guilherme Salgado (salgado)]

Hi Julian,

This is a nice branch and I'm glad you've asked for a UI review before
asking for a code review. I have some questions/suggestions, but
nothing major.

  review needsfixing

On Fri, 2010-03-26 at 14:02 +0000, Julian Edwards wrote:
> You have been requested to review the proposed merge of lp:~julian-edwards/launchpad/ppa-deletion-ui into lp:launchpad.
>
> Adds a trivial UI for PPA deletion.

Since you've done changes after the m-p creation, would you care to run
'make lint' one more time?

> === modified file 'lib/lp/soyuz/browser/archive.py'
> --- lib/lp/soyuz/browser/archive.py 2010-03-12 06:23:04 +0000
> +++ lib/lp/soyuz/browser/archive.py 2010-03-26 13:59:31 +0000
> @@ -404,13 +405,32 @@
> archive = view.context
> if not archive.private:
> link.enabled = False
> + if archive.status in (
> + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> + link.enabled = False
> + return link
>
> return link

Am I reading this wrong or is there an extra 'return link' above? Maybe
'make lint' catches this?

>
> @enabled_with_permission('launchpad.Edit')
> def edit(self):
> text = 'Change details'
> - return Link('+edit', text, icon='edit')
> + link = Link('+edit', text, icon='edit')
> + view = self.context
> + if view.context.status in (
> + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> + link.enabled = False
> + return link
> +
> + @enabled_with_permission('launchpad.Edit')
> + def delete_ppa(self):
> + text = 'Delete PPA'
> + link = Link('+delete', text, icon='trash-icon')
> + view = self.context
> + if view.context.status in (
> + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> + link.enabled = False
> + return link
>
> def builds(self):
> text = 'View all builds'
> @@ -442,6 +462,10 @@
> # archives without any sources.
> if self.context.is_copy or not self.context.has_sources:
> link.enabled = False
> + view = self.context
> + if view.context.status in (
> + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> + link.enabled = False
> return link
>
> @enabled_with_permission('launchpad.AnyPerson')
> @@ -458,7 +482,12 @@
> @enabled_with_permission('launchpad.Edit')
> def edit_dependencies(self):
> text = 'Edit PPA dependencies'
> - return Link('+edit-dependencies', text, icon='edit')
> + link = Link('+edit-dependencies', text, icon='edit')
> + view = self.context
> + if view.context.status in (
> + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> + link.enabled = False
> + return link

You could have a method/function which takes an archive and returns
whether or not it's (being) deleted, to avoid all the duplication above.
Also, you can pass enabled=False in the link constructor, simplifying
things a bit more. e.g.

    def is_archive_alive(archive):
        """Return True if the given archive has not been deleted."""
        return archive.staus...

review: Needs Fixing

[Julian Edwards (julian-edwards)]

On Friday 26 March 2010 15:09:22 Guilherme Salgado wrote:
> This is a nice branch and I'm glad you've asked for a UI review before
> asking for a code review. I have some questions/suggestions, but
> nothing major.

Thanks for the review Salgado - answers inline as usual!

> Since you've done changes after the m-p creation, would you care to run
> 'make lint' one more time?

There's no lint, thanks for reminding me.

> > === modified file 'lib/lp/soyuz/browser/archive.py'
> > --- lib/lp/soyuz/browser/archive.py 2010-03-12 06:23:04 +0000
> > +++ lib/lp/soyuz/browser/archive.py 2010-03-26 13:59:31 +0000
> > @@ -404,13 +405,32 @@
> > archive = view.context
> > if not archive.private:
> > link.enabled = False
> > + if archive.status in (
> > + ArchiveStatus.DELETING, ArchiveStatus.DELETED):
> > + link.enabled = False
> > + return link
> >
> > return link
>
> Am I reading this wrong or is there an extra 'return link' above? Maybe
> 'make lint' catches this?

Yes it's wrong and no it doesn't!

> Although by now I'm starting to wonder if it shouldn't be a property of
> the model class?

I've done that now, dunno why I didn't do it before really!

> > + @property
> > + def can_be_deleted(self):
> > + return self.context.status != ArchiveStatus.DELETING
>
> Erm, can you delete an archive which has also been deleted (i.e. status
> == DELETED)? This doesn't seem consistent with the rules for enabling
> the links above...

It is indeed wrong, I've fixed it, thanks for noticing.

> > +Now, all the publications are DELTETED, the archive is disabled and the
>
> typo: DELTETED

Fixed.

> > + def delete(self, deleted_by):
> > + """See `IArchive`."""
>
> Would it make sense to assert that self.status is not DELETED or
> DELETING here?

Yep, done.

> > + >>> print no_priv_browser.title
> > + Delete “PPA for No Privileges Person” : PPA for No Privileges Person
> > : No Privileges Person
>
> The above line is too long, but since this is a doctest (and we run them
> with the NORMALIZE_WHITESPACE flag) you can add line breaks anywhere in
> it. :)

See, I know this. Why did I do it wrong? :)

> > + <form name="DELETE" action="" method="POST">
> > + <input name="DELETE" type="hidden" value="1"/>
> > + <input type="submit" value="Permanently delete PPA"/>
> > + or <a tal:attributes="href context/fmt:url">Cancel</a>
>
> Why did you choose to hand-craft this form? Using a LaunchpadFormView
> you'd even get the cancel link for free when using an @action...

Nearly free :)

I was hacking it up to see what I wanted and didn't get around to changing it
to an LPForm. All fixed now!

> Now I'm left wondering where's the code that will actually delete the
> PPA repository and set its status to DELETED? Does it exist or is that
> something you'll write in another branch?

It's being done in a different branch - the publisher will remove it.

Cheers
J

[Guilherme Salgado (salgado)]

 review approve code
 status approved

review: Approve (code)

[Julian Edwards (julian-edwards)]

Because the backend didn't make it last cycle, this change is now going to be delayed a whole cycle as it can't appear on edge unless the backend is in place :(

=== added directory 'lib/canonical/launchpad/apidoc'
=== renamed directory 'lib/canonical/launchpad/apidoc' => 'lib/canonical/launchpad/apidoc.moved'
=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-04-16 15:06:55 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-04-29 11:26:16 +0000
@@ -275,7 +275,7 @@
     >>> bug_comment = BugComment(
     ...     1, bug_one.initial_message, bugtask_one, True)
     >>> canonical_url(bug_comment)
-    u'http://launchpad.dev/firefox/+bug/1/comments/1'
+    u'http://bugs.launchpad.dev/firefox/+bug/1/comments/1'
 
 An IBugNomination.
 

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-04-27 12:38:38 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-04-29 11:26:16 +0000
@@ -1656,7 +1656,9 @@
 .distromirrorstatusONEHOURBEHIND,
 .distromirrorstatusTWOHOURSBEHIND,
 .distromirrorstatusFOURHOURSBEHIND,
-.distromirrorstatusSIXHOURSBEHIND,
+.distromirrorstatusSIXHOURSBEHIND {
+    color: green;
+    }
 .distromirrorstatusONEDAYBEHIND {
     color: #f60;
     }

=== modified file 'lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py'
--- lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2009-09-21 16:21:50 +0000
+++ lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -13,9 +13,8 @@
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
 from lp.testing import login, TestCase
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class Cookbook:
@@ -52,19 +51,17 @@
         self.product_url = canonical_url(self.product)
 
     def test_default_page(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url])
+        self.assertBreadcrumbUrls([self.product_url], self.product)
 
     def test_non_default_page(self):
+        crumbs = self.getBreadcrumbsForObject(self.product, '+download')
         downloads_url = "%s/+download" % self.product_url
-        urls = self._getBreadcrumbsURLs(
-            downloads_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url, downloads_url])
-        texts = self._getBreadcrumbsTexts(
-            downloads_url, [self.root, self.product])
-        self.assertEquals(texts[-1],
-                          '%s project files' % self.product.displayname)
+        self.assertEquals(
+            [self.product_url, downloads_url],
+            [crumb.url for crumb in crumbs])
+        self.assertEquals(
+            '%s project files' % self.product.displayname,
+            crumbs[-1].text)
 
     def test_zope_i18n_Messages_are_interpolated(self):
         # Views can use zope.i18nmessageid.Message as their title when they
@@ -108,31 +105,25 @@
         self.package_bugtask_url = canonical_url(self.package_bugtask)
 
     def test_root_on_mainsite(self):
-        urls = self._getBreadcrumbsURLs('http://launchpad.dev/', [self.root])
-        self.assertEquals(urls, [])
+        crumbs = self.getBreadcrumbsForUrl('http://launchpad.dev/')
+        self.assertEquals(crumbs, [])
 
     def test_product_on_mainsite(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url])
+        self.assertBreadcrumbUrls([self.product_url], self.product)
 
     def test_root_on_vhost(self):
-        urls = self._getBreadcrumbsURLs(
-            'http://bugs.launchpad.dev/', [self.root])
-        self.assertEquals(urls, [])
+        crumbs = self.getBreadcrumbsForUrl('http://bugs.launchpad.dev/')
+        self.assertEquals(crumbs, [])
 
     def test_product_on_vhost(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_bugs_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url, self.product_bugs_url])
+        self.assertBreadcrumbUrls(
+            [self.product_url, self.product_bugs_url],
+            self.product, rootsite='bugs')
 
     def test_product_bugtask(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_bugtask_url,
-            [self.root, self.product, self.product_bugtask])
-        self.assertEquals(
-            urls, [self.product_url, self.product_bugs_url,
-                   self.product_bugtask_url])
+        self.assertBreadcrumbUrls(
+            [self.product_url, self.product_bugs_url, self.product_bugtask_url],
+            self.product_bugtask)
 
     def test_package_bugtask(self):
         target = self.package_bugtask.target
@@ -140,14 +131,11 @@
         distroseries_url = canonical_url(target.distroseries)
         package_url = canonical_url(target)
         package_bugs_url = canonical_url(target, rootsite='bugs')
-        urls = self._getBreadcrumbsURLs(
-            self.package_bugtask_url,
-            [self.root, target.distribution, target.distroseries, target,
-             self.package_bugtask])
-        self.assertEquals(
-            urls,
+
+        self.assertBreadcrumbUrls(
             [distro_url, distroseries_url, package_url, package_bugs_url,
-             self.package_bugtask_url])
+             self.package_bugtask_url],
+            self.package_bugtask)
 
 
 def test_suite():

=== modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
--- lib/lp/answers/browser/tests/test_breadcrumbs.py	2010-02-17 11:13:06 +0000
+++ lib/lp/answers/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -6,10 +6,9 @@
 import unittest
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
 
 from lp.testing import login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestQuestionTargetProjectAndPersonBreadcrumbOnAnswersVHost(
@@ -36,22 +35,19 @@
             self.project, rootsite='answers')
 
     def test_product(self):
-        crumbs = self._getBreadcrumbs(
-            self.product_questions_url, [self.root, self.product])
+        crumbs = self.getBreadcrumbsForObject(self.product, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.product_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
 
     def test_project(self):
-        crumbs = self._getBreadcrumbs(
-            self.project_questions_url, [self.root, self.project])
+        crumbs = self.getBreadcrumbsForObject(self.project, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.project_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
 
     def test_person(self):
-        crumbs = self._getBreadcrumbs(
-            self.person_questions_url, [self.root, self.person])
+        crumbs = self.getBreadcrumbsForObject(self.person, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.person_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
@@ -69,16 +65,14 @@
         self.question = self.factory.makeQuestion(
             target=self.product, title='Seeds are hard to chew')
         self.question_url = canonical_url(self.question, rootsite='answers')
-        crumbs = self._getBreadcrumbs(
-            self.question_url, [self.root, self.product, self.question])
+        crumbs = self.getBreadcrumbsForObject(self.question)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
 
     def test_faq(self):
         self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
         self.faq_url = canonical_url(self.faq, rootsite='answers')
-        crumbs = self._getBreadcrumbs(
-            self.faq_url, [self.root, self.product, self.faq])
+        crumbs = self.getBreadcrumbsForObject(self.faq)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
 

=== modified file 'lib/lp/blueprints/browser/tests/test_breadcrumbs.py'
--- lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -6,8 +6,8 @@
 import unittest
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestHasSpecificationsBreadcrumbOnBlueprintsVHost(
@@ -25,15 +25,13 @@
             self.product, rootsite='blueprints')
 
     def test_product(self):
-        crumbs = self._getBreadcrumbs(
-            self.product_specs_url, [self.root, self.product])
+        crumbs = self.getBreadcrumbsForObject(self.product, rootsite='blueprints')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.product_specs_url)
         self.assertEquals(last_crumb.text, 'Blueprints')
 
     def test_person(self):
-        crumbs = self._getBreadcrumbs(
-            self.person_specs_url, [self.root, self.person])
+        crumbs = self.getBreadcrumbsForObject(self.person, rootsite='blueprints')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.person_specs_url)
         self.assertEquals(last_crumb.text, 'Blueprints')
@@ -52,9 +50,7 @@
             self.specification, rootsite='blueprints')
 
     def test_specification(self):
-        crumbs = self._getBreadcrumbs(
-            self.specification_url,
-            [self.root, self.product, self.specification])
+        crumbs = self.getBreadcrumbsForObject(self.specification)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.specification_url)
         self.assertEquals(

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2010-04-15 15:14:21 +0000
+++ lib/lp/bugs/browser/configure.zcml	2010-04-29 11:26:16 +0000
@@ -163,7 +163,8 @@
         <browser:url
             for="canonical.launchpad.interfaces.IBugComment"
             path_expression="string:comments/${index}"
-            attribute_to_parent="bugtask"/>
+            attribute_to_parent="bugtask"
+            rootsite="bugs"/>
         <browser:page
             for="canonical.launchpad.interfaces.IBugComment"
             name="+index"

=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2010-03-22 18:39:24 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -8,10 +8,10 @@
 from zope.component import getUtility
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
 from lp.bugs.interfaces.bugtracker import IBugTrackerSet
-from lp.testing import ANONYMOUS, login
+from lp.testing import login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestBugTaskBreadcrumb(BaseBreadcrumbTestCase):
@@ -21,54 +21,35 @@
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
         self.bug = self.factory.makeBug(product=product)
-        self.bugtask_url = canonical_url(
-            self.bug.default_bugtask, rootsite='bugs')
-        self.traversed_objects = [
-            self.root, product, self.bug.default_bugtask]
+        self.bugtask = self.bug.default_bugtask
+        self.bugtask_url = canonical_url(self.bugtask, rootsite='bugs')
 
     def test_bugtask(self):
-        urls = self._getBreadcrumbsURLs(
-            self.bugtask_url, self.traversed_objects)
-        self.assertEquals(urls[-1], self.bugtask_url)
-        texts = self._getBreadcrumbsTexts(
-            self.bugtask_url, self.traversed_objects)
-        self.assertEquals(texts[-1], "Bug #%d" % self.bug.id)
+        crumbs = self.getBreadcrumbsForObject(self.bugtask)
+        last_crumb = crumbs[-1]
+        self.assertEquals(self.bugtask_url, last_crumb.url)
+        self.assertEquals("Bug #%d" % self.bug.id, last_crumb.text)
 
     def test_bugtask_child(self):
-        url = canonical_url(
-            self.bug.default_bugtask, rootsite='bugs', view_name='+activity')
-        urls = self._getBreadcrumbsURLs(url, self.traversed_objects)
-        self.assertEquals(urls[-1], "%s/+activity" % self.bugtask_url)
-        self.assertEquals(urls[-2], self.bugtask_url)
-        texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
-        self.assertEquals(texts[-2], "Bug #%d" % self.bug.id)
+        crumbs = self.getBreadcrumbsForObject(self.bugtask, view_name='+activity')
+        self.assertEquals(crumbs[-1].url, "%s/+activity" % self.bugtask_url)
+        self.assertEquals(crumbs[-2].url, self.bugtask_url)
+        self.assertEquals(crumbs[-2].text, "Bug #%d" % self.bug.id)
 
     def test_bugtask_comment(self):
-        login('[e-mail]')
+        login_person(self.bug.owner)
         comment = self.factory.makeBugComment(
             bug=self.bug, owner=self.bug.owner,
             subject="test comment subject", body="test comment body")
-        url = canonical_url(comment, rootsite='bugs')
-        urls = self._getBreadcrumbsURLs(url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
-        self.assertEquals(url, "%s/comments/1" % self.bugtask_url)
-        self.assertEquals(urls[-1], "%s" % self.bugtask_url)
-        self.assertEquals(texts[-1], "Bug #%d" % self.bug.id)
-
-    def test_bugtask_private_bug(self):
-        # A breadcrumb is not generated for a bug that the user does
-        # not have permission to view.
-        login('[e-mail]')
-        self.bug.setPrivate(True, self.bug.owner)
-        login(ANONYMOUS)
-        url = canonical_url(self.bug.default_bugtask, rootsite='bugs')
-        self.assertEquals(
-            ['http://launchpad.dev/crumb-tester',
-             'http://bugs.launchpad.dev/crumb-tester'],
-            self._getBreadcrumbsURLs(url, self.traversed_objects))
-        self.assertEquals(
-            ["Crumb Tester", "Bugs"],
-            self._getBreadcrumbsTexts(url, self.traversed_objects))
+        expected_breadcrumbs = [
+            ('Crumb Tester', 'http://launchpad.dev/crumb-tester'),
+            ('Bugs', 'http://bugs.launchpad.dev/crumb-tester'),
+            ('Bug #%s' % self.bug.id,
+             'http://bugs.launchpad.dev/crumb-tester/+bug/%s' % self.bug.id),
+            ('Comment #1',
+             'http://bugs.launchpad.dev/crumb-tester/+bug/%s/comments/1' % self.bug.id),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, comment)
 
 
 class TestBugTrackerBreadcrumbs(BaseBreadcrumbTestCase):
@@ -84,28 +65,19 @@
 
     def test_bug_tracker_set(self):
         # Check TestBugTrackerSetBreadcrumb.
-        traversed_objects = [
-            self.root, self.bug_tracker_set]
-        urls = self._getBreadcrumbsURLs(
-            self.bug_tracker_set_url, traversed_objects)
-        self.assertEquals(self.bug_tracker_set_url, urls[-1])
-        texts = self._getBreadcrumbsTexts(
-            self.bug_tracker_set_url, traversed_objects)
-        self.assertEquals("Bug trackers", texts[-1])
+        expected_breadcrumbs = [
+            ('Bug trackers', self.bug_tracker_set_url),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, self.bug_tracker_set)
 
     def test_bug_tracker(self):
         # Check TestBugTrackerBreadcrumb (and
         # TestBugTrackerSetBreadcrumb).
-        traversed_objects = [
-            self.root, self.bug_tracker_set, self.bug_tracker]
-        urls = self._getBreadcrumbsURLs(
-            self.bug_tracker_url, traversed_objects)
-        self.assertEquals(self.bug_tracker_url, urls[-1])
-        self.assertEquals(self.bug_tracker_set_url, urls[-2])
-        texts = self._getBreadcrumbsTexts(
-            self.bug_tracker_url, traversed_objects)
-        self.assertEquals(self.bug_tracker.title, texts[-1])
-        self.assertEquals("Bug trackers", texts[-2])
+        expected_breadcrumbs = [
+            ('Bug trackers', self.bug_tracker_set_url),
+            (self.bug_tracker.title, self.bug_tracker_url),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, self.bug_tracker)
 
 
 def test_suite():

=== modified file 'lib/lp/code/browser/codeimportmachine.py'
--- lib/lp/code/browser/codeimportmachine.py	2009-08-24 20:28:33 +0000
+++ lib/lp/code/browser/codeimportmachine.py	2010-04-29 11:26:16 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'CodeImportMachineBreadcrumb',
     'CodeImportMachineSetBreadcrumb',
     'CodeImportMachineSetNavigation',
     'CodeImportMachineSetView',
@@ -30,6 +31,14 @@
 from lazr.delegates import delegates
 
 
+class CodeImportMachineBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` that uses the machines hostname."""
+
+    @property
+    def text(self):
+        return self.context.hostname
+
+
 class CodeImportMachineSetNavigation(Navigation):
     """Navigation methods for ICodeImportMachineSet."""
     usedfor = ICodeImportMachineSet

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-04-19 03:44:27 +0000
+++ lib/lp/code/browser/configure.zcml	2010-04-29 11:26:16 +0000
@@ -1055,6 +1055,19 @@
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
         factory="lp.code.browser.branchmergeproposal.BranchMergeProposalBreadcrumb"
         permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
+        factory="lp.code.browser.codeimportmachine.CodeImportMachineBreadcrumb"
+        permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
+        factory="lp.code.browser.codeimportmachine.CodeImportMachineSetBreadcrumb"
+        permission="zope.Public"/>
+
     <adapter
          factory="lp.code.browser.branchmergeproposal.PreviewDiffHTMLRepresentation"
          name="lazr.restful.EntryResource"/>

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-04-23 03:30:30 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-04-29 11:26:16 +0000
@@ -45,6 +45,7 @@
     IArchiveSet)
 from lp.registry.interfaces.distroseries import IDistroSeriesSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.job.interfaces.job import JobStatus
 
 
 class IRecipesForPerson(Interface):
@@ -52,8 +53,7 @@
 
 
 class RecipesForPersonBreadcrumb(Breadcrumb):
-    """A Breadcrumb that will handle the "Recipes" link for recipe breadcrumbs.
-    """
+    """A Breadcrumb to handle the "Recipes" link for recipe breadcrumbs."""
 
     rootsite = 'code'
     text = 'Recipes'
@@ -229,14 +229,26 @@
 
     @property
     def eta(self):
-        """The datetime when the build job is estimated to begin."""
+        """The datetime when the build job is estimated to complete.
+
+        This is the BuildQueue.estimated_duration plus the
+        Job.date_started or BuildQueue.getEstimatedJobStartTime.
+        """
         if self.context.buildqueue_record is None:
             return None
-        return self.context.buildqueue_record.getEstimatedJobStartTime()
+        queue_record = self.context.buildqueue_record
+        if queue_record.job.status == JobStatus.WAITING:
+            start_time = queue_record.getEstimatedJobStartTime()
+            if start_time is None:
+                return None
+        else:
+            start_time = queue_record.job.date_started
+        duration = queue_record.estimated_duration
+        return start_time + duration
 
     @property
     def date(self):
-        """The date when the build complete or will begin."""
+        """The date when the build completed or is estimated to complete."""
         if self.estimate:
             return self.eta
         return self.context.datebuilt
@@ -244,7 +256,9 @@
     @property
     def estimate(self):
         """If true, the date value is an estimate."""
-        return (self.context.datebuilt is None and self.eta is not None)
+        if self.context.datebuilt is not None:
+            return False
+        return self.eta is not None
 
 
 class ISourcePackageAddEditSchema(Interface):
@@ -272,7 +286,7 @@
     def validate(self, data):
         try:
             parser = RecipeParser(data['recipe_text'])
-            recipe_text = parser.parse()
+            parser.parse()
         except RecipeParseError:
             self.setFieldError(
                 'recipe_text',

=== added file 'lib/lp/code/browser/tests/test_breadcrumbs.py'
--- lib/lp/code/browser/tests/test_breadcrumbs.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -0,0 +1,25 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
+
+
+class TestCodeImportMachineBreadcrumb(BaseBreadcrumbTestCase):
+    """Test breadcrumbs for an `ICodeImportMachine`."""
+
+    def test_machine(self):
+        machine = self.factory.makeCodeImportMachine(hostname='apollo')
+        expected = [
+            ('Code Import System', 'http://code.launchpad.dev/+code-imports'),
+            ('Machines', 'http://code.launchpad.dev/+code-imports/+machines'),
+            ('apollo',
+             'http://code.launchpad.dev/+code-imports/+machines/apollo')]
+        self.assertBreadcrumbs(expected, machine)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-04-23 02:35:47 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-04-29 11:26:16 +0000
@@ -19,9 +19,11 @@
     extract_text, find_main_content, find_tags_by_class)
 from canonical.testing import DatabaseFunctionalLayer
 from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.code.browser.sourcepackagerecipe import SourcePackageRecipeView
+from lp.code.browser.sourcepackagerecipe import (
+    SourcePackageRecipeView, SourcePackageRecipeBuildView
+)
 from lp.code.interfaces.sourcepackagerecipe import MINIMAL_RECIPE_TEXT
-from lp.testing import ANONYMOUS, BrowserTestCase, login
+from lp.testing import ANONYMOUS, BrowserTestCase, login, TestCaseWithFactory
 
 
 class TestCaseForRecipe(BrowserTestCase):
@@ -330,6 +332,50 @@
         self.assertEqual(['Secret Squirrel', 'Woody'], build_distros)
 
 
+class TestSourcePackageRecipeBuildView(TestCaseWithFactory):
+    """Test behaviour of SourcePackageReciptBuildView."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_estimate(self):
+        """Time should be estimated until the job is completed."""
+        build = self.factory.makeSourcePackageRecipeBuild()
+        queue_entry = self.factory.makeSourcePackageRecipeBuildJob(
+            recipe_build=build)
+        self.factory.makeBuilder()
+        view = SourcePackageRecipeBuildView(build, None)
+        self.assertTrue(view.estimate)
+        queue_entry.job.start()
+        self.assertTrue(view.estimate)
+        removeSecurityProxy(build).datebuilt = datetime.now(utc)
+        self.assertFalse(view.estimate)
+
+    def test_eta(self):
+        """ETA should be reasonable.
+
+        It should be None if there is no builder or queue entry.
+        It should be getEstimatedJobStartTime + estimated duration for jobs
+        that have not started.
+        It should be job.date_started + estimated duration for jobs that have
+        started.
+        """
+        build = self.factory.makeSourcePackageRecipeBuild()
+        view = SourcePackageRecipeBuildView(build, None)
+        self.assertIs(None, view.eta)
+        queue_entry = self.factory.makeSourcePackageRecipeBuildJob(
+            recipe_build=build)
+        queue_entry._now = lambda: datetime(1970, 1, 1, 0, 0, 0, 0, utc)
+        self.factory.makeBuilder()
+        self.assertIsNot(None, view.eta)
+        self.assertEqual(
+            queue_entry.getEstimatedJobStartTime() +
+            queue_entry.estimated_duration, view.eta)
+        queue_entry.job.start()
+        self.assertEqual(
+            queue_entry.job.date_started + queue_entry.estimated_duration,
+            view.eta)
+
+
 class TestSourcePackageRecipeDeleteView(TestCaseForRecipe):
 
     layer = DatabaseFunctionalLayer

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-23 22:48:25 +0000
+++ lib/lp/code/configure.zcml	2010-04-29 11:26:16 +0000
@@ -64,12 +64,6 @@
          appropriate. -->
   </class>
 
-  <adapter
-      provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
-      for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
-      factory="lp.code.browser.codeimportmachine.CodeImportMachineSetBreadcrumb"
-      permission="zope.Public"/>
-
   <!-- CodeImportMachineSet -->
 
   <securedutility

=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py	2010-04-26 00:24:26 +0000
+++ lib/lp/code/model/tests/test_diff.py	2010-04-29 11:26:16 +0000
@@ -263,7 +263,9 @@
         last_oops_id = errorlog.globalErrorUtility.lastid
         diff_bytes = "not a real diff"
         diff = Diff.fromFile(StringIO(diff_bytes), len(diff_bytes))
-        self.assertNotEqual(last_oops_id, errorlog.globalErrorUtility.lastid)
+        # XXX MichaelHudson, 2010-04-29, bug=567257: This test fails
+        # intermittently when run close to midnight.
+        #self.assertNotEqual(last_oops_id, errorlog.globalErrorUtility.lastid)
         self.assertIs(None, diff.diffstat)
         self.assertIs(None, diff.added_lines_count)
         self.assertIs(None, diff.removed_lines_count)

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-04-12 01:16:16 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-04-29 11:26:16 +0000
@@ -314,6 +314,21 @@
             set([revid, revid1, revid2]),
             set(retrieved_branch.repository.all_revision_ids()))
 
+    def test_pull_doesnt_bring_backup_directories(self):
+        # If the branch has been upgraded in the branch store, `pull` does not
+        # copy the backup.bzr directory to `target_path`, just the .bzr
+        # directory.
+        store = self.makeBranchStore()
+        tree = create_branch_with_one_revision('original')
+        store.push(self.arbitrary_branch_id, tree.branch, default_format)
+        t = get_transport(store._getMirrorURL(self.arbitrary_branch_id))
+        t.mkdir('backup.bzr')
+        retrieved_branch = store.pull(
+            self.arbitrary_branch_id, 'pulled', default_format,
+            needs_tree=False)
+        self.assertEqual(
+            ['.bzr'], retrieved_branch.bzrdir.root_transport.list_dir('.'))
+
 
 class TestImportDataStore(WorkerTest):
     """Tests for `ImportDataStore`."""

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-04-15 02:27:31 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2010-04-29 11:26:16 +0000
@@ -94,9 +94,12 @@
         # revisions are in the ancestry of the tip of the remote branch, which
         # we strictly don't care about, so we just copy the whole thing down
         # at the vfs level.
+        control_dir = remote_bzr_dir.root_transport.relpath(
+            remote_bzr_dir.transport.abspath('.'))
         target = get_transport(target_path)
-        target.ensure_base()
-        remote_bzr_dir.root_transport.copy_tree_to_transport(target)
+        target_control = target.clone(control_dir)
+        target_control.create_prefix()
+        remote_bzr_dir.transport.copy_tree_to_transport(target_control)
         local_bzr_dir = BzrDir.open_from_transport(target)
         if needs_tree:
             local_bzr_dir.create_workingtree()

=== modified file 'lib/lp/registry/browser/tests/test_breadcrumbs.py'
--- lib/lp/registry/browser/tests/test_breadcrumbs.py	2009-11-25 15:08:30 +0000
+++ lib/lp/registry/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -9,8 +9,8 @@
 
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestDistroseriesBreadcrumb(BaseBreadcrumbTestCase):
@@ -25,9 +25,7 @@
         self.distroseries_url = canonical_url(self.distroseries)
 
     def test_distroseries(self):
-        crumbs = self._getBreadcrumbs(
-            self.distroseries_url,
-            [self.root, self.distribution, self.distroseries])
+        crumbs = self.getBreadcrumbsForObject(self.distroseries)
         last_crumb = crumbs[-1]
         self.assertEqual(self.distroseries.named_version, last_crumb.text)
 
@@ -46,9 +44,7 @@
         mirror = self.factory.makeMirror(
             distribution=self.distribution,
             displayname=displayname)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual(displayname, last_crumb.text)
 
@@ -60,9 +56,7 @@
             distribution=self.distribution,
             displayname=None,
             http_url=http_url)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual("Example.com-archive", last_crumb.text)
 
@@ -74,9 +68,7 @@
             distribution=self.distribution,
             displayname=None,
             ftp_url=ftp_url)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual("Example.com-archive", last_crumb.text)
 
@@ -93,15 +85,13 @@
         self.milestone_url = canonical_url(self.milestone)
 
     def test_milestone_without_code_name(self):
-        crumbs = self._getBreadcrumbs(
-            self.milestone_url, [self.root, self.project, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(self.milestone)
         last_crumb = crumbs[-1]
         self.assertEqual(self.milestone.name, last_crumb.text)
 
     def test_milestone_with_code_name(self):
         self.milestone.code_name = "duck"
-        crumbs = self._getBreadcrumbs(
-            self.milestone_url, [self.root, self.project, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(self.milestone)
         last_crumb = crumbs[-1]
         expected_text = '%s "%s"' % (
             self.milestone.name, self.milestone.code_name)
@@ -109,10 +99,7 @@
 
     def test_productrelease(self):
         release = self.factory.makeProductRelease(milestone=self.milestone)
-        self.release_url = canonical_url(release)
-        crumbs = self._getBreadcrumbs(
-            self.release_url,
-            [self.root, self.project, self.series, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(release)
         last_crumb = crumbs[-1]
         self.assertEqual(self.milestone.name, last_crumb.text)
 
@@ -131,12 +118,9 @@
             name=name,
             title=title,
             proposition=proposition)
-        self.poll_url = canonical_url(self.poll)
 
     def test_poll(self):
-        crumbs = self._getBreadcrumbs(
-            self.poll_url,
-            [self.root, self.team, self.poll])
+        crumbs = self.getBreadcrumbsForObject(self.poll)
         last_crumb = crumbs[-1]
         self.assertEqual(self.poll.title, last_crumb.text)
 

=== modified file 'lib/lp/services/mailman/doc/reactivate-lists.txt'
--- lib/lp/services/mailman/doc/reactivate-lists.txt	2009-09-24 18:51:29 +0000
+++ lib/lp/services/mailman/doc/reactivate-lists.txt	2010-04-29 11:26:16 +0000
@@ -50,7 +50,7 @@
 
 Now the team owner reactivates the list.
 
-    >>> browser.getLink('Create a mailing list').click()
+    >>> browser.getLink('Configure mailing list').click()
     >>> browser.getControl('Reactivate this Mailing List').click()
     >>> xmlrpc_watcher.wait_for_reactivation('itest-one')
 

=== modified file 'lib/lp/services/mailman/doc/staging.txt'
--- lib/lp/services/mailman/doc/staging.txt	2009-12-02 22:56:09 +0000
+++ lib/lp/services/mailman/doc/staging.txt	2010-04-29 11:26:16 +0000
@@ -22,7 +22,8 @@
 
     >>> login('[e-mail]')
 
-    >>> owner = factory.makePerson()
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> owner = removeSecurityProxy(factory.makePerson())
     >>> team_one = factory.makeTeam(owner=owner, name='staging-one')
     >>> team_two = factory.makeTeam(owner=owner, name='staging-two')
     >>> transaction.commit()

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-04-16 05:03:03 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-04-29 11:26:16 +0000
@@ -10,6 +10,7 @@
     'ArchiveActivateView',
     'ArchiveBadges',
     'ArchiveBuildsView',
+    'ArchiveDeleteView',
     'ArchiveEditDependenciesView',
     'ArchiveEditView',
     'ArchiveIndexActionsMenu',
@@ -59,8 +60,8 @@
 from lp.soyuz.adapters.archivesourcepublication import (
     ArchiveSourcePublications)
 from lp.soyuz.interfaces.archive import (
-    ArchivePurpose, CannotCopy, IArchive, IArchiveEditDependenciesForm,
-    IArchiveSet, IPPAActivateForm, NoSuchPPA)
+    ArchivePurpose, ArchiveStatus, CannotCopy, IArchive,
+    IArchiveEditDependenciesForm, IArchiveSet, IPPAActivateForm, NoSuchPPA)
 from lp.soyuz.interfaces.archivepermission import (
     ArchivePermissionType, IArchivePermissionSet)
 from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
@@ -404,15 +405,24 @@
         # This link should only be available for private archives:
         view = self.context
         archive = view.context
-        if not archive.private:
+        if not archive.private or not archive.is_active:
             link.enabled = False
-
         return link
 
     @enabled_with_permission('launchpad.Edit')
     def edit(self):
         text = 'Change details'
-        return Link('+edit', text, icon='edit')
+        view = self.context
+        return Link(
+            '+edit', text, icon='edit', enabled=view.context.is_active)
+
+    @enabled_with_permission('launchpad.Edit')
+    def delete_ppa(self):
+        text = 'Delete PPA'
+        view = self.context
+        return Link(
+            '+delete', text, icon='trash-icon',
+            enabled=view.context.is_active)
 
     def builds(self):
         text = 'View all builds'
@@ -444,6 +454,9 @@
         # archives without any sources.
         if self.context.is_copy or not self.context.has_sources:
             link.enabled = False
+        view = self.context
+        if not view.context.is_active:
+            link.enabled = False
         return link
 
     @enabled_with_permission('launchpad.AnyPerson')
@@ -460,7 +473,10 @@
     @enabled_with_permission('launchpad.Edit')
     def edit_dependencies(self):
         text = 'Edit PPA dependencies'
-        return Link('+edit-dependencies', text, icon='edit')
+        view = self.context
+        return Link(
+            '+edit-dependencies', text, icon='edit',
+            enabled=view.context.is_active)
 
 
 class ArchiveNavigationMenu(NavigationMenu, ArchiveMenuMixin):
@@ -468,9 +484,9 @@
 
     usedfor = IArchive
     facet = 'overview'
-    links = ['admin', 'builds', 'builds_building', 'builds_pending',
-             'builds_successful', 'edit', 'edit_dependencies', 'packages',
-             'ppa']
+    links = ['admin', 'builds', 'builds_building',
+             'builds_pending', 'builds_successful',
+             'packages', 'ppa']
 
 
 class IArchiveIndexActionsMenu(Interface):
@@ -481,8 +497,8 @@
     """Archive index navigation menu."""
     usedfor = IArchiveIndexActionsMenu
     facet = 'overview'
-    links = ['admin', 'edit', 'edit_dependencies', 'manage_subscribers',
-             'packages']
+    links = ['admin', 'edit', 'edit_dependencies',
+             'manage_subscribers', 'packages', 'delete_ppa']
 
 
 class IArchivePackagesActionMenu(Interface):
@@ -578,7 +594,7 @@
         if self.context.is_ppa:
             return 'PPA'
         else:
-            return 'Archive'
+            return 'archive'
 
     @cachedproperty
     def build_counters(self):
@@ -622,6 +638,19 @@
         return list(copy_requests)
 
 
+    @property
+    def disabled_warning_message(self):
+        """Return an appropriate message if the archive is disabled."""
+        if self.context.enabled:
+            return None
+
+        if self.context.status in (
+            ArchiveStatus.DELETED, ArchiveStatus.DELETING):
+            return "This %s has been deleted." % self.archive_label
+        else:
+            return "This %s has been disabled." % self.archive_label
+
+
 class ArchiveSeriesVocabularyFactory:
     """A factory for generating vocabularies of an archive's series."""
 
@@ -1916,3 +1945,44 @@
         :rtype: bool
         """
         return self.context.owner.visibility == PersonVisibility.PRIVATE
+
+
+class ArchiveDeleteView(LaunchpadFormView):
+    """View class for deleting `IArchive`s"""
+
+    schema = Interface
+
+    @property
+    def page_title(self):
+        return smartquote('Delete "%s"' % self.context.displayname)
+
+    @property
+    def label(self):
+        return self.page_title
+
+    @property
+    def can_be_deleted(self):
+        return self.context.status not in (
+            ArchiveStatus.DELETING, ArchiveStatus.DELETED)
+
+    @property
+    def waiting_for_deletion(self):
+        return self.context.status == ArchiveStatus.DELETING
+
+    @property
+    def next_url(self):
+        # We redirect back to the PPA owner's profile page on a
+        # successful action.
+        return canonical_url(self.context.owner)
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+
+    @action(_("Permanently delete PPA"), name="delete_ppa")
+    def action_delete_ppa(self, action, data):
+        self.context.delete(self.user)
+        self.request.response.addInfoNotification(
+            "Deletion of '%s' has been requested and the repository will be "
+            "removed shortly." % self.context.title)
+

=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2010-04-16 05:03:03 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2010-04-29 11:26:16 +0000
@@ -276,6 +276,13 @@
         permission="launchpad.Edit"
         template="../templates/archive-edit.pt"/>
     <browser:page
+        name="+delete"
+        facet="overview"
+        for="lp.soyuz.interfaces.archive.IArchive"
+        class="lp.soyuz.browser.archive.ArchiveDeleteView"
+        permission="launchpad.Edit"
+        template="../templates/archive-delete.pt"/>
+    <browser:page
         name="+admin"
         facet="overview"
         for="lp.soyuz.interfaces.archive.IArchive"

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-04-15 23:25:47 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-04-29 11:26:16 +0000
@@ -38,13 +38,13 @@
     None
 
 The ArchiveView includes an archive_label property that returns either
-the string 'PPA' or 'Archive' depending on whether the archive is a PPA
+the string 'PPA' or 'archive' depending on whether the archive is a PPA
 (this is mainly for branding purposes):
 
     >>> print ppa_archive_view.archive_label
     PPA
     >>> print copy_archive_view.archive_label
-    Archive
+    archive
 
 The ArchiveView is provides the html for the inline description
 editing widget.

=== modified file 'lib/lp/soyuz/browser/tests/test_breadcrumbs.py'
--- lib/lp/soyuz/browser/tests/test_breadcrumbs.py	2009-09-29 07:21:40 +0000
+++ lib/lp/soyuz/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -8,11 +8,11 @@
 from zope.component import getUtility
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.soyuz.browser.archivesubscription import PersonalArchiveSubscription
 from lp.testing import login, login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestDistroArchSeriesBreadcrumb(BaseBreadcrumbTestCase):
@@ -22,39 +22,27 @@
         self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         self.hoary = self.ubuntu.getSeries('hoary')
         self.hoary_i386 = self.hoary['i386']
-        self.traversed_objects = [
-            self.root, self.ubuntu, self.hoary, self.hoary_i386]
 
     def test_distroarchseries(self):
         das_url = canonical_url(self.hoary_i386)
-        urls = self._getBreadcrumbsURLs(das_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(das_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], das_url)
-        self.assertEquals(texts[-1], "i386")
+        crumbs = self.getBreadcrumbsForObject(self.hoary_i386)
+        self.assertEquals(crumbs[-1].url, das_url)
+        self.assertEquals(crumbs[-1].text, "i386")
 
     def test_distroarchseriesbinarypackage(self):
         pmount_hoary_i386 = self.hoary_i386.getBinaryPackage("pmount")
-        self.traversed_objects.append(pmount_hoary_i386)
         pmount_url = canonical_url(pmount_hoary_i386)
-        urls = self._getBreadcrumbsURLs(pmount_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(pmount_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], pmount_url)
-        self.assertEquals(texts[-1], "pmount")
+        crumbs = self.getBreadcrumbsForObject(pmount_hoary_i386)
+        self.assertEquals(crumbs[-1].url, pmount_url)
+        self.assertEquals(crumbs[-1].text, "pmount")
 
     def test_distroarchseriesbinarypackagerelease(self):
         pmount_hoary_i386 = self.hoary_i386.getBinaryPackage("pmount")
         pmount_release = pmount_hoary_i386['0.1-1']
-        self.traversed_objects.extend([pmount_hoary_i386, pmount_release])
         pmount_release_url = canonical_url(pmount_release)
-        urls = self._getBreadcrumbsURLs(
-            pmount_release_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(
-            pmount_release_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], pmount_release_url)
-        self.assertEquals(texts[-1], "0.1-1")
+        crumbs = self.getBreadcrumbsForObject(pmount_release)
+        self.assertEquals(crumbs[-1].url, pmount_release_url)
+        self.assertEquals(crumbs[-1].text, "0.1-1")
 
 
 class TestArchiveSubscriptionBreadcrumb(BaseBreadcrumbTestCase):
@@ -76,18 +64,10 @@
             owner, self.ppa)
 
     def test_personal_archive_subscription(self):
-        self.traversed_objects = [
-            self.root, self.ppa.owner, self.personal_archive_subscription]
         subscription_url = canonical_url(self.personal_archive_subscription)
-
-        urls = self._getBreadcrumbsURLs(
-            subscription_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(
-            subscription_url, self.traversed_objects)
-
-        self.assertEquals(subscription_url, urls[-1])
-        self.assertEquals(
-            "Access to %s" % self.ppa.displayname, texts[-1])
+        crumbs = self.getBreadcrumbsForObject(self.personal_archive_subscription)
+        self.assertEquals(subscription_url, crumbs[-1].url)
+        self.assertEquals("Access to %s" % self.ppa.displayname, crumbs[-1].text)
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== added file 'lib/lp/soyuz/doc/archive-deletion.txt'
--- lib/lp/soyuz/doc/archive-deletion.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/doc/archive-deletion.txt	2010-04-29 11:26:16 +0000
@@ -0,0 +1,81 @@
+= Deleting an archive =
+
+When deleting an archive, the user calls IArchive.delete(), passing in
+the IPerson who is requesting the deletion.
+
+All of the publishing records will be marked as DELETED, the archive is
+disabled and the status is set to DELETING.
+
+This status tells the publisher to then delete the repository area.  Once
+it completes that task it will set the status to DELETED.
+
+    >>> from lp.soyuz.interfaces.archive import (
+    ...     ArchiveStatus, IArchiveSet, IArchive)
+    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
+    >>> login("[e-mail]")
+    >>> stp = SoyuzTestPublisher()
+    >>> stp.prepareBreezyAutotest()
+    >>> archive = factory.makeArchive()
+
+The archive is currently active:
+
+    >>> print archive.enabled
+    True
+
+    >>> print archive.status.name
+    ACTIVE
+
+We can create some packages in it using the test publisher:
+
+    >>> from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+    >>> ignore = stp.getPubBinaries(
+    ...     archive=archive, binaryname="foo-bin1",
+    ...     status=PackagePublishingStatus.PENDING)
+    >>> ignore = stp.getPubBinaries(
+    ...     archive=archive, binaryname="foo-bin2",
+    ...     status=PackagePublishingStatus.PUBLISHED)
+    >>> from storm.store import Store
+    >>> Store.of(archive).flush()
+
+Calling delete() will now do the deletion.  It is only callable by someone
+with launchpad.Edit permission on the archive.  Here, "duderino" who is
+some random dude is refused:
+
+    >>> person = factory.makePerson(name="duderino")
+    >>> login_person(person)
+    >>> archive.delete(person)
+    Traceback (most recent call last):
+    ...
+    Unauthorized:...
+
+However we can delete it using the owner of the archive:
+
+    >>> login_person(archive.owner)
+    >>> archive.delete(archive.owner)
+
+The deletion code uses a store.execute() command to speed up the operation
+where many records need to be updated.  Therefore we need to invalidate
+the cache to make Storm re-read the database objects.
+
+    >>> Store.of(archive).invalidate()
+
+Now, all the publications are DELETED, the archive is disabled and the
+status is DELETING to tell the publisher to remove the repository:
+
+    >>> publications = list(archive.getPublishedSources())
+    >>> publications.extend(list(archive.getAllPublishedBinaries()))
+    >>> for pub in publications:
+    ...     print "%s, %s by %s" % (
+    ...         pub.displayname, pub.status.name, pub.removed_by.name)
+    foo 666 in breezy-autotest, DELETED by person-name12
+    foo 666 in breezy-autotest, DELETED by person-name12
+    foo-bin1 666 in breezy-autotest i386, DELETED by person-name12
+    foo-bin1 666 in breezy-autotest hppa, DELETED by person-name12
+    foo-bin2 666 in breezy-autotest i386, DELETED by person-name12
+    foo-bin2 666 in breezy-autotest hppa, DELETED by person-name12
+
+    >>> print archive.enabled
+    False
+
+    >>> print archive.status.name
+    DELETING

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-04-15 10:27:06 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-04-29 11:26:16 +0000
@@ -45,6 +45,8 @@
     True
     >>> cprov_archive.is_main
     False
+    >>> cprov_archive.is_active
+    True
     >>> cprov_archive.distribution.main_archive.is_main
     True
     >>> cprov_archive.total_count

=== modified file 'lib/lp/soyuz/doc/buildd-mass-retry.txt'
--- lib/lp/soyuz/doc/buildd-mass-retry.txt	2010-04-14 17:34:35 +0000
+++ lib/lp/soyuz/doc/buildd-mass-retry.txt	2010-04-29 11:26:16 +0000
@@ -47,6 +47,45 @@
   INFO    Dry-run.
   <BLANKLINE>
 
+Superseded builds won't be retried; buildd-manager will just skip the build
+and set it to SUPERSEDED.
+
+  >>> from zope.security.proxy import removeSecurityProxy
+  >>> from lp.soyuz.interfaces.binarypackagebuild import (
+  ...     IBinaryPackageBuildSet)
+  >>> from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+  >>> build = getUtility(IBinaryPackageBuildSet).getByBuildID(12)
+  >>> pub = removeSecurityProxy(build.current_source_publication)
+
+Let's mark the build from the previous run superseded.
+
+  >>> pub.status = PackagePublishingStatus.SUPERSEDED
+  >>> print build.current_source_publication
+  None
+  >>> transaction.commit()
+
+A new run doesn't pick it up.
+
+  >>> process = subprocess.Popen([sys.executable, script, "-v", "-NFDC",
+  ...                             "-s", "hoary"],
+  ...                            stdout=subprocess.PIPE,
+  ...                            stderr=subprocess.PIPE,)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stderr
+  DEBUG   Intitialising connection.
+  INFO    Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
+  INFO    Processing builds in 'Failed to build'
+  INFO    Processing builds in 'Dependency wait'
+  DEBUG   Skipping superseded i386 build of libstdc++ b8p in ubuntu hoary RELEASE (12)
+  INFO    Processing builds in 'Chroot problem'
+  INFO    Success.
+  INFO    Dry-run.
+  <BLANKLINE>
+
+  >>> pub.status = PackagePublishingStatus.PUBLISHED
+  >>> transaction.commit()
 
 Passing an architecture, which contains no failed build records,
 nothing is done:

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-03-24 14:40:26 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-04-29 11:26:16 +0000
@@ -222,6 +222,10 @@
     is_main = Bool(
         title=_("True if archive is a main archive type"), required=False)
 
+    is_active = Bool(
+        title=_("True if the archive is in the active state"),
+        required=False, readonly=True)
+
     series_with_sources = Attribute(
         "DistroSeries to which this archive has published sources")
     number_of_sources = Attribute(
@@ -1151,6 +1155,19 @@
     def disable():
         """Disable the archive."""
 
+    def delete(deleted_by):
+        """Delete this archive.
+
+        :param deleted_by: The `IPerson` requesting the deletion.
+
+        The ArchiveStatus will be set to DELETING and any published
+        packages will be marked as DELETED by deleted_by.
+
+        The publisher is responsible for deleting the repository area
+        when it sees the status change and sets it to DELETED once
+        processed.
+        """
+
 
 class IArchive(IArchivePublic, IArchiveAppend, IArchiveEdit, IArchiveView):
     """Main Archive interface."""

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-04-15 10:27:06 +0000
+++ lib/lp/soyuz/model/archive.py	2010-04-29 11:26:16 +0000
@@ -150,7 +150,8 @@
         dbName='purpose', unique=False, notNull=True, schema=ArchivePurpose)
 
     status = EnumCol(
-        dbName="status", unique=False, notNull=True, schema=ArchiveStatus)
+        dbName="status", unique=False, notNull=True, schema=ArchiveStatus,
+        default=ArchiveStatus.ACTIVE)
 
     _enabled = BoolCol(dbName='enabled', notNull=True, default=True)
     enabled = property(lambda x: x._enabled)
@@ -269,6 +270,11 @@
         return self.purpose in MAIN_ARCHIVE_PURPOSES
 
     @property
+    def is_active(self):
+        """See `IArchive`."""
+        return self.status == ArchiveStatus.ACTIVE
+
+    @property
     def series_with_sources(self):
         """See `IArchive`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
@@ -1409,6 +1415,26 @@
         self._enabled = False
         self._setBuildStatuses(JobStatus.SUSPENDED)
 
+    def delete(self, deleted_by):
+        """See `IArchive`."""
+        assert self.status not in (
+            ArchiveStatus.DELETING, ArchiveStatus.DELETED,
+            "This archive is already deleted.")
+
+        # Set all the publications to DELETED.
+        statuses = (
+            PackagePublishingStatus.PENDING,
+            PackagePublishingStatus.PUBLISHED)
+        sources = list(self.getPublishedSources(status=statuses))
+        getUtility(IPublishingSet).requestDeletion(
+            sources, removed_by=deleted_by,
+            removal_comment="Removed when deleting archive")
+
+        # Mark the archive's status as DELETING so the repository can be
+        # removed by the publisher.
+        self.status = ArchiveStatus.DELETING
+        self.disable()
+
 
 class ArchiveSet:
     implements(IArchiveSet)

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-04-14 09:53:04 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-04-29 11:26:16 +0000
@@ -251,10 +251,6 @@
 
         inventory_conflicts = self.getConflicts(source)
 
-        if (destination_archive_conflicts.count() == 0 and
-            len(inventory_conflicts) == 0):
-            return
-
         # Cache the conflicting publications because they will be iterated
         # more than once.
         destination_archive_conflicts = list(destination_archive_conflicts)

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-04-14 09:53:04 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-04-29 11:26:16 +0000
@@ -2456,10 +2456,10 @@
         """
         ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         warty = ubuntu.getSeries('warty')
-        hoary = ubuntu.getSeries('hoary')
         test_publisher = self.getTestPublisher(warty)
         test_publisher.addFakeChroots(warty)
 
+        orig_tarball = 'test-source_1.0.orig.tar.gz'
         proposed_source = test_publisher.getPubSource(
             sourcename='test-source', version='1.0-2',
             distroseries=warty, archive=warty.main_archive,
@@ -2467,7 +2467,7 @@
             status=PackagePublishingStatus.PUBLISHED,
             section='net')
         proposed_tar = test_publisher.addMockFile(
-            'test-source_1.0.orig.tar.gz', filecontent='aaabbbccc')
+            orig_tarball, filecontent='aaabbbccc')
         proposed_source.sourcepackagerelease.addFile(proposed_tar)
         updates_source = test_publisher.getPubSource(
             sourcename='test-source', version='1.0-1',
@@ -2476,7 +2476,7 @@
             status=PackagePublishingStatus.PUBLISHED,
             section='misc')
         updates_tar = test_publisher.addMockFile(
-            'test-source_1.0.orig.tar.gz', filecontent='zzzyyyxxx')
+            orig_tarball, filecontent='zzzyyyxxx')
         updates_source.sourcepackagerelease.addFile(updates_tar)
         # Commit to ensure librarian files are written.
         self.layer.txn.commit()
@@ -2489,6 +2489,51 @@
             checker.checkCopy, proposed_source, warty,
             PackagePublishingPocket.UPDATES)
 
+    def testCopySourceWithConflictingFilesInPPAs(self):
+        """We can copy source if the source files match, both in name and
+        contents. We can't if they don't.
+        """
+        joe = self.factory.makePerson(email='[e-mail]')
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+        warty = ubuntu.getSeries('warty')
+        test_publisher = self.getTestPublisher(warty)
+        test_publisher.addFakeChroots(warty)
+        dest_ppa = self.factory.makeArchive(
+            distribution=ubuntu, owner=joe, purpose=ArchivePurpose.PPA,
+            name='test1')
+        src_ppa = self.factory.makeArchive(
+            distribution=ubuntu, owner=joe, purpose=ArchivePurpose.PPA,
+            name='test2')
+        test1_source = test_publisher.getPubSource(
+            sourcename='test-source', version='1.0-1',
+            distroseries=warty, archive=dest_ppa,
+            pocket=PackagePublishingPocket.RELEASE,
+            status=PackagePublishingStatus.PUBLISHED,
+            section='misc')
+        orig_tarball = 'test-source_1.0.orig.tar.gz'
+        test1_tar = test_publisher.addMockFile(
+            orig_tarball, filecontent='aaabbbccc')
+        test1_source.sourcepackagerelease.addFile(test1_tar)
+        test2_source = test_publisher.getPubSource(
+            sourcename='test-source', version='1.0-2',
+            distroseries=warty, archive=src_ppa,
+            pocket=PackagePublishingPocket.RELEASE,
+            status=PackagePublishingStatus.PUBLISHED,
+            section='misc')
+        test2_tar = test_publisher.addMockFile(
+            orig_tarball, filecontent='zzzyyyxxx')
+        test2_source.sourcepackagerelease.addFile(test2_tar)
+        # Commit to ensure librarian files are written.
+        self.layer.txn.commit()
+
+        checker = CopyChecker(dest_ppa, include_binaries=False)
+        self.assertRaisesWithContent(
+            CannotCopy,
+            "test-source_1.0.orig.tar.gz already exists in destination "
+            "archive with different contents.",
+            checker.checkCopy, test2_source, warty,
+            PackagePublishingPocket.RELEASE)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2010-02-25 16:49:16 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2010-04-29 11:26:16 +0000
@@ -392,7 +392,7 @@
 
     >>> for msg in get_feedback_messages(admin_browser.contents):
     ...     print msg
-    This archive has been disabled.
+    This PPA has been disabled.
 
 We need go back to the "Administer archive" page to see the build score and
 external dependencies changes that were made:
@@ -718,7 +718,8 @@
 
     >>> no_priv_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
-    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa/+edit")
+    >>> no_priv_browser.open(
+    ...     "http://launchpad.dev/~no-priv/+archive/ppa/+edit")
 
 Initially, the PPA is enabled and publishes.
 
@@ -734,11 +735,12 @@
     >>> no_priv_browser.getControl('Save').click()
     >>> print extract_text(
     ...     first_tag_by_class(no_priv_browser.contents, 'warning message'))
-    This archive has been disabled.
+    This PPA has been disabled.
 
 Going back to the edit page, we can see the publish flag was cleared:
 
-    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa/+edit")
+    >>> no_priv_browser.open(
+    ...     "http://launchpad.dev/~no-priv/+archive/ppa/+edit")
     >>> print no_priv_browser.getControl(name='field.publish').value
     False
 
@@ -754,3 +756,79 @@
     True
 
 
+== Deleting a PPA ==
+
+Users with launchpad.Edit permission see a "Delete PPA" link in the
+navigation menu.
+
+    >>> anon_browser.open("http://launchpad.dev/~no-priv/+archive/ppa")
+    >>> print anon_browser.getLink("Delete PPA")
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+    >>> no_priv_browser.open("http://launchpad.dev/~no-priv/+archive/ppa")
+    >>> no_priv_browser.getLink("Delete PPA").click()
+
+Clicking this link takes the user to a page that allows deletion of a PPA:
+
+    >>> print no_priv_browser.title
+    Delete “PPA for No Privileges Person” : PPA for No Privileges Person :
+        No Privileges Person
+
+The page contains a stern warning that this action is final and irreversible:
+
+    >>> print extract_text(find_main_content(no_priv_browser.contents))
+    Delete “PPA for No Privileges Person”
+    ...
+    Deleting a PPA will destroy all of its packages, files and the
+    repository area.
+    This deletion is PERMANENT and cannot be undone.
+    Are you sure ?
+    ...
+
+If the user changes his mind, he can click on the cancel link to go back
+a page:
+
+    >>> print no_priv_browser.getLink("Cancel").url
+    http://launchpad.dev/~no-priv/+archive/ppa
+
+Otherwise, he has a button to press to confirm the deletion.
+
+    >>> no_priv_browser.getControl("Permanently delete PPA").click()
+
+This action will redirect the user back to his profile page, which will
+contain a notification message that the deletion is in progress.
+
+    >>> print no_priv_browser.url
+    http://launchpad.dev/~no-priv
+
+    >>> for msg in get_feedback_messages(no_priv_browser.contents):
+    ...     print msg
+    Deletion of 'PPA for No Privileges Person' has been requested and
+    the repository will be removed shortly.
+
+The deleted PPA is still available to browse via a link on the profile page
+so you can see its build history, etc.:
+
+    >>> no_priv_browser.getLink("PPA for No Privileges Person").click()
+
+However, most of the action links are removed for deleted PPAs, so you can
+no longer "Delete packages", "Edit PPA dependencies", or "Change details".
+
+    >>> print no_priv_browser.getLink("Change details")
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+    
+    >>> print no_priv_browser.getLink("Edit PPA dependencies")
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+    >>> no_priv_browser.getLink("View package details").click()
+    >>> print no_priv_browser.getLink("Delete packages")
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+

=== added file 'lib/lp/soyuz/templates/archive-delete.pt'
--- lib/lp/soyuz/templates/archive-delete.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/templates/archive-delete.pt	2010-04-29 11:26:16 +0000
@@ -0,0 +1,32 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="view/macro:page/main_only"
+  i18n:domain="launchpad"
+>
+<body>
+
+  <div metal:fill-slot="main">
+
+    <div class="top-portlet"
+         tal:condition="view/can_be_deleted">
+      <p>Deleting a PPA will destroy all of its packages,
+         files and the repository area.</p>
+      <p>This deletion is PERMANENT and cannot be undone.</p>
+      <p>Are you sure ?</p>
+
+      <div metal:use-macro="context/@@launchpad_form/form" />
+    </div>
+
+    <div class="top-portlet"
+         tal:condition="view/waiting_for_deletion">
+      <p>This archive is marked for deletion and will be removed
+         shortly.</p>
+    </div>
+
+  </div> <!-- main -->
+
+</body>
+</html>

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2010-02-25 10:47:50 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2010-04-29 11:26:16 +0000
@@ -26,7 +26,8 @@
 
     <div class="top-portlet" style="padding-top:0.5em;">
       <p tal:condition="not: context/enabled"
-         style="clear: right;" class="warning message">
+         style="clear: right;" class="warning message"
+         tal:content="view/disabled_warning_message">
         This archive has been disabled.
       </p>
 

=== modified file 'lib/lp/soyuz/templates/archive-packages.pt'
--- lib/lp/soyuz/templates/archive-packages.pt	2009-12-03 18:33:22 +0000
+++ lib/lp/soyuz/templates/archive-packages.pt	2010-04-29 11:26:16 +0000
@@ -104,7 +104,8 @@
              tal:content="structure view/@@+global-actions" />
 
         <p tal:condition="not: context/enabled"
-           style="clear: right;" class="warning message">
+           style="clear: right;" class="warning message"
+           tal:content="view/disabled_warning_message">
           This archive has been disabled.
         </p>
 

=== renamed file 'lib/canonical/launchpad/webapp/tests/breadcrumbs.py' => 'lib/lp/testing/breadcrumbs.py'
--- lib/canonical/launchpad/webapp/tests/breadcrumbs.py	2009-09-17 18:05:29 +0000
+++ lib/lp/testing/breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -3,67 +3,51 @@
 
 __metaclass__ = type
 
-from zope.app import zapi
-from zope.component import ComponentLookupError, getMultiAdapter
-
-from canonical.lazr.testing.menus import make_fake_request
-from canonical.launchpad.layers import setFirstLayer
-from canonical.launchpad.webapp.publisher import RootObject
+from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.testing import DatabaseFunctionalLayer
+
 from lp.testing import TestCaseWithFactory
+from lp.testing.views import create_initialized_view
+from lp.testing.publication import test_traverse
 
 
 class BaseBreadcrumbTestCase(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
-    request_layer = None
-
-    def setUp(self):
-        super(BaseBreadcrumbTestCase, self).setUp()
-        self.root = RootObject()
-
-    def _getHierarchyView(self, url, traversed_objects):
-        request = self._make_request(url, traversed_objects)
-        return getMultiAdapter((self.root, request), name='+hierarchy')
-
-    def _getBreadcrumbs(self, url, traversed_objects):
-        view = self._getHierarchyView(url, traversed_objects)
+
+    def assertBreadcrumbs(self, expected, obj, view_name=None, rootsite=None):
+        """Assert that the breadcrumbs for obj match the expected values.
+
+        :param expected: A list of tuples containing (text, url) pairs.
+        """
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(
+            expected,
+            [(crumb.text, crumb.url) for crumb in crumbs])
+
+    def assertBreadcrumbTexts(self, expected, obj, view_name=None,
+                              rootsite=None):
+        """The text of the breadcrumbs for obj match the expected values."""
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(expected, [crumb.text for crumb in crumbs])
+
+    def assertBreadcrumbUrls(self, expected, obj, view_name=None,
+                             rootsite=None):
+        """The urls of the breadcrumbs for obj match the expected values."""
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(expected, [crumb.url for crumb in crumbs])
+
+    def getBreadcrumbsForObject(self, obj, view_name=None, rootsite=None):
+        """Get the breadcrumbs for the specified object.
+
+        Traverse to the canonical_url of the object, and use the request from
+        that to feed into the initialized hierarchy view so we get the
+        traversed objects.
+        """
+        url = canonical_url(obj, view_name=view_name, rootsite=rootsite)
+        return self.getBreadcrumbsForUrl(url)
+
+    def getBreadcrumbsForUrl(self, url):
+        obj, view, request = test_traverse(url)
+        view = create_initialized_view(obj, '+hierarchy', request=request)
         return view.items
-
-    def _getBreadcrumbsTexts(self, url, traversed_objects):
-        crumbs = self._getBreadcrumbs(url, traversed_objects)
-        return [crumb.text for crumb in crumbs]
-
-    def _getBreadcrumbsURLs(self, url, traversed_objects):
-        crumbs = self._getBreadcrumbs(url, traversed_objects)
-        return [crumb.url for crumb in crumbs]
-
-    def _make_request(self, url, traversed_objects):
-        """Create and return a LaunchpadTestRequest.
-
-        Set the given list of traversed objects as request.traversed_objects,
-        also appending the view that the given URL points to, to mimic how
-        request.traversed_objects behave in a real request.
-
-        XXX: salgado, bug=432025, 2009-09-17: Instead of setting
-        request.traversed_objects manually, we should duplicate parts of
-        zope.publisher.publish.publish here (or in make_fake_request()) so
-        that tests don't have to specify the list of traversed objects for us
-        to set here.
-        """
-        request = make_fake_request(url, traversed_objects=traversed_objects)
-        if self.request_layer is not None:
-            setFirstLayer(request, self.request_layer)
-        last_segment = request._traversed_names[-1]
-        if traversed_objects:
-            obj = traversed_objects[-1]
-            # Assume the last_segment is the name of the view on the last
-            # traversed object, and if we fail to find a view with that name,
-            # use the default view.
-            try:
-                view = getMultiAdapter((obj, request), name=last_segment)
-            except ComponentLookupError:
-                default_view_name = zapi.getDefaultViewName(obj, request)
-                view = getMultiAdapter((obj, request), name=default_view_name)
-            request.traversed_objects.append(view)
-        return request

=== modified file 'lib/lp/testing/publication.py'
--- lib/lp/testing/publication.py	2009-07-17 02:25:09 +0000
+++ lib/lp/testing/publication.py	2010-04-29 11:26:16 +0000
@@ -7,14 +7,24 @@
 __all__ = [
     'get_request_and_publication',
     'print_request_and_publication',
+    'test_traverse',
     ]
 
 from cStringIO import StringIO
 
 # Z3 doesn't make this available as a utility.
+from zope.app import zapi
 from zope.app.publication.requestpublicationregistry import factoryRegistry
+from zope.component import getUtility
+from zope.interface import providedBy
+from zope.publisher.interfaces.browser import IDefaultSkin
+
+from canonical.launchpad.interfaces.launchpad import IOpenLaunchBag
+import canonical.launchpad.layers as layers
+from canonical.launchpad.webapp import urlsplit
 from canonical.launchpad.webapp.servers import ProtocolErrorPublication
 
+
 # Defines an helper function that returns the appropriate
 # IRequest and IPublication.
 def get_request_and_publication(host='localhost', port=None,
@@ -39,6 +49,7 @@
     publication = publication_factory(None)
     return request, publication
 
+
 def print_request_and_publication(host='localhost', port=None,
                                   method='GET',
                                   mime_type='text/html',
@@ -56,3 +67,49 @@
             print "  %s: %s" % (name, value)
     else:
         print publication_classname
+
+
+def test_traverse(url):
+    """Traverse the url in the same way normal publishing occurs.
+
+    Returns a tuple of (object, view, request) where:
+      object is the last model object in the traversal chain
+      view is the defined view for the object at the specified url (if
+        the url didn't directly specify a view, then the view is the
+        default view for the object.
+      request is the request object resulting from the traversal.  This
+        contains a populated traversed_objects list just as a browser
+        request would from a normal call into the app servers.
+
+    This call uses the currently logged in user, and does not start a new
+    transaction.
+    """
+    url_parts = urlsplit(url)
+    server_url = '://'.join(url_parts[0:2])
+    path_info = url_parts[2]
+    request, publication = get_request_and_publication(
+        host=url_parts[1], extra_environment={
+            'SERVER_URL': server_url,
+            'PATH_INFO': path_info})
+
+    request.setPublication(publication)
+    # We avoid calling publication.beforePublication because this starts a new
+    # transaction, which causes an abort of the existing transaction, and the
+    # removal of any created and uncommitted objects.
+
+    # Set the default layer.
+    adapters = zapi.getGlobalSiteManager().adapters
+    layer = adapters.lookup((providedBy(request),), IDefaultSkin, '')
+    if layer is not None:
+        layers.setAdditionalLayer(request, layer)
+
+    principal = publication.getPrincipal(request)
+    request.setPrincipal(principal)
+
+    getUtility(IOpenLaunchBag).clear()
+    app = publication.getApplication(request)
+    view = request.traverse(app)
+    # Since the last traversed object is the view, the second last should be
+    # the object that the view is on.
+    obj = request.traversed_objects[-2]
+    return obj, view, request

=== modified file 'lib/lp/translations/browser/tests/test_breadcrumbs.py'
--- lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-11-07 01:45:32 +0000
+++ lib/lp/translations/browser/tests/test_breadcrumbs.py	2010-04-29 11:26:16 +0000
@@ -7,12 +7,8 @@
 
 from canonical.lazr.utils import smartquote
 
-from canonical.launchpad.layers import TranslationsLayer
-from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
-
 from lp.services.worlddata.interfaces.language import ILanguageSet
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 from lp.translations.interfaces.distroserieslanguage import (
     IDistroSeriesLanguageSet)
 from lp.translations.interfaces.productserieslanguage import (
@@ -20,111 +16,82 @@
 from lp.translations.interfaces.translationgroup import ITranslationGroupSet
 
 
-class BaseTranslationsBreadcrumbTestCase(BaseBreadcrumbTestCase):
-    request_layer = TranslationsLayer
-
-    def setUp(self):
-        super(BaseTranslationsBreadcrumbTestCase, self).setUp()
-        self.traversed_objects = [self.root]
-
-    def _testContextBreadcrumbs(self, traversal_list, links, texts, url=None):
-        self.traversed_objects.extend(traversal_list)
-        if url is None:
-            url = canonical_url(traversal_list[-1], rootsite='translations')
-
-        self.assertEquals(
-            links,
-            self._getBreadcrumbsURLs(url, self.traversed_objects))
-        self.assertEquals(
-            texts,
-            self._getBreadcrumbsTexts(url, self.traversed_objects))
-
-
-class TestTranslationsVHostBreadcrumb(BaseTranslationsBreadcrumbTestCase):
+class TestTranslationsVHostBreadcrumb(BaseBreadcrumbTestCase):
 
     def test_product(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [product],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            product, rootsite='translations')
 
     def test_productseries(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeProductSeries(name="test", product=product)
-        self._testContextBreadcrumbs(
-            [product, series],
-            ['http://launchpad.dev/crumb-tester',
-             'http://launchpad.dev/crumb-tester/test',
-             'http://translations.launchpad.dev/crumb-tester/test'],
-            ["Crumb Tester", "Series test", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Series test", 'http://launchpad.dev/crumb-tester/test'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester/test')],
+            series, rootsite='translations')
 
     def test_distribution(self):
         distribution = self.factory.makeDistribution(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [distribution],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            distribution, rootsite='translations')
 
     def test_distroseries(self):
         distribution = self.factory.makeDistribution(
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeDistroRelease(
             name="test", version="1.0", distribution=distribution)
-        self._testContextBreadcrumbs(
-            [distribution, series],
-            ['http://launchpad.dev/crumb-tester',
-             'http://launchpad.dev/crumb-tester/test',
-             'http://translations.launchpad.dev/crumb-tester/test'],
-            ["Crumb Tester", "Test (1.0)", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Test (1.0)", 'http://launchpad.dev/crumb-tester/test'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester/test')],
+            series, rootsite='translations')
 
     def test_project(self):
         project = self.factory.makeProject(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [project],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            project, rootsite='translations')
 
     def test_person(self):
         person = self.factory.makePerson(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [person],
-            ['http://launchpad.dev/~crumb-tester',
-             'http://translations.launchpad.dev/~crumb-tester'],
-            ["Crumb Tester", "Translations"])
-
-
-class TestTranslationGroupsBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/~crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/~crumb-tester')],
+            person, rootsite='translations')
+
+
+class TestTranslationGroupsBreadcrumbs(BaseBreadcrumbTestCase):
 
     def test_translationgroupset(self):
         group_set = getUtility(ITranslationGroupSet)
-        url = canonical_url(group_set, rootsite='translations')
-        self._testContextBreadcrumbs(
-            [group_set],
-            ['http://translations.launchpad.dev/+groups'],
-            ['Translation groups'],
-            url=url)
+        self.assertBreadcrumbs(
+            [("Translation groups", 'http://translations.launchpad.dev/+groups')],
+            group_set, rootsite='translations')
 
     def test_translationgroup(self):
-        group_set = getUtility(ITranslationGroupSet)
         group = self.factory.makeTranslationGroup(
             name='test-translators', title='Test translators')
-        self._testContextBreadcrumbs(
-            [group_set, group],
-            ["http://translations.launchpad.dev/+groups",
-             "http://translations.launchpad.dev/+groups/test-translators"],
-            ["Translation groups", "Test translators"])
-
-
-class TestSeriesLanguageBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        self.assertBreadcrumbs(
+            [("Translation groups", 'http://translations.launchpad.dev/+groups'),
+             ("Test translators",
+              'http://translations.launchpad.dev/+groups/test-translators')],
+            group, rootsite='translations')
+
+
+class TestSeriesLanguageBreadcrumbs(BaseBreadcrumbTestCase):
+
     def setUp(self):
         super(TestSeriesLanguageBreadcrumbs, self).setUp()
         self.language = getUtility(ILanguageSet)['sr']
@@ -134,15 +101,18 @@
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeDistroRelease(
             name="test", version="1.0", distribution=distribution)
+        series.hide_all_translations = False
         serieslanguage = getUtility(IDistroSeriesLanguageSet).getDummy(
             series, self.language)
-        self._testContextBreadcrumbs(
-            [distribution, series, serieslanguage],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test/+lang/sr"],
-            ["Crumb Tester", "Test (1.0)", "Translations", "Serbian (sr)"])
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Test (1.0)", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             ("Serbian (sr)",
+              "http://translations.launchpad.dev/crumb-tester/test/+lang/sr")],
+            serieslanguage)
 
     def test_productserieslanguage(self):
         product = self.factory.makeProduct(
@@ -151,57 +121,58 @@
             name="test", product=product)
         serieslanguage = getUtility(IProductSeriesLanguageSet).getDummy(
             series, self.language)
-        self._testContextBreadcrumbs(
-            [product, series, serieslanguage],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test/+lang/sr"],
-            ["Crumb Tester", "Series test", "Translations", "Serbian (sr)"])
-
-
-class TestPOTemplateBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             ("Serbian (sr)",
+              "http://translations.launchpad.dev/crumb-tester/test/+lang/sr")],
+            serieslanguage)
+
+
+class TestPOTemplateBreadcrumbs(BaseBreadcrumbTestCase):
     def test_potemplate(self):
         product = self.factory.makeProduct(
-            name='crumb-tester', displayname="Crumb Tester")
+            name='crumb-tester', displayname="Crumb Tester",
+            official_rosetta=True)
         series = self.factory.makeProductSeries(
             name="test", product=product)
-        potemplate = self.factory.makePOTemplate(name="template",
-                                                 productseries=series)
-        self._testContextBreadcrumbs(
-            [product, series, potemplate],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test"
-             "/+pots/template"],
-            ["Crumb Tester", "Series test", "Translations",
-             smartquote('Template "template"')])
-
-
-class TestPOFileBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        potemplate = self.factory.makePOTemplate(
+            name="template", productseries=series)
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             (smartquote('Template "template"'),
+              "http://translations.launchpad.dev/crumb-tester/test/+pots/template")],
+            potemplate)
+
+
+class TestPOFileBreadcrumbs(BaseBreadcrumbTestCase):
 
     def setUp(self):
         super(TestPOFileBreadcrumbs, self).setUp()
-        self.language = getUtility(ILanguageSet)['eo']
-        self.product = self.factory.makeProduct(
-            name='crumb-tester', displayname="Crumb Tester")
-        self.series = self.factory.makeProductSeries(
-            name="test", product=self.product)
-        self.potemplate = self.factory.makePOTemplate(self.series,
-            name="test-template")
-        self.pofile = self.factory.makePOFile('eo', self.potemplate)
 
     def test_pofiletranslate(self):
-        self._testContextBreadcrumbs(
-            [self.product, self.series, self.potemplate, self.pofile],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test"
-               "/+pots/test-template",
-             "http://translations.launchpad.dev/crumb-tester/test"
-               "/+pots/test-template/eo",
-             ],
-            ["Crumb Tester", "Series test", "Translations",
-             smartquote('Template "test-template"'), "Esperanto (eo)"])
+        product = self.factory.makeProduct(
+            name='crumb-tester', displayname="Crumb Tester",
+            official_rosetta=True)
+        series = self.factory.makeProductSeries(name="test", product=product)
+        potemplate = self.factory.makePOTemplate(series, name="test-template")
+        pofile = self.factory.makePOFile('eo', potemplate)
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             (smartquote('Template "test-template"'),
+              "http://translations.launchpad.dev/crumb-tester/test"
+              "/+pots/test-template"),
+             ("Esperanto (eo)",
+              "http://translations.launchpad.dev/crumb-tester/test"
+              "/+pots/test-template/eo")],
+            pofile)

=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py	2010-04-22 17:30:35 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py	2010-04-29 11:26:16 +0000
@@ -121,6 +121,12 @@
             build_state=target_state, pocket=pocket)
 
         for build in target_builds:
+            # Skip builds for superseded sources; they won't ever
+            # actually build.
+            if not build.current_source_publication:
+                log.debug(
+                    'Skipping superseded %s (%s)' % (build.title, build.id))
+                continue
 
             if not build.can_be_retried:
                 log.warn('Can not retry %s (%s)' % (build.title, build.id))

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-04-27 01:35:56 +0000
+++ utilities/sourcedeps.conf	2010-04-29 11:26:16 +0000
@@ -5,7 +5,12 @@
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2708
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=418
+<<<<<<< TREE
 loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=174
+=======
+launchpad-loggerhead lp:~launchpad-pqm/launchpad-loggerhead/devel;revno=54
+loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=176
+>>>>>>> MERGE-SOURCE
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4