Merge lp:~lifeless/launchpad/merge into lp:launchpad/db-devel

[Robert Collins]

Fix a few bugs around merge proposals:
 - when transitioning out of 'queued', always dequeue.
 - permit transitioning to merge-failed
 - use the reviewed revid by default when queueing

=== modified file 'Makefile'
=== modified file 'configs/testrunner/launchpad-lazr.conf'
=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-04-13 20:23:15 +0000
+++ database/schema/security.cfg	2010-04-16 04:01:13 +0000
@@ -1263,6 +1263,7 @@
 public.question                         = SELECT
 public.questionbug                      = SELECT
 public.distribution                     = SELECT
+public.distributionsourcepackage        = SELECT, INSERT, UPDATE
 public.distroseries                     = SELECT
 public.sourcepackagename                = SELECT
 public.sourcepackagerelease             = SELECT

=== modified file 'lib/canonical/launchpad/doc/security-teams.txt'
--- lib/canonical/launchpad/doc/security-teams.txt	2009-08-14 12:59:56 +0000
+++ lib/canonical/launchpad/doc/security-teams.txt	2010-04-16 04:01:13 +0000
@@ -268,7 +268,8 @@
     >>> bug.addTask(owner=reporter, target=distribution)
     <BugTask at ...>
     >>> old_state = Snapshot(bug, providing=IBug)
-    >>> bug.security_related = True
+    >>> bug.setSecurityRelated(True)
+    True
     >>> notify(ObjectModifiedEvent(bug, old_state, ['security_related']))
     >>> for subscriber_name in sorted(
     ...     s.displayname for s in bug.getDirectSubscribers()):

=== modified file 'lib/canonical/launchpad/mail/commands.py'
--- lib/canonical/launchpad/mail/commands.py	2010-02-17 11:13:06 +0000
+++ lib/canonical/launchpad/mail/commands.py	2010-04-16 04:01:13 +0000
@@ -279,7 +279,7 @@
                 edited = True
                 edited_fields.add('private')
         if context.security_related != security_related:
-            context.security_related = security_related
+            context.setSecurityRelated(security_related)
             edited = True
             edited_fields.add('security_related')
 

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-04-12 15:02:30 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-04-16 04:01:13 +0000
@@ -1252,9 +1252,9 @@
         the size of the upload plus the current PPA size must be smaller
         than the PPA.authorized_size, otherwise the upload will be rejected.
         """
-        # Stuff 1024 MiB in name16 PPA, so anything will be above the
-        # default quota limit, 1024 MiB.
-        self._fillArchive(self.name16.archive, 1024 * (2 ** 20))
+        # Stuff 2048 MiB in name16 PPA, so anything will be above the
+        # default quota limit, 2048 MiB.
+        self._fillArchive(self.name16.archive, 2048 * (2 ** 20))
 
         upload_dir = self.queueUpload("bar_1.0-1", "~name16/ubuntu")
         upload_results = self.processUpload(self.uploadprocessor, upload_dir)
@@ -1267,7 +1267,7 @@
         contents = [
             "Subject: bar_1.0-1_source.changes rejected",
             "Rejected:",
-            "PPA exceeded its size limit (1024.00 of 1024.00 MiB). "
+            "PPA exceeded its size limit (2048.00 of 2048.00 MiB). "
             "Ask a question in https://answers.launchpad.net/soyuz/ "
             "if you need more space."]
         self.assertEmail(contents)
@@ -1278,9 +1278,9 @@
         The system start warning users for uploads exceeding 95 % of
         the current size limit.
         """
-        # Stuff 973 MiB into name16 PPA, approximately 95 % of
-        # the default quota limit, 1024 MiB.
-        self._fillArchive(self.name16.archive, 973 * (2 ** 20))
+        # Stuff 1945 MiB into name16 PPA, approximately 95 % of
+        # the default quota limit, 2048 MiB.
+        self._fillArchive(self.name16.archive, 2000 * (2 ** 20))
 
         # Ensure the warning is sent in the acceptance notification.
         upload_dir = self.queueUpload("bar_1.0-1", "~name16/ubuntu")
@@ -1288,7 +1288,7 @@
         contents = [
             "Subject: [PPA name16] [ubuntu/breezy] bar 1.0-1 (Accepted)",
             "Upload Warnings:",
-            "PPA exceeded 95 % of its size limit (973.00 of 1024.00 MiB). "
+            "PPA exceeded 95 % of its size limit (2000.00 of 2048.00 MiB). "
             "Ask a question in https://answers.launchpad.net/soyuz/ "
             "if you need more space."]
         self.assertEmail(contents)

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-04-07 11:28:32 +0000
+++ lib/lp/bugs/browser/bug.py	2010-04-16 04:01:13 +0000
@@ -673,7 +673,7 @@
     page_title = label
 
     def setUpFields(self):
-        """Make the read-only version of `private` writable."""
+        """Make the read-only version of the form fields writable."""
         private_field = Bool(
             __name__='private',
             title=_("This bug report should be private"),
@@ -681,10 +681,17 @@
             description=_("Private bug reports are visible only to "
                           "their subscribers."),
             default=False)
+        security_related_field = Bool(
+            __name__='security_related',
+            title=_("This bug is a security vulnerability"),
+            required=False, default=False)
+
         super(BugSecrecyEditView, self).setUpFields()
         self.form_fields = self.form_fields.omit('private')
+        self.form_fields = self.form_fields.omit('security_related')
         self.form_fields = (
-            formlib.form.Fields(private_field) + self.form_fields)
+            formlib.form.Fields(private_field) +
+            formlib.form.Fields(security_related_field))
 
     @property
     def initial_values(self):
@@ -705,16 +712,18 @@
         bug_before_modification = Snapshot(
             bug, providing=providedBy(bug))
         private = data.pop('private')
+        security_related = data.pop('security_related')
         private_changed = bug.setPrivate(
             private, getUtility(ILaunchBag).user)
-        if private_changed:
-            # Although the call to updateBugFromData later on will
-            # send notification of changes, it will only do so if it
-            # makes the change. We have applied the 'private' change
-            # already, so updateBugFromData will only send an event if
-            # 'security_related' is changed, and we can't have that.
+        security_related_changed = bug.setSecurityRelated(security_related)
+        if private_changed or security_related_changed:
+            changed_fields = []
+            if private_changed:
+                changed_fields.append('private')
+            if security_related_changed:
+                changed_fields.append('security_related')
             notify(ObjectModifiedEvent(
-                    bug, bug_before_modification, ['private']))
+                    bug, bug_before_modification, changed_fields))
 
         # Apply other changes.
         self.updateBugFromData(data)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2010-03-16 16:23:50 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-04-16 04:01:13 +0000
@@ -36,7 +36,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import NotFound
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.schema import Choice
+from zope.schema import Bool, Choice
 from zope.schema.vocabulary import SimpleVocabulary
 
 from canonical.cachedproperty import cachedproperty
@@ -45,6 +45,7 @@
 from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
 from lp.bugs.interfaces.bug import IBug
 from lp.bugs.interfaces.bugtask import BugTaskSearchParams
+from canonical.launchpad import _
 from canonical.launchpad.browser.feeds import (
     BugFeedLink, BugTargetLatestBugsFeedLink, FeedsMixin)
 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
@@ -297,6 +298,14 @@
         self.form_fields = self.form_fields.omit('subscribe_to_existing_bug')
         self.form_fields += formlib.form.Fields(subscribe_field)
 
+        security_related_field = Bool(
+            __name__='security_related',
+            title=_("This bug is a security vulnerability"),
+            required=False, default=False)
+
+        self.form_fields = self.form_fields.omit('security_related')
+        self.form_fields += formlib.form.Fields(security_related_field)
+
     def contextUsesMalone(self):
         """Does the context use Malone as its official bugtracker?"""
         if IProjectGroup.providedBy(self.context):

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-04-08 08:55:10 +0000
+++ lib/lp/bugs/configure.zcml	2010-04-16 04:01:13 +0000
@@ -681,6 +681,7 @@
                     expireNotifications
                     setStatus
                     setPrivate
+                    setSecurityRelated
                     convertToQuestion
                     markUserAffected
                     addTask

=== modified file 'lib/lp/bugs/doc/bug-heat.txt'
--- lib/lp/bugs/doc/bug-heat.txt	2010-04-12 07:11:47 +0000
+++ lib/lp/bugs/doc/bug-heat.txt	2010-04-16 04:01:13 +0000
@@ -29,6 +29,28 @@
     datetime.datetime(..., tzinfo=<UTC>)
 
 
+Adjusting bug heat in transaction
+---------------------------------
+
+Sometimes, when a bug changes, we want to see the changes reflected in the bug's
+heat value immidiately, without waiting for heat to be recalculated. Currently
+we adjust heat immidiately for bug privacy and security.
+
+    >>> bug_owner = factory.makePerson()
+    >>> bug = factory.makeBug(owner=bug_owner)
+    >>> bug.heat
+    0
+    >>> changed = bug.setPrivate(True, bug_owner)
+    >>> bug.heat
+    150
+    >>> changed = bug.setSecurityRelated(True)
+    >>> bug.heat
+    400
+    >>> changed = bug.setPrivate(False, bug_owner)
+    >>> bug.heat
+    250
+
+
 Getting bugs whose heat is outdated
 -----------------------------------
 

=== modified file 'lib/lp/bugs/doc/bug.txt'
--- lib/lp/bugs/doc/bug.txt	2010-02-11 05:08:47 +0000
+++ lib/lp/bugs/doc/bug.txt	2010-04-16 04:01:13 +0000
@@ -747,7 +747,7 @@
 
     >>> firefox_bug.security_related
     False
-    >>> firefox_bug.security_related = True
+    >>> changed = firefox_bug.setSecurityRelated(True)
 
     >>> bug_security_changed = ObjectModifiedEvent(
     ...     firefox_bug, bug_before_modification, ["security_related"])

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2010-01-20 17:09:40 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2010-04-16 04:01:13 +0000
@@ -85,7 +85,7 @@
 
 New security related bugs are sent with a prominent warning:
 
-    >>> bug_four.security_related = True
+    >>> changed = bug_four.setSecurityRelated(True)
 
     >>> subject, body = generate_bug_add_email(bug_four)
     >>> subject
@@ -202,7 +202,7 @@
 
     >>> edited_bug.setPrivate(True, getUtility(ILaunchBag).user)
     True
-    >>> edited_bug.security_related = True
+    >>> changed = edited_bug.setSecurityRelated(True)
     >>> bug_delta = BugDelta(
     ...     bug=edited_bug,
     ...     bugurl="http://www.example.com/bugs/2",
@@ -225,7 +225,7 @@
 
     >>> edited_bug.setPrivate(False, getUtility(ILaunchBag).user)
     True
-    >>> edited_bug.security_related = False
+    >>> changed = edited_bug.setSecurityRelated(False)
     >>> bug_delta = BugDelta(
     ...     bug=edited_bug,
     ...     bugurl="http://www.example.com/bugs/2",

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2010-04-01 03:14:47 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2010-04-16 04:01:13 +0000
@@ -1199,7 +1199,8 @@
 The presence of the security flag on a bug is, surprise, denoted by a
 simple "yes":
 
-    >>> bug_three.security_related = True
+    >>> bug_three.setSecurityRelated(True)
+    True
     >>> bug_three.security_related
     True
 

=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2010-04-12 14:48:34 +0000
+++ lib/lp/bugs/interfaces/bug.py	2010-04-16 04:01:13 +0000
@@ -207,7 +207,7 @@
             readonly=True))
     security_related = exported(
         Bool(title=_("This bug is a security vulnerability"),
-             required=False, default=False))
+             required=False, default=False, readonly=True))
     displayname = TextLine(title=_("Text of the form 'Bug #X"),
         readonly=True)
     activity = Attribute('SQLObject.Multijoin of IBugActivity')
@@ -705,6 +705,17 @@
         Return True if a change is made, False otherwise.
         """
 
+    @mutator_for(security_related)
+    @operation_parameters(security_related=copy_field(security_related))
+    @export_write_operation()
+    def setSecurityRelated(security_related):
+        """Set bug security.
+
+            :security_related: True/False.
+
+        Return True if a change is made, False otherwise.
+        """
+
     def getBugTask(target):
         """Return the bugtask with the specified target.
 

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2010-04-12 14:48:34 +0000
+++ lib/lp/bugs/model/bug.py	2010-04-16 04:01:13 +0000
@@ -83,6 +83,7 @@
 from lp.bugs.interfaces.bugtracker import BugTrackerType
 from lp.bugs.interfaces.bugwatch import IBugWatchSet
 from lp.bugs.interfaces.cve import ICveSet
+from lp.bugs.scripts.bugheat import BugHeatConstants
 from lp.bugs.model.bugattachment import BugAttachment
 from lp.bugs.model.bugbranch import BugBranch
 from lp.bugs.model.bugcve import BugCve
@@ -1351,10 +1352,33 @@
                 self.who_made_private = None
                 self.date_made_private = None
 
+            # Correct the heat for the bug immediately, so that we don't have
+            # to wait for the next calculation job for the adjusted heat.
+            if private:
+                self.setHeat(self.heat + BugHeatConstants.PRIVACY)
+            else:
+                self.setHeat(self.heat - BugHeatConstants.PRIVACY)
+
             return True # Changed.
         else:
             return False # Not changed.
 
+    def setSecurityRelated(self, security_related):
+        """Setter for the `security_related` property."""
+        if self.security_related != security_related:
+            self.security_related = security_related
+
+            # Correct the heat for the bug immediately, so that we don't have
+            # to wait for the next calculation job for the adjusted heat.
+            if security_related:
+                self.setHeat(self.heat + BugHeatConstants.SECURITY)
+            else:
+                self.setHeat(self.heat - BugHeatConstants.SECURITY)
+
+            return True # Changed
+        else:
+            return False # Unchanged
+
     def getBugTask(self, target):
         """See `IBug`."""
         for bugtask in self.bugtasks:
@@ -1540,6 +1564,9 @@
         if timestamp is None:
             timestamp = UTC_NOW
 
+        if heat < 0:
+            heat = 0
+
         self.heat = heat
         self.heat_last_updated = timestamp
         for task in self.bugtasks:

=== modified file 'lib/lp/bugs/scripts/bugheat.py'
--- lib/lp/bugs/scripts/bugheat.py	2010-03-04 19:49:08 +0000
+++ lib/lp/bugs/scripts/bugheat.py	2010-04-16 04:01:13 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'BugHeatCalculator',
+    'BugHeatConstants',
     ]
 
 from datetime import datetime

=== modified file 'lib/lp/bugs/scripts/bugimport.py'
--- lib/lp/bugs/scripts/bugimport.py	2009-09-11 14:59:08 +0000
+++ lib/lp/bugs/scripts/bugimport.py	2010-04-16 04:01:13 +0000
@@ -328,7 +328,7 @@
 
         # set up bug
         bug.setPrivate(get_value(bugnode, 'private') == 'True', owner)
-        bug.security_related = (
+        bug.setSecurityRelated(
             get_value(bugnode, 'security_related') == 'True')
         bug.name = get_value(bugnode, 'nickname')
         description = get_value(bugnode, 'description')

=== modified file 'lib/lp/bugs/scripts/tests/test_bugheat.py'
--- lib/lp/bugs/scripts/tests/test_bugheat.py	2010-03-03 16:05:57 +0000
+++ lib/lp/bugs/scripts/tests/test_bugheat.py	2010-04-16 04:01:13 +0000
@@ -155,7 +155,7 @@
 
         # If, on the other hand, the bug is security_related,
         # _getHeatFromSecurity() will return BugHeatConstants.SECURITY
-        self.bug.security_related = True
+        self.bug.setSecurityRelated(True)
         self.assertEqual(
             BugHeatConstants.SECURITY, self.calculator._getHeatFromSecurity())
 
@@ -179,7 +179,7 @@
         dupe = self.factory.makeBug()
         dupe.duplicateof = self.bug
         self.bug.setPrivate(True, self.bug.owner)
-        self.bug.security_related = True
+        self.bug.setSecurityRelated(True)
 
         expected_heat += (
             BugHeatConstants.DUPLICATE +

=== modified file 'lib/lp/bugs/tests/test_bugchanges.py'
--- lib/lp/bugs/tests/test_bugchanges.py	2009-12-05 18:37:28 +0000
+++ lib/lp/bugs/tests/test_bugchanges.py	2010-04-16 04:01:13 +0000
@@ -562,7 +562,7 @@
     def test_mark_as_security_vulnerability(self):
         # Marking a bug as a security vulnerability adds to the bug's
         # activity log and sends a notification.
-        self.bug.security_related = False
+        self.bug.setSecurityRelated(False)
         self.changeAttribute(self.bug, 'security_related', True)
 
         security_change_activity = {
@@ -586,7 +586,7 @@
     def test_unmark_as_security_vulnerability(self):
         # Unmarking a bug as a security vulnerability adds to the
         # bug's activity log and sends a notification.
-        self.bug.security_related = True
+        self.bug.setSecurityRelated(True)
         self.changeAttribute(self.bug, 'security_related', False)
 
         security_change_activity = {

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-03-25 15:28:49 +0000
+++ lib/lp/code/browser/branch.py	2010-04-16 04:01:13 +0000
@@ -81,10 +81,12 @@
 from lp.code.browser.branchmergeproposal import (
     latest_proposals_for_each_branch)
 from lp.code.enums import (
-    BranchLifecycleStatus, BranchType, CodeImportJobState,
+    BranchLifecycleStatus, BranchType,
     CodeImportResultStatus, CodeImportReviewStatus, RevisionControlSystems,
     UICreatableBranchType)
-from lp.code.errors import InvalidBranchMergeProposal
+from lp.code.errors import (
+    CodeImportAlreadyRequested, CodeImportAlreadyRunning,
+    CodeImportNotInReviewedState, InvalidBranchMergeProposal)
 from lp.code.interfaces.branch import (
     BranchCreationForbidden, BranchExists, IBranch,
     user_has_special_branch_access)
@@ -1317,26 +1319,23 @@
 
     @action('Import Now', name='request')
     def request_import_action(self, action, data):
-        if self.context.code_import.import_job is None:
+        try:
+            self.context.code_import.requestImport(
+                self.user, error_if_already_requested=True)
+            self.request.response.addNotification(
+                "Import will run as soon as possible.")
+        except CodeImportNotInReviewedState:
             self.request.response.addNotification(
                 "This import is no longer being updated automatically.")
-        elif (self.context.code_import.import_job.state !=
-              CodeImportJobState.PENDING):
-            assert (self.context.code_import.import_job.state ==
-                    CodeImportJobState.RUNNING)
+        except CodeImportAlreadyRunning:
             self.request.response.addNotification(
                 "The import is already running.")
-        elif self.context.code_import.import_job.requesting_user is not None:
-            user = self.context.code_import.import_job.requesting_user
+        except CodeImportAlreadyRequested, e:
+            user = e.requesting_user
             adapter = queryAdapter(user, IPathAdapter, 'fmt')
             self.request.response.addNotification(
                 structured("The import has already been requested by %s." %
                            adapter.link(None)))
-        else:
-            getUtility(ICodeImportJobWorkflow).requestJob(
-                self.context.code_import.import_job, self.user)
-            self.request.response.addNotification(
-                "Import will run as soon as possible.")
 
     @property
     def prefix(self):

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-13 23:46:06 +0000
+++ lib/lp/code/configure.zcml	2010-04-16 04:01:13 +0000
@@ -840,7 +840,8 @@
                        getImportDetailsForDisplay"/>
     <require
        permission="launchpad.AnyPerson"
-       attributes="tryFailingImportAgain"/>
+       attributes="tryFailingImportAgain
+                   requestImport"/>
     <require
        permission="launchpad.Edit"
        attributes="updateFromData"/>

=== modified file 'lib/lp/code/errors.py'
--- lib/lp/code/errors.py	2010-04-05 21:38:40 +0000
+++ lib/lp/code/errors.py	2010-04-16 04:01:13 +0000
@@ -8,6 +8,9 @@
     'BadBranchMergeProposalSearchContext',
     'BadStateTransition',
     'BranchMergeProposalExists',
+    'CodeImportAlreadyRequested',
+    'CodeImportAlreadyRunning',
+    'CodeImportNotInReviewedState',
     'ClaimReviewFailed',
     'InvalidBranchMergeProposal',
     'ReviewNotPending',
@@ -68,3 +71,23 @@
 
 class UnknownBranchTypeError(Exception):
     """Raised when the user specifies an unrecognized branch type."""
+
+
+class CodeImportNotInReviewedState(Exception):
+    """Raised when the user requests an import of a non-automatic import."""
+
+    webservice_error(400)
+
+
+class CodeImportAlreadyRequested(Exception):
+    """Raised when the user requests an import that is already requested."""
+
+    def __init__(self, msg, requesting_user):
+        super(CodeImportAlreadyRequested, self).__init__(msg)
+        self.requesting_user = requesting_user
+
+
+class CodeImportAlreadyRunning(Exception):
+    """Raised when the user requests an import that is already running."""
+
+    webservice_error(400)

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2010-04-01 05:08:47 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2010-04-16 04:01:13 +0000
@@ -347,6 +347,9 @@
         If the proposal is not in the Approved state before this method
         is called, approveBranch is called with the reviewer and revision_id
         specified.
+
+	If None is supplied as the revision_id, the proposals
+	reviewed_revision_id is used.
         """
 
     def dequeue():

=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2010-04-01 20:58:42 +0000
+++ lib/lp/code/interfaces/codeimport.py	2010-04-16 04:01:13 +0000
@@ -25,7 +25,8 @@
 from lp.code.interfaces.branch import IBranch
 
 from lazr.restful.declarations import (
-    export_as_webservice_entry, exported)
+    call_with, export_as_webservice_entry, exported, export_write_operation,
+    REQUEST_USER)
 from lazr.restful.fields import ReferenceChoice
 
 
@@ -177,6 +178,33 @@
         :param user: the user who is requesting the import be tried again.
         """
 
+    @call_with(requester=REQUEST_USER)
+    @export_write_operation()
+    def requestImport(requester, error_if_already_requested=False):
+        """Request that an import be tried soon.
+
+        This method will schedule an import to happen soon for this branch.
+
+        The import must be in the Reviewed state, if not then a
+        CodeImportNotInReviewedState error will be thrown. If using the
+        API then a status code of 400 will result.
+
+        If the import is already running then a CodeImportAlreadyRunning
+        error will be thrown. If using the API then a status code of
+        400 will result.
+
+        The two cases can be distinguished over the API by seeing if the
+        exception names appear in the body of the response.
+
+        If used over the API and the request has already been made then this
+        method will silently do nothing.
+        If called internally then the error_if_already_requested parameter
+        controls whether a CodeImportAlreadyRequested exception will be
+        thrown in that situation.
+
+        :return: None
+        """
+
 
 class ICodeImportSet(Interface):
     """Interface representing the set of code imports."""

=== modified file 'lib/lp/code/interfaces/webservice.py'
--- lib/lp/code/interfaces/webservice.py	2010-04-01 23:04:10 +0000
+++ lib/lp/code/interfaces/webservice.py	2010-04-16 04:01:13 +0000
@@ -3,12 +3,23 @@
 
 """All the interfaces that are exposed through the webservice."""
 
+<<<<<<< TREE
 # The exceptions are imported so that they can produce the special
 # status code defined by webservice_error when they are raised.
 from lp.code.errors import BranchMergeProposalExists
 from lp.code.interfaces.branch import (
     IBranch, IBranchSet, BranchCreatorNotMemberOfOwnerTeam,
     BranchCreatorNotOwner, BranchExists)
+=======
+# The exceptions are imported so that they can produce the special
+# status code defined by webservice_error when they are raised.
+from lp.code.errors import (
+    BranchMergeProposalExists, CodeImportAlreadyRunning,
+    CodeImportNotInReviewedState)
+from lp.code.interfaces.branch import (
+    IBranch, IBranchSet, BranchCreatorNotMemberOfOwnerTeam,
+    BranchCreatorNotOwner, BranchExists)
+>>>>>>> MERGE-SOURCE
 from lp.code.interfaces.branchmergeproposal import IBranchMergeProposal
 from lp.code.interfaces.branchsubscription import IBranchSubscription
 from lp.code.interfaces.codeimport import ICodeImport

=== modified file 'lib/lp/code/model/branchmergeproposal.py'
--- lib/lp/code/model/branchmergeproposal.py	2010-04-01 04:48:01 +0000
+++ lib/lp/code/model/branchmergeproposal.py	2010-04-16 04:01:13 +0000
@@ -84,9 +84,10 @@
     if (next_state == rejected and not valid_reviewer):
         return False
     # Non-reviewers can toggle between code_approved and queued, but not
-    # make anything else approved or queued.
+    # make anything else approved or queued. They can also take merge failed
+    # and requeue or bounce all the way out to approved again.
     elif (next_state in (code_approved, queued) and
-          from_state not in (code_approved, queued)
+          from_state not in (code_approved, queued, merge_failed)
           and not valid_reviewer):
         return False
     else:
@@ -325,23 +326,23 @@
         # XXX - rockstar - 9 Oct 2008 - jml suggested in a review that this
         # would be better as a dict mapping.
         # See bug #281060.
+	if (self.queue_status == BranchMergeProposalStatus.QUEUED and
+	    status != BranchMergeProposalStatus.QUEUED):
+	    self.dequeue()
         if status == BranchMergeProposalStatus.WORK_IN_PROGRESS:
             self.setAsWorkInProgress()
         elif status == BranchMergeProposalStatus.NEEDS_REVIEW:
             self.requestReview()
         elif status == BranchMergeProposalStatus.CODE_APPROVED:
-            # Other half of the edge case.  If the status is currently queued,
-            # we need to dequeue, otherwise we just approve the branch.
-            if self.queue_status == BranchMergeProposalStatus.QUEUED:
-                self.dequeue()
-            else:
-                self.approveBranch(user, revision_id)
+	    self.approveBranch(user, revision_id)
         elif status == BranchMergeProposalStatus.REJECTED:
             self.rejectBranch(user, revision_id)
         elif status == BranchMergeProposalStatus.QUEUED:
             self.enqueue(user, revision_id)
         elif status == BranchMergeProposalStatus.MERGED:
             self.markAsMerged(merge_reporter=user)
+	elif status == BranchMergeProposalStatus.MERGE_FAILED:
+            self._transitionToState(status)
         else:
             raise AssertionError('Unexpected queue status: ' % status)
 
@@ -379,7 +380,7 @@
 
     def _reviewProposal(self, reviewer, next_state, revision_id,
                         _date_reviewed=None):
-        """Set the proposal to one of the two review statuses."""
+        """Set the proposal to next_state."""
         # Check the reviewer can review the code for the target branch.
         old_state = self.queue_status
         if not self.target_branch.isPersonTrustedReviewer(reviewer):
@@ -433,7 +434,7 @@
         self.queue_status = BranchMergeProposalStatus.QUEUED
         self.queue_position = position
         self.queuer = queuer
-        self.queued_revision_id = revision_id
+        self.queued_revision_id = revision_id or self.reviewed_revision_id
         self.date_queued = UTC_NOW
         self.syncUpdate()
 

=== modified file 'lib/lp/code/model/branchtarget.py'
--- lib/lp/code/model/branchtarget.py	2010-04-14 17:44:00 +0000
+++ lib/lp/code/model/branchtarget.py	2010-04-16 04:01:13 +0000
@@ -337,6 +337,26 @@
         branch.sourcepackagename = None
 
 
+<<<<<<< TREE
+=======
+class ProductSeriesBranchTarget(ProductBranchTarget):
+
+    def __init__(self, productseries):
+        ProductBranchTarget.__init__(self, productseries.product)
+        self.productseries = productseries
+
+    @property
+    def context(self):
+        """See `IBranchTarget`."""
+        return self.productseries
+
+    @property
+    def supports_code_imports(self):
+        """See `IBranchTarget`."""
+        return False
+
+
+>>>>>>> MERGE-SOURCE
 def get_canonical_url_data_for_target(branch_target):
     """Return the `ICanonicalUrlData` for an `IBranchTarget`."""
     return ICanonicalUrlData(branch_target.context)

=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-04-01 20:58:42 +0000
+++ lib/lp/code/model/codeimport.py	2010-04-16 04:01:13 +0000
@@ -37,6 +37,9 @@
 from lp.code.enums import (
     BranchType, CodeImportJobState, CodeImportResultStatus,
     CodeImportReviewStatus, RevisionControlSystems)
+from lp.code.errors import (
+    CodeImportAlreadyRequested, CodeImportAlreadyRunning,
+    CodeImportNotInReviewedState)
 from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
 from lp.code.interfaces.codeimportevent import ICodeImportEventSet
 from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
@@ -196,6 +199,27 @@
             {'review_status': CodeImportReviewStatus.REVIEWED}, user)
         getUtility(ICodeImportJobWorkflow).requestJob(self.import_job, user)
 
+    def requestImport(self, requester, error_if_already_requested=False):
+        """See `ICodeImport`."""
+        if self.import_job is None: # not in automatic mode
+           raise CodeImportNotInReviewedState("This code import is %s, and "
+                   "must be Reviewed for you to call requestImport."
+                   % self.review_status.name)
+        if (self.import_job.state != CodeImportJobState.PENDING):
+            assert (self.import_job.state == CodeImportJobState.RUNNING)
+            # Already running
+            raise CodeImportAlreadyRunning("This code import is already "
+                    "running.")
+        elif self.import_job.requesting_user is not None:
+            if error_if_already_requested:
+                raise CodeImportAlreadyRequested("This code import has "
+                    "already been requested to run.",
+                    self.import_job.requesting_user)
+        else:
+            getUtility(ICodeImportJobWorkflow).requestJob(
+                self.import_job, requester)
+        return None
+
 
 class CodeImportSet:
     """See `ICodeImportSet`."""

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposals.py'
--- lib/lp/code/model/tests/test_branchmergeproposals.py	2010-04-06 03:37:16 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposals.py	2010-04-16 04:01:13 +0000
@@ -261,6 +261,20 @@
         """We can go from merge failed to any other state."""
         self.assertAllTransitionsGood(BranchMergeProposalStatus.MERGE_FAILED)
 
+    def test_transition_from_merge_failed_to_queued_non_reviewer(self):
+	# Contributors can requeue to retry after environmental issues fail a
+	# merge.
+        proposal = self.factory.makeBranchMergeProposal()
+	self.assertFalse(proposal.target_branch.isPersonTrustedReviewer(
+	    proposal.source_branch.owner))
+        # It is always valid to go to the same state.
+        self.assertValidTransitions(set([
+		BranchMergeProposalStatus.MERGE_FAILED,
+		BranchMergeProposalStatus.CODE_APPROVED,
+		BranchMergeProposalStatus.QUEUED]),
+            proposal, BranchMergeProposalStatus.QUEUED,
+            proposal.source_branch.owner)
+
     def test_transitions_from_queued_dequeue(self):
         # When a proposal is dequeued it is set to code approved, and the
         # queue position is reset.
@@ -322,6 +336,19 @@
         self.target_branch = self.factory.makeProductBranch()
         login_person(self.target_branch.owner)
 
+    def test_set_status_approved_to_queued(self):
+        # setState can change an approved merge proposal to Work In Progress,
+	# which will set the revision id to the reviewed revision id if not
+	# supplied.
+        proposal = self.factory.makeBranchMergeProposal(
+            target_branch=self.target_branch,
+            set_state=BranchMergeProposalStatus.CODE_APPROVED)
+	proposal.approveBranch(proposal.target_branch.owner, '250')
+        proposal.setStatus(BranchMergeProposalStatus.QUEUED)
+        self.assertEqual(proposal.queue_status,
+            BranchMergeProposalStatus.QUEUED)
+	self.assertEqual(proposal.queued_revision_id, '250')
+
     def test_set_status_approved_to_work_in_progress(self):
         # setState can change an approved merge proposal to Work In Progress.
         proposal = self.factory.makeBranchMergeProposal(
@@ -331,6 +358,18 @@
         self.assertEqual(proposal.queue_status,
             BranchMergeProposalStatus.WORK_IN_PROGRESS)
 
+    def test_set_status_queued_to_merge_failed(self):
+        proposal = self.factory.makeBranchMergeProposal(
+            target_branch=self.target_branch,
+            set_state=BranchMergeProposalStatus.QUEUED)
+        proposal.setStatus(BranchMergeProposalStatus.MERGE_FAILED)
+        self.assertEqual(proposal.queue_status,
+            BranchMergeProposalStatus.MERGE_FAILED)
+	self.assertEqual(proposal.queuer, None)
+	self.assertEqual(proposal.queued_revision_id, None)
+	self.assertEqual(proposal.date_queued, None)
+	self.assertEqual(proposal.queue_position, None)
+
     def test_set_status_wip_to_needs_review(self):
         # setState can change the merge proposal to Needs Review.
         proposal = self.factory.makeBranchMergeProposal(

=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-04-01 20:58:42 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-04-16 04:01:13 +0000
@@ -12,6 +12,11 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
+from canonical.launchpad.testing.codeimporthelpers import (
+    make_running_import)
+from lp.code.errors import (
+    CodeImportAlreadyRequested, CodeImportAlreadyRunning,
+    CodeImportNotInReviewedState)
 from lp.code.model.codeimport import CodeImportSet
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportjob import CodeImportJob, CodeImportJobSet
@@ -620,5 +625,67 @@
             requester, code_import.import_job.requesting_user)
 
 
+class TestRequestImport(TestCaseWithFactory):
+    """Tests for `ICodeImport.requestImport`."""
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        # We have to be logged in to request imports
+        TestCaseWithFactory.setUp(self, user='[e-mail]')
+
+    def test_requestsJob(self):
+        code_import = self.factory.makeCodeImport(
+            git_repo_url=self.factory.getUniqueURL())
+        requester = self.factory.makePerson()
+        old_date = code_import.import_job.date_due
+        code_import.requestImport(requester)
+        self.assertEqual(requester, code_import.import_job.requesting_user)
+        self.assertTrue(code_import.import_job.date_due <= old_date)
+
+    def test_noop_if_already_requested(self):
+        code_import = self.factory.makeCodeImport(
+            git_repo_url=self.factory.getUniqueURL())
+        requester = self.factory.makePerson()
+        code_import.requestImport(requester)
+        old_date = code_import.import_job.date_due
+        code_import.requestImport(requester)
+        # The checks don't matter so much, it's more that we don't get
+        # an exception.
+        self.assertEqual(requester, code_import.import_job.requesting_user)
+        self.assertEqual(old_date, code_import.import_job.date_due)
+
+    def test_optional_error_if_already_requested(self):
+        code_import = self.factory.makeCodeImport(
+            git_repo_url=self.factory.getUniqueURL())
+        requester = self.factory.makePerson()
+        code_import.requestImport(requester)
+        old_date = code_import.import_job.date_due
+        e = self.assertRaises(
+            CodeImportAlreadyRequested, code_import.requestImport, requester,
+            error_if_already_requested=True)
+        self.assertEqual(requester, e.requesting_user)
+
+    def test_exception_on_disabled(self):
+        # get an SVN request, which isn't reviewed by default
+        code_import = self.factory.makeCodeImport(
+            svn_branch_url=self.factory.getUniqueURL())
+        requester = self.factory.makePerson()
+        # which leads to an exception if we try and ask for an import
+        self.assertRaises(
+            CodeImportNotInReviewedState, code_import.requestImport,
+            requester)
+
+    def test_exception_if_already_running(self):
+        code_import = self.factory.makeCodeImport(
+            git_repo_url=self.factory.getUniqueURL())
+        code_import = make_running_import(factory=self.factory,
+            code_import=code_import)
+        requester = self.factory.makePerson()
+        self.assertRaises(
+            CodeImportAlreadyRunning, code_import.requestImport,
+            requester)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/stories/webservice/xx-code-import.txt'
--- lib/lp/code/stories/webservice/xx-code-import.txt	2010-04-14 17:44:00 +0000
+++ lib/lp/code/stories/webservice/xx-code-import.txt	2010-04-16 04:01:13 +0000
@@ -17,9 +17,15 @@
     >>> other_person = factory.makePerson(name='other-person')
     >>> removeSecurityProxy(person).join(team)
     >>> product = factory.makeProduct(name='scruff')
+    >>> svn_branch_url = "http://svn.domain.com/source"
     >>> code_import = removeSecurityProxy(factory.makeProductCodeImport(
+<<<<<<< TREE
     ...    registrant=person, product=product, branch_name='import',
     ...    svn_branch_url="http://svn.domain.com/source"))
+=======
+    ...    registrant=person, product=product, branch_name='import',
+    ...    svn_branch_url=svn_branch_url))
+>>>>>>> MERGE-SOURCE
     >>> no_import_branch = removeSecurityProxy(factory.makeProductBranch(
     ...     owner=person, product=product, name='no-import'))
     >>> logout()
@@ -58,171 +64,365 @@
     >>> print representation['rcs_type']
     Subversion via CSCVS
     >>> print representation['url']
-    http://svn.domain.com/source
-    >>> print representation['cvs_root']
-    None
-    >>> print representation['cvs_module']
-    None
-    >>> print representation['date_last_successful']
-    None
-
-
-Package Branches
-----------------
-
-The same is true for package branches.
-
-    >>> login(ANONYMOUS)
-    >>> distribution = factory.makeDistribution(name='scruffbuntu')
-    >>> distroseries = factory.makeDistroSeries(
-    ...     name='manic', distribution=distribution)
-    >>> source_package = factory.makeSourcePackage(
-    ...     sourcepackagename='scruff', distroseries=distroseries)
-    >>> code_import = removeSecurityProxy(factory.makePackageCodeImport(
-    ...    registrant=person, sourcepackage=source_package,
-    ...    branch_name='import',
-    ...    svn_branch_url="http://svn.domain.com/package_source"))
-    >>> logout()
-
-There is a link on the branch object
-
-    >>> branch_url = '/' + code_import.branch.unique_name
-    >>> response = import_webservice.get(branch_url)
-    >>> representation = response.jsonBody()
-    >>> print representation['code_import_link']
-    http://.../~import-owner/scruffbuntu/manic/scruff/import/+code-import
-
-and there is information available about the import itsef.
-
-    >>> import_url = representation['code_import_link']
-    >>> response = import_webservice.get(import_url)
-    >>> representation = response.jsonBody()
-    >>> print representation['self_link'] == import_url
-    True
-    >>> print representation['branch_link']
-    http://.../~import-owner/scruffbuntu/manic/scruff/import
-    >>> print representation['review_status']
-    Pending Review
-    >>> print representation['rcs_type']
-    Subversion via CSCVS
-    >>> print representation['url']
-    http://svn.domain.com/package_source
-    >>> print representation['cvs_root']
-    None
-    >>> print representation['cvs_module']
-    None
-    >>> print representation['date_last_successful']
-    None
-
-
-== Creating Imports ==
-
-We can create an import using the API by calling a method on the project.
-
-    >>> product_url = '/' + product.name
-    >>> new_remote_url = factory.getUniqueURL()
-    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
-    ...    branch_name='new-import', rcs_type='Git',
-    ...    url=new_remote_url)
-    >>> print response.status
-    201
-    >>> location = response.getHeader('Location')
-    >>> response = import_webservice.get(location)
-    >>> representation = response.jsonBody()
-    >>> print representation['self_link']
-    http://.../~import-owner/scruff/new-import/+code-import
-    >>> print representation['branch_link']
-    http://.../~import-owner/scruff/new-import
-    >>> print representation['rcs_type']
-    Git
-    >>> print representation['url'] == new_remote_url
-    True
-    >>> print representation['cvs_root']
-    None
-    >>> print representation['cvs_module']
-    None
-    >>> print representation['date_last_successful']
-    None
-
-If we must we can create a CVS import.
-
-    >>> product_url = '/' + product.name
-    >>> new_remote_url = factory.getUniqueURL()
-    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
-    ...    branch_name='cvs-import', rcs_type='Concurrent Versions System',
-    ...    cvs_root=new_remote_url, cvs_module="foo")
-    >>> print response.status
-    201
-    >>> location = response.getHeader('Location')
-    >>> response = import_webservice.get(location)
-    >>> representation = response.jsonBody()
-    >>> print representation['self_link']
-    http://.../~import-owner/scruff/cvs-import/+code-import
-    >>> print representation['branch_link']
-    http://.../~import-owner/scruff/cvs-import
-    >>> print representation['rcs_type']
-    Concurrent Versions System
-    >>> print representation['url']
-    None
-    >>> print representation['cvs_root'] == new_remote_url
-    True
-    >>> print representation['cvs_module'] == "foo"
-    True
-    >>> print representation['date_last_successful']
-    None
-
-We can also create an import targetting a source package.
-
-    >>> source_package_url = (
-    ...     '/' + distribution.name + '/' + distroseries.name + '/+source/'
-    ...     + source_package.name)
-    >>> new_remote_url = factory.getUniqueURL()
-    >>> response = import_webservice.named_post(source_package_url,
-    ...    'newCodeImport', branch_name='new-import', rcs_type='Mercurial',
-    ...    url=new_remote_url)
-    >>> print response.status
-    201
-    >>> location = response.getHeader('Location')
-    >>> response = import_webservice.get(location)
-    >>> representation = response.jsonBody()
-    >>> print representation['self_link']
-    http://.../~import-owner/scruffbuntu/manic/scruff/new-import/+code-import
-    >>> print representation['branch_link']
-    http://.../~import-owner/scruffbuntu/manic/scruff/new-import
-    >>> print representation['rcs_type']
-    Mercurial
-    >>> print representation['url'] == new_remote_url
-    True
-    >>> print representation['cvs_root']
-    None
-    >>> print representation['cvs_module']
-    None
-    >>> print representation['date_last_successful']
-    None
-
-If we wish to create a branch owned by a team we are part of then we can.
-
-    >>> team_url = import_webservice.getAbsoluteUrl('/~import-owner-team')
-    >>> new_remote_url = factory.getUniqueURL()
-    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
-    ...    branch_name='team-import', rcs_type='Git',
-    ...    url=new_remote_url, owner=team_url)
-    >>> print response.status
-    201
-    >>> location = response.getHeader('Location')
-    >>> response = import_webservice.get(location)
-    >>> representation = response.jsonBody()
-    >>> print representation['self_link']
-    http://.../~import-owner-team/scruff/team-import/+code-import
-    >>> print representation['branch_link']
-    http://.../~import-owner-team/scruff/team-import
-    >>> print representation['rcs_type']
-    Git
-    >>> print representation['url'] == new_remote_url
-    True
-    >>> print representation['cvs_root']
-    None
-    >>> print representation['cvs_module']
-    None
-    >>> print representation['date_last_successful']
-    None
+<<<<<<< TREE
+    http://svn.domain.com/source
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+
+Package Branches
+----------------
+
+The same is true for package branches.
+
+    >>> login(ANONYMOUS)
+    >>> distribution = factory.makeDistribution(name='scruffbuntu')
+    >>> distroseries = factory.makeDistroSeries(
+    ...     name='manic', distribution=distribution)
+    >>> source_package = factory.makeSourcePackage(
+    ...     sourcepackagename='scruff', distroseries=distroseries)
+    >>> code_import = removeSecurityProxy(factory.makePackageCodeImport(
+    ...    registrant=person, sourcepackage=source_package,
+    ...    branch_name='import',
+    ...    svn_branch_url="http://svn.domain.com/package_source"))
+    >>> logout()
+
+There is a link on the branch object
+
+    >>> branch_url = '/' + code_import.branch.unique_name
+    >>> response = import_webservice.get(branch_url)
+    >>> representation = response.jsonBody()
+    >>> print representation['code_import_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/import/+code-import
+
+and there is information available about the import itsef.
+
+    >>> import_url = representation['code_import_link']
+    >>> response = import_webservice.get(import_url)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link'] == import_url
+    True
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/import
+    >>> print representation['review_status']
+    Pending Review
+    >>> print representation['rcs_type']
+    Subversion via CSCVS
+    >>> print representation['url']
+    http://svn.domain.com/package_source
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+
+== Creating Imports ==
+
+We can create an import using the API by calling a method on the project.
+
+    >>> product_url = '/' + product.name
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='new-import', rcs_type='Git',
+    ...    url=new_remote_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruff/new-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruff/new-import
+    >>> print representation['rcs_type']
+    Git
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+If we must we can create a CVS import.
+
+    >>> product_url = '/' + product.name
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='cvs-import', rcs_type='Concurrent Versions System',
+    ...    cvs_root=new_remote_url, cvs_module="foo")
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruff/cvs-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruff/cvs-import
+    >>> print representation['rcs_type']
+    Concurrent Versions System
+    >>> print representation['url']
+    None
+    >>> print representation['cvs_root'] == new_remote_url
+    True
+    >>> print representation['cvs_module'] == "foo"
+    True
+    >>> print representation['date_last_successful']
+    None
+
+We can also create an import targetting a source package.
+
+    >>> source_package_url = (
+    ...     '/' + distribution.name + '/' + distroseries.name + '/+source/'
+    ...     + source_package.name)
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(source_package_url,
+    ...    'newCodeImport', branch_name='new-import', rcs_type='Mercurial',
+    ...    url=new_remote_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/new-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/new-import
+    >>> print representation['rcs_type']
+    Mercurial
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+If we wish to create a branch owned by a team we are part of then we can.
+
+    >>> team_url = import_webservice.getAbsoluteUrl('/~import-owner-team')
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='team-import', rcs_type='Git',
+    ...    url=new_remote_url, owner=team_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner-team/scruff/team-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner-team/scruff/team-import
+    >>> print representation['rcs_type']
+    Git
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+=======
+    http://svn.domain.com/source
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+
+Package Branches
+----------------
+
+The same is true for package branches.
+
+    >>> login(ANONYMOUS)
+    >>> distribution = factory.makeDistribution(name='scruffbuntu')
+    >>> distroseries = factory.makeDistroSeries(
+    ...     name='manic', distribution=distribution)
+    >>> source_package = factory.makeSourcePackage(
+    ...     sourcepackagename='scruff', distroseries=distroseries)
+    >>> code_import = removeSecurityProxy(factory.makePackageCodeImport(
+    ...    registrant=person, sourcepackage=source_package,
+    ...    branch_name='import',
+    ...    svn_branch_url="http://svn.domain.com/package_source"))
+    >>> logout()
+    >>> import_webservice = webservice_for_person(
+    ...     person, permission=OAuthPermission.WRITE_PUBLIC)
+
+There is a link on the branch object
+
+    >>> branch_url = '/' + code_import.branch.unique_name
+    >>> response = import_webservice.get(branch_url)
+    >>> representation = response.jsonBody()
+    >>> print representation['code_import_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/import/+code-import
+
+and there is information available about the import itsef.
+
+    >>> import_url = representation['code_import_link']
+    >>> response = import_webservice.get(import_url)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link'] == import_url
+    True
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/import
+    >>> print representation['review_status']
+    Pending Review
+    >>> print representation['rcs_type']
+    Subversion via CSCVS
+    >>> print representation['url']
+    http://svn.domain.com/package_source
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+== Creating Imports ==
+
+We can create an import using the API by calling a method on the project.
+
+    >>> product_url = '/' + product.name
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='new-import', rcs_type='Git',
+    ...    url=new_remote_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruff/new-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruff/new-import
+    >>> print representation['rcs_type']
+    Git
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+If we must we can create a CVS import.
+
+    >>> product_url = '/' + product.name
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='cvs-import', rcs_type='Concurrent Versions System',
+    ...    cvs_root=new_remote_url, cvs_module="foo")
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruff/cvs-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruff/cvs-import
+    >>> print representation['rcs_type']
+    Concurrent Versions System
+    >>> print representation['url']
+    None
+    >>> print representation['cvs_root'] == new_remote_url
+    True
+    >>> print representation['cvs_module'] == "foo"
+    True
+    >>> print representation['date_last_successful']
+    None
+
+We can also create an import targetting a source package.
+
+    >>> source_package_url = (
+    ...     '/' + distribution.name + '/' + distroseries.name + '/+source/'
+    ...     + source_package.name)
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(source_package_url,
+    ...    'newCodeImport', branch_name='new-import', rcs_type='Mercurial',
+    ...    url=new_remote_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/new-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner/scruffbuntu/manic/scruff/new-import
+    >>> print representation['rcs_type']
+    Mercurial
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+If we wish to create a branch owned by a team we are part of then we can.
+
+    >>> team_url = import_webservice.getAbsoluteUrl('/~import-owner-team')
+    >>> new_remote_url = factory.getUniqueURL()
+    >>> response = import_webservice.named_post(product_url, 'newCodeImport',
+    ...    branch_name='team-import', rcs_type='Git',
+    ...    url=new_remote_url, owner=team_url)
+    >>> print response.status
+    201
+    >>> location = response.getHeader('Location')
+    >>> response = import_webservice.get(location)
+    >>> representation = response.jsonBody()
+    >>> print representation['self_link']
+    http://.../~import-owner-team/scruff/team-import/+code-import
+    >>> print representation['branch_link']
+    http://.../~import-owner-team/scruff/team-import
+    >>> print representation['rcs_type']
+    Git
+    >>> print representation['url'] == new_remote_url
+    True
+    >>> print representation['cvs_root']
+    None
+    >>> print representation['cvs_module']
+    None
+    >>> print representation['date_last_successful']
+    None
+
+
+== Requesting an Import ==
+
+You can request that an approved, working import happen soon over the
+API using the requestImport() method.
+
+    >>> login(ANONYMOUS)
+    >>> git_import = factory.makeProductCodeImport(
+    ...     registrant=person, product=product, branch_name='git-import',
+    ...     git_repo_url=factory.getUniqueURL())
+    >>> git_import_url = (
+    ...    '/' + git_import.branch.unique_name + '/+code-import')
+    >>> logout()
+    >>> import_webservice = webservice_for_person(
+    ...     person, permission=OAuthPermission.WRITE_PUBLIC)
+    >>> response = import_webservice.named_post(
+    ...     git_import_url, 'requestImport')
+    >>> print response.status
+    200
+    >>> print response.jsonBody()
+    None
+>>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/services/worlddata/doc/language.txt'
--- lib/lp/services/worlddata/doc/language.txt	2010-02-17 10:39:16 +0000
+++ lib/lp/services/worlddata/doc/language.txt	2010-04-16 04:01:13 +0000
@@ -260,8 +260,40 @@
   Serbian ("Latn" variant)
 
 
+translators
+===========
+
+Property `translators` contains the list of `Person`s who are considered
+translators for this language.
+
+  >>> sr = language_set.getLanguageByCode('sr')
+  >>> list(sr.translators)
+  []
+
+To be considered a translator, they must have done some translations and
+have the language among their preferred languages.
+
+  >>> translator = factory.makePerson(name=u'serbian-translator')
+  >>> translator.addLanguage(sr)
+  >>> from canonical.testing import LaunchpadZopelessLayer
+  >>> LaunchpadZopelessLayer.commit()
+
+  # We need to fake some Karma.
+  >>> from lp.registry.model.karma import KarmaCategory, KarmaCache
+  >>> LaunchpadZopelessLayer.switchDbUser('karma')
+  >>> translations_category = KarmaCategory.selectOne(
+  ...     KarmaCategory.name=='translations')
+  >>> karma = KarmaCache(person=translator,
+  ...                    category=translations_category,
+  ...                    karmavalue=1)
+  >>> LaunchpadZopelessLayer.commit()
+  >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
+  >>> [translator.name for translator in sr.translators]
+  [u'serbian-translator']
+
+
 =========
-countries
+Countries
 =========
 
 Property holding a list of countries a language is spoken in, and allowing

=== modified file 'lib/lp/services/worlddata/interfaces/language.py'
--- lib/lp/services/worlddata/interfaces/language.py	2010-03-05 14:02:05 +0000
+++ lib/lp/services/worlddata/interfaces/language.py	2010-04-16 04:01:13 +0000
@@ -16,6 +16,7 @@
 from zope.schema import TextLine, Int, Choice, Bool, Field, Set
 from zope.interface import Interface, Attribute
 from lazr.enum import DBEnumeratedType, DBItem
+from lazr.lifecycle.snapshot import doNotSnapshot
 
 from lazr.restful.declarations import (
     collection_default_content, exported, export_as_webservice_collection,
@@ -75,9 +76,9 @@
             required=False),
         exported_as='plural_expression')
 
-    translators = Field(
+    translators = doNotSnapshot(Field(
         title=u'List of Person/Team that translate into this language.',
-        required=True)
+        required=True))
 
     translators_count = exported(
         Int(

=== modified file 'lib/lp/services/worlddata/tests/test_doc.py'
--- lib/lp/services/worlddata/tests/test_doc.py	2009-06-30 16:56:07 +0000
+++ lib/lp/services/worlddata/tests/test_doc.py	2010-04-16 04:01:13 +0000
@@ -6,9 +6,20 @@
 """
 
 import os
+
+from canonical.launchpad.testing.systemdocs import (
+    LayeredDocFileSuite, setUp, tearDown)
+from canonical.testing import LaunchpadZopelessLayer
+
 from lp.services.testing import build_test_suite
 
 here = os.path.dirname(os.path.realpath(__file__))
+special = {
+    'language.txt': LayeredDocFileSuite(
+        '../doc/language.txt',
+        layer=LaunchpadZopelessLayer,
+        setUp=setUp, tearDown=tearDown),
+    }
 
 def test_suite():
-    return build_test_suite(here)
+    return build_test_suite(here, special)

=== added file 'lib/lp/services/worlddata/tests/test_language.py'
--- lib/lp/services/worlddata/tests/test_language.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/worlddata/tests/test_language.py	2010-04-16 04:01:13 +0000
@@ -0,0 +1,21 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from canonical.testing import FunctionalLayer
+from lazr.lifecycle.interfaces import IDoNotSnapshot
+from lp.services.worlddata.interfaces.language import ILanguage
+from lp.testing import TestCaseWithFactory
+
+
+class TestLanguageWebservice(TestCaseWithFactory):
+    """Test Language web service API."""
+
+    layer = FunctionalLayer
+
+    def test_translators(self):
+        self.failUnless(
+            IDoNotSnapshot.providedBy(ILanguage['translators']),
+            "ILanguage.translators should not be included in snapshots, "
+            "see bug 553093.")

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-04-08 02:35:06 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-04-16 04:01:13 +0000
@@ -1407,10 +1407,10 @@
     ppa
 
 We can take the opportunity to check if the default 'authorized_size'
-corresponds to what we state in our policy, 1024 MiB:
+corresponds to what we state in our policy, 2048 MiB:
 
     >>> name16.archive.authorized_size
-    1024
+    2048
 
 An archive is also associated with a distribution.  This can be found on
 the distribution property.  The default distribution is "ubuntu":

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-translations.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-translations.txt	2010-03-12 13:39:33 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-translations.txt	2010-04-16 04:01:13 +0000
@@ -297,8 +297,35 @@
 
   >>> queue_item.customfiles[0].publish(mock_logger)
   DEBUG: Publishing custom pmount, pmount_0.9.7-2ubuntu2_amd64_translations.tar.gz to ubuntu/dapper
-  DEBUG: Skipping translations since it is a PPA.
-
+  DEBUG: Skipping translations since its purpose is not in
+  MAIN_ARCHIVE_PURPOSES.
+
+  # And this time, we see that there are no entries imported in the queue.
+  >>> translation_import_queue.getAllEntries(target=ubuntu).count()
+  0
+  >>> transaction.abort()
+
+
+== Translations from a rebuild ==
+
+Translations coming from rebuilt packages are also ignored.
+
+  >>> from lp.registry.interfaces.person import IPersonSet
+  >>> from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
+
+  >>> foobar_archive = getUtility(IArchiveSet).new(
+  ...     purpose=ArchivePurpose.COPY,
+  ...     owner=getUtility(IPersonSet).getByName('name16'),
+  ...     name='rebuilds')
+
+  >>> dapper = getUtility(IDistributionSet)['ubuntu']['dapper']
+  >>> queue_item = dapper.getQueueItems(status=PackageUploadStatus.NEW)[0]
+  >>> queue_item.archive = foobar_archive
+
+  >>> queue_item.customfiles[0].publish(mock_logger)
+  DEBUG: Publishing custom pmount, pmount_0.9.7-2ubuntu2_amd64_translations.tar.gz to ubuntu/dapper
+  DEBUG: Skipping translations since its purpose is not in
+  MAIN_ARCHIVE_PURPOSES.
 
   # And this time, we see that there are no entries imported in the queue.
   >>> translation_import_queue.getAllEntries(target=ubuntu).count()
@@ -314,6 +341,8 @@
   >>> from zope.interface import implements
   >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
   >>> from lp.soyuz.model.queue import PackageUploadCustom
+  >>> from lp.soyuz.interfaces.archive import (
+  ...     IArchive, ArchivePurpose)
   >>> from lp.soyuz.interfaces.queue import (
   ...     IPackageUpload, IPackageUploadCustom)
   >>> from lp.soyuz.interfaces.queue import PackageUploadCustomFormat
@@ -323,6 +352,11 @@
   ...     ISourcePackageRelease)
   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
 
+  >>> class MockArchive:
+  ...       implements(IArchive)
+  ...       def __init__(self, purpose):
+  ...           self.purpose = purpose
+
   >>> class MockSourcePackageRelease:
   ...       implements(ISourcePackageRelease)
   ...       def __init__(self, component, creator):
@@ -338,14 +372,13 @@
 
   >>> class MockPackageUpload:
   ...     implements(IPackageUpload)
-  ...     def __init__(self, pocket, auto_sync, sourcepackagerelease):
+  ...     def __init__(self, pocket, auto_sync, sourcepackagerelease,
+  ...                  archive):
   ...         self.id = 1
   ...         self.pocket = pocket
   ...         self.auto_sync = auto_sync
   ...         self.sourcepackagerelease = sourcepackagerelease
-  ...
-  ...     def isPPA(self):
-  ...         return False
+  ...         self.archive = archive
   ...
   ...     def isAutoSyncUpload(self, changed_by_email=None):
   ...         return self.auto_sync
@@ -363,10 +396,11 @@
 
   >>> katie = getUtility(ILaunchpadCelebrities).katie
   >>> release_pocket = PackagePublishingPocket.RELEASE
+  >>> archive = MockArchive(ArchivePurpose.PRIMARY)
 
   >>> katie_sourcepackagerelease = MockSourcePackageRelease('main', katie)
   >>> sync_package_upload = MockPackageUpload(
-  ...     release_pocket, True, katie_sourcepackagerelease)
+  ...     release_pocket, True, katie_sourcepackagerelease, archive)
   >>> sync_package_upload.isAutoSyncUpload()
   True
   >>> translations_upload = MockPackageUploadCustom()
@@ -377,7 +411,7 @@
 Non-auto-sync uploads by 'katie' still indicate 'katie' as the uploader.
 
   >>> non_sync_package_upload = MockPackageUpload(
-  ...     release_pocket, False, katie_sourcepackagerelease)
+  ...     release_pocket, False, katie_sourcepackagerelease, archive)
   >>> non_sync_package_upload.isAutoSyncUpload()
   False
   >>> translations_upload.packageupload = non_sync_package_upload
@@ -390,7 +424,7 @@
   >>> carlos = person_set.getByName('carlos')
   >>> carlos_sourcepackagerelease = MockSourcePackageRelease('main', carlos)
   >>> carlos_package_upload = MockPackageUpload(
-  ...     release_pocket, False, carlos_sourcepackagerelease)
+  ...     release_pocket, False, carlos_sourcepackagerelease, archive)
   >>> carlos_package_upload.isAutoSyncUpload()
   False
   >>> translations_upload.packageupload = carlos_package_upload

=== modified file 'lib/lp/soyuz/doc/gina.txt'
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-04-12 08:29:02 +0000
+++ lib/lp/soyuz/model/archive.py	2010-04-16 04:01:13 +0000
@@ -164,7 +164,7 @@
         dbName='require_virtualized', notNull=True, default=True)
 
     authorized_size = IntCol(
-        dbName='authorized_size', notNull=False, default=1024)
+        dbName='authorized_size', notNull=False, default=2048)
 
     sources_cached = IntCol(
         dbName='sources_cached', notNull=False, default=0)

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-04-12 11:37:48 +0000
+++ lib/lp/soyuz/model/queue.py	2010-04-16 04:01:13 +0000
@@ -43,6 +43,7 @@
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.encoding import guess as guess_encoding, ascii_smash
 from canonical.launchpad.helpers import get_email_template
+from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -1701,9 +1702,11 @@
         """See `IPackageUploadCustom`."""
         sourcepackagerelease = self.packageupload.sourcepackagerelease
 
-        # Ignore translation coming from PPA.
-        if self.packageupload.isPPA():
-            debug(logger, "Skipping translations since it is a PPA.")
+        # Ignore translations not with main distribution purposes.
+        if self.packageupload.archive.purpose not in MAIN_ARCHIVE_PURPOSES:
+            debug(logger,
+                  "Skipping translations since its purpose is not "
+                  "in MAIN_ARCHIVE_PURPOSES.")
             return
 
         valid_pockets = (

=== modified file 'lib/lp/testing/factory.py'
=== modified file 'lib/lp/translations/templates/language-index.pt'
--- lib/lp/translations/templates/language-index.pt	2009-11-27 14:18:05 +0000
+++ lib/lp/translations/templates/language-index.pt	2010-04-16 04:01:13 +0000
@@ -66,36 +66,17 @@
             being experts in
             <tal:language replace="view/language_name">
               Espa&ntilde;ol
-            </tal:language>
-            :
+            </tal:language>:
           </p>
-          <table>
-            <tr tal:repeat="expert_info view/translation_teams">
-              <td>
-                <img tal:condition="expert_info/expert/isTeam"
-                   src="/@@/team" />
-                <img tal:condition="not:expert_info/expert/isTeam"
-                   src="/@@/person" />
-              </td>
-              <td>
-                <div>
-                  <a
-                  tal:attributes="
-                    href expert_info/expert/fmt:url;
-                    title expert_info/expert/displayname/fmt:shorten/80"
-                  tal:content="expert_info/expert/displayname"
-                  >Expert name</a>(
-                  <tal:groups repeat="group expert_info/groups">
-                    <a tal:attributes="
-                         href group/fmt:url;
-                         title group/title/fmt:shorten/80"
-                       tal:content="group/title"
-                       >Translation group title</a>
-                  </tal:groups>)
-                </div>
-              </td>
-            </tr>
-          </table>
+          <div tal:repeat="expert_info view/translation_teams">
+            <a tal:replace="structure expert_info/expert/fmt:link">Person</a>
+            (<tal:groups repeat="group expert_info/groups"
+               ><a tal:replace="structure group/fmt:link"
+                   >Translation group title</a
+                ><tal:comma
+                    condition="not:repeat/group/end">, </tal:comma
+                  ></tal:groups>)
+          </div>
           <p tal:condition="not:view/translation_teams">
             <tal:language replace="view/language_name">
               Espa&ntilde;ol