Merge lp:~jelmer/launchpad/bfbia into lp:launchpad

[Jelmer Vernooij]

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2011-06-03 12:16:19 +0000
+++ database/schema/comments.sql	2011-06-09 15:37:32 +0000
@@ -1527,6 +1527,21 @@
 COMMENT ON COLUMN SourcePackageRecipeDistroSeries.distroseries IS 'The primary key of the DistroSeries.';
 COMMENT ON COLUMN SourcePackageRecipeDistroSeries.sourcepackagerecipe IS 'The primary key of the SourcePackageRecipe.';
 
+-- SourcePackageBranchBuild
+
+COMMENT ON TABLE sourcepackagebranchbuild IS 'The build record for the process of building a source package as described by a branch.';
+COMMENT ON COLUMN sourcepackagebranchbuild.distroseries IS 'The distroseries the build was for.';
+COMMENT ON COLUMN sourcepackagebranchbuild.requester IS 'Who requested the build.';
+COMMENT ON COLUMN sourcepackagebranchbuild.branch IS 'The branch being processed.';
+COMMENT ON COLUMN sourcepackagebranchbuild.revision IS 'The revision being processed.';
+--COMMENT ON COLUMN sourcepackagebranchbuild.manifest IS 'The evaluated branch that was built.';
+COMMENT ON COLUMN sourcepackagebranchbuild.package_build IS 'The package_build with the base information about this build.';
+
+-- SourcePackageBranchBuildJob
+COMMENT ON TABLE sourcepackagebranchbuildjob IS 'The link between a SourcePackagebranchBuild row and a Job row to schedule a build of a source package branch.';
+
+COMMENT ON COLUMN sourcepackagebranchbuildjob.sourcepackage_branch_build IS 'The build record describing the package being built.';
+
 -- SourcePackageRecipeBuild
 
 COMMENT ON TABLE SourcePackageRecipeBuild IS 'The build record for the process of building a source package as described by a recipe.';

=== added file 'database/schema/patch-2208-66-0.sql'
--- database/schema/patch-2208-66-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2208-66-0.sql	2011-06-09 15:37:32 +0000
@@ -0,0 +1,45 @@
+-- Copyright 2011 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+CREATE TABLE sourcepackagebranchbuild (
+    id serial PRIMARY KEY,
+    distroseries integer NOT NULL
+        CONSTRAINT sourcepackagebranchbuild__distroseries__fk REFERENCES distroseries,
+    requester integer NOT NULL
+        CONSTRAINT sourcepackagebranchbuild_requester_fkey REFERENCES person,
+    branch integer
+        CONSTRAINT sourcepackagebranchbuild__branch__fk REFERENCES branch,
+--   manifest integer NOT NULL
+--        CONSTRAINT sourcepackagebranchbuild_manifest_fkey REFERENCES sourcepackagerecipedata,
+    package_build integer NOT NULL
+        CONSTRAINT sourcepackagebranchbuild_package_build_fkey REFERENCES packagebuild,
+    revision integer
+        CONSTRAINT sourcepackagebranchbuild_revision REFERENCES revision
+);
+
+CREATE INDEX sourcepackagebranchbuild__distroseries__idx ON sourcepackagebranchbuild USING btree (distroseries);
+--CREATE INDEX sourcepackagebranchbuild__manifest__idx ON sourcepackagebranchbuild USING btree (manifest);
+CREATE INDEX sourcepackagebranchbuild__branch__idx ON sourcepackagebranchbuild USING btree (branch);
+CREATE INDEX sourcepackagebranchbuild__revision__idx ON sourcepackagebranchbuild USING btree (revision);
+CREATE INDEX sourcepackagebranchbuild__requester__idx ON sourcepackagebranchbuild USING btree (requester);
+
+CREATE TABLE sourcepackagebranchbuildjob (
+    id serial PRIMARY KEY,
+    job integer NOT NULL
+        CONSTRAINT sourcepackagebranchbuildjob__job__key UNIQUE
+        CONSTRAINT sourcepackagebranchbuildjob_job_fkey REFERENCES job,
+    sourcepackage_branch_build integer NOT NULL
+        CONSTRAINT sourcepackagebranchbuildjob__sourcepackage_branch_build__key UNIQUE
+        CONSTRAINT sourcepackagebranchbuildjob_sourcepackage_branch_build_fkey REFERENCES sourcepackagebranchbuild
+);
+
+ALTER TABLE sourcepackagerelease
+    ADD COLUMN sourcepackage_branch_build integer
+        CONSTRAINT sourcepackagerelease_sourcepackage_branch_build_fkey REFERENCES sourcepackagebranchbuild
+;
+
+CREATE INDEX sourcepackagerelease__sourcepackage_branch_build__idx ON sourcepackagerelease USING btree (sourcepackage_branch_build);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 66, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2011-06-06 15:19:37 +0000
+++ database/schema/security.cfg	2011-06-09 15:37:32 +0000
@@ -280,6 +280,8 @@
 public.shippingrun                      = SELECT, INSERT, UPDATE
 public.sourcepackageformatselection     = SELECT
 public.sourcepackagepublishinghistory   = SELECT
+public.sourcepackagebranchbuild         = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagebranchbuildjob      = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipe              = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipebuild         = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipebuildjob      = SELECT, INSERT, UPDATE, DELETE
@@ -417,6 +419,7 @@
 public.project                          = SELECT
 public.shipitreport                     = SELECT
 public.shippingrun                      = SELECT
+public.sourcepackagebranchbuild         = SELECT
 public.sourcepackagerecipebuild         = SELECT
 public.sourcepackagerelease             = SELECT
 public.sourcepackagereleasefile         = SELECT
@@ -769,6 +772,8 @@
 public.processor                                = SELECT
 public.processorfamily                          = SELECT
 public.sourcepackagename                        = SELECT
+public.sourcepackagebranchbuild                 = SELECT, INSERT
+public.sourcepackagebranchbuildjob              = SELECT, INSERT
 public.sourcepackagerecipe                      = SELECT, UPDATE
 public.sourcepackagerecipebuild                 = SELECT, INSERT
 public.sourcepackagerecipebuildjob              = SELECT, INSERT
@@ -925,6 +930,8 @@
 public.seriessourcepackagebranch              = SELECT
 public.sourcepackagename                      = SELECT
 public.sourcepackagepublishinghistory         = SELECT
+public.sourcepackagebranchbuild               = SELECT, UPDATE
+public.sourcepackagebranchbuildjob            = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagerecipe                    = SELECT
 public.sourcepackagerecipebuild               = SELECT, UPDATE
 public.sourcepackagerecipebuildjob            = SELECT, INSERT, UPDATE, DELETE
@@ -1333,6 +1340,8 @@
 public.sourcepackageformatselection     = SELECT
 public.sourcepackagename                = SELECT, INSERT
 public.sourcepackagepublishinghistory   = SELECT, INSERT
+public.sourcepackagebranchbuild         = SELECT, UPDATE
+public.sourcepackagebranchbuildjob      = SELECT, UPDATE
 public.sourcepackagerecipe              = SELECT, UPDATE
 public.sourcepackagerecipebuild         = SELECT, UPDATE
 public.sourcepackagerecipebuildjob      = SELECT, UPDATE
@@ -1439,6 +1448,8 @@
 public.sourcepackagefilepublishing      = SELECT
 public.sourcepackagename                = SELECT
 public.sourcepackagepublishinghistory   = SELECT, INSERT, UPDATE
+public.sourcepackagebranchbuild         = SELECT
+public.sourcepackagebranchbuildjob      = SELECT, INSERT, UPDATE
 public.sourcepackagerecipebuild         = SELECT
 public.sourcepackagerecipebuildjob      = SELECT, INSERT, UPDATE
 public.sourcepackagerelease             = SELECT, UPDATE
@@ -2090,6 +2101,7 @@
 public.signedcodeofconduct              = SELECT, UPDATE
 public.sourcepackagename                = SELECT
 public.sourcepackagepublishinghistory   = SELECT, UPDATE
+public.sourcepackagebranchbuild         = SELECT, UPDATE
 public.sourcepackagerecipe              = SELECT, UPDATE
 public.sourcepackagerecipebuild         = SELECT, UPDATE
 public.sourcepackagerecipedata          = SELECT, UPDATE

=== added file 'lib/canonical/buildd/buildbranch'
--- lib/canonical/buildd/buildbranch	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/buildbranch	2011-06-09 15:37:32 +0000
@@ -0,0 +1,197 @@
+#!/usr/bin/env python
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""A script that builds a package from a branch and a chroot."""
+
+__metaclass__ = type
+
+
+import os
+import os.path
+import pwd
+from resource import RLIMIT_AS, setrlimit
+import socket
+from subprocess import call
+import sys
+
+
+RETCODE_SUCCESS = 0
+RETCODE_FAILURE_INSTALL = 200
+RETCODE_FAILURE_BUILD_TREE = 201
+RETCODE_FAILURE_INSTALL_BUILD_DEPS = 202
+RETCODE_FAILURE_BUILD_SOURCE_PACKAGE = 203
+
+
+class NotVirtualized(Exception):
+    """Exception raised when not running in a virtualized environment."""
+
+    def __init__(self):
+        Exception.__init__(self, 'Not running under Xen.')
+
+
+class BranchBuilder:
+    """Builds a package from a branch."""
+
+    def __init__(self, branch_url, revision_id, build_id, author_name,
+                 author_email, suite, distroseries_name, component,
+                 archive_purpose):
+        """Constructor.
+
+        :param branch_url: The URL of the branch to build
+        :param revision_id: The revision id of the revision to build
+        :param build_id: The id of the build (a str).
+        :param author_name: The name of the author (a str).
+        :param author_email: The email address of the author (a str).
+        :param suite: The suite the package should be built for (a str).
+        """
+        self.branch_url = branch_url
+        self.revision_id = revision_id
+        self.build_id = build_id
+        self.author_name = author_name.decode('utf-8')
+        self.author_email = author_email
+        self.archive_purpose = archive_purpose
+        self.component = component
+        self.distroseries_name = distroseries_name
+        self.suite = suite
+        self.base_branch = None
+        self.chroot_path = get_build_path(build_id, 'chroot-autobuild')
+        self.work_dir_relative = os.environ['HOME'] + '/work'
+        self.work_dir = os.path.join(self.chroot_path,
+                                     self.work_dir_relative[1:])
+        self.tree_path = os.path.join(self.work_dir, 'tree')
+        self.branch_url = branch_url
+        self.username = pwd.getpwuid(os.getuid())[0]
+
+    def install(self):
+        """Install all the requirements for building branches.
+
+        :return: A retcode from apt.
+        """
+        # XXX: AaronBentley 2010-07-07 bug=602463: pbuilder uses aptitude but
+        # does not depend on it.
+        return self.chroot([
+            'apt-get', 'install', '-y', 'pbuilder', 'aptitude'])
+
+    def buildTree(self):
+        """Build the branch into a source tree.
+
+        As a side-effect, sets self.source_dir_relative.
+        :return: a retcode from `bzr dailydeb`.
+        """
+        try:
+            ensure_virtualized()
+        except NotVirtualized, e:
+            sys.stderr.write('Aborting on failed virtualization check:\n')
+            sys.stderr.write(str(e))
+            return 1
+        assert not os.path.exists(self.tree_path)
+        manifest_path = os.path.join(self.tree_path, 'manifest')
+        # As of bzr 2.2, a defined identity is needed.  In this case, we're
+        # using buildd@<hostname>.
+        hostname = socket.gethostname()
+        bzr_email = 'buildd@%s' % hostname
+
+        print 'Building branch:'
+        sys.stdout.flush()
+        env = {
+            'DEBEMAIL': self.author_email,
+            'DEBFULLNAME': self.author_name.encode('utf-8'),
+            'BZR_EMAIL': bzr_email}
+        retcode = call([
+            'bzr', 'dailydeb', '--safe', '--no-build', self.branch_url,
+            self.tree_path, '--revision=revid:%s' % self.revision_id,
+            '--manifest', manifest_path], env=env)
+        if retcode != 0:
+            return retcode
+        (source,) = [name for name in os.listdir(self.tree_path)
+                     if name != 'manifest']
+        self.source_dir_relative = os.path.join(
+            self.work_dir_relative, 'tree', source)
+        return retcode
+
+    def getPackageName(self):
+        source_dir = os.path.join(
+            self.chroot_path, self.source_dir_relative.lstrip('/'))
+        changelog = os.path.join(source_dir, 'debian/changelog')
+        return open(changelog, 'r').readline().split(' ')[0]
+
+    def installBuildDeps(self):
+        """Install the build-depends of the source tree."""
+        package = self.getPackageName()
+        currently_building_path = os.path.join(
+            self.chroot_path, 'CurrentlyBuilding')
+        currently_building_contents = (
+            'Package: %s\n'
+            'Suite: %s\n'
+            'Component: %s\n'
+            'Purpose: %s\n'
+            'Build-Debug-Symbols: no\n' %
+            (package, self.suite, self.component, self.archive_purpose))
+        currently_building = open(currently_building_path, 'w')
+        currently_building.write(currently_building_contents)
+        currently_building.close()
+        return self.chroot(['sh', '-c', 'cd %s &&'
+                     '/usr/lib/pbuilder/pbuilder-satisfydepends'
+                     % self.source_dir_relative])
+
+    def chroot(self, args, echo=False):
+        """Run a command in the chroot.
+
+        :param args: the command and arguments to run.
+        :return: the status code.
+        """
+        if echo:
+            print "Running in chroot: %s" % ' '.join(
+                "'%s'" % arg for arg in args)
+            sys.stdout.flush()
+        return call([
+            '/usr/bin/sudo', '/usr/sbin/chroot', self.chroot_path] + args)
+
+    def buildSourcePackage(self):
+        """Build the source package.
+
+        :return: a retcode from dpkg-buildpackage.
+        """
+        retcode = self.chroot([
+            'su', '-c', 'cd %s && /usr/bin/dpkg-buildpackage -i -I -us -uc -S'
+            % self.source_dir_relative, self.username])
+        for filename in os.listdir(self.tree_path):
+            path = os.path.join(self.tree_path, filename)
+            if os.path.isfile(path):
+                os.rename(path, get_build_path(self.build_id, filename))
+        return retcode
+
+
+def get_build_path(build_id, *extra):
+    """Generate a path within the build directory.
+
+    :param build_id: the build id to use.
+    :param extra: the extra path segments within the build directory.
+    :return: the generated path.
+    """
+    return os.path.join(
+        os.environ["HOME"], "build-" + build_id, *extra)
+
+
+def ensure_virtualized():
+    """Raise an exception if not running in a virtualized environment.
+
+    Raises if not running under Xen.
+    """
+    if not os.path.isdir('/proc/xen') or os.path.exists('/proc/xen/xsd_kva'):
+        raise NotVirtualized()
+
+
+if __name__ == '__main__':
+    setrlimit(RLIMIT_AS, (1000000000, -1))
+    builder = BranchBuilder(*sys.argv[1:])
+    if builder.buildTree() != 0:
+        sys.exit(RETCODE_FAILURE_BUILD_TREE)
+    if builder.install() != 0:
+        sys.exit(RETCODE_FAILURE_INSTALL)
+    if builder.installBuildDeps() != 0:
+        sys.exit(RETCODE_FAILURE_INSTALL_BUILD_DEPS)
+    if builder.buildSourcePackage() != 0:
+        sys.exit(RETCODE_FAILURE_BUILD_SOURCE_PACKAGE)
+    sys.exit(RETCODE_SUCCESS)

=== added file 'lib/canonical/buildd/sourcepackagebranch.py'
--- lib/canonical/buildd/sourcepackagebranch.py	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/sourcepackagebranch.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,131 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+# pylint: disable-msg=E1002
+
+"""The manager class for building packages from branches."""
+
+import os
+import re
+
+from canonical.buildd.debian import (
+    DebianBuildManager,
+    DebianBuildState,
+    get_build_path,
+)
+RETCODE_SUCCESS = 0
+RETCODE_FAILURE_INSTALL = 200
+RETCODE_FAILURE_BUILD_TREE = 201
+RETCODE_FAILURE_INSTALL_BUILD_DEPS = 202
+RETCODE_FAILURE_BUILD_SOURCE_PACKAGE = 203
+
+
+def get_chroot_path(build_id, *extra):
+    """Return a path within the chroot.
+
+    :param build_id: The build_id of the build.
+    :param extra: Additional path elements.
+    """
+    return get_build_path(
+        build_id, 'chroot-autobuild', os.environ['HOME'][1:], *extra)
+
+
+class SourcePackageBranchBuildState(DebianBuildState):
+    """The set of states that a branch build can be in."""
+    BUILD_BRANCH = "BUILD_BRANCH"
+
+
+class SourcePackageBranchBuildManager(DebianBuildManager):
+    """Build a source package from a bzr-builder branch."""
+
+    initial_build_state = SourcePackageBranchBuildState.BUILD_BRANCH
+
+    def __init__(self, slave, buildid):
+        """Constructor.
+
+        :param slave: A build slave device.
+        :param buildid: The id of the build (a str).
+        """
+        DebianBuildManager.__init__(self, slave, buildid)
+        self.build_branch_path = slave._config.get(
+            "sourcepackagebranchmanager", "buildbranchpath")
+
+    def initiate(self, files, chroot, extra_args):
+        """Initiate a build with a given set of files and chroot.
+
+        :param files: The files sent by the manager with the request.
+        :param chroot: The sha1sum of the chroot to use.
+        :param extra_args: A dict of extra arguments.
+        """
+        self.branch_url = extra_args['branch_url']
+        self.revision_id = extra_args['revision_id']
+        self.suite = extra_args['suite']
+        self.component = extra_args['ogrecomponent']
+        self.author_name = extra_args['author_name']
+        self.author_email = extra_args['author_email']
+        self.archive_purpose = extra_args['archive_purpose']
+        self.distroseries_name = extra_args['distroseries_name']
+
+        super(SourcePackageBranchBuildManager, self).initiate(
+            files, chroot, extra_args)
+
+    def doRunBuild(self):
+        """Run the build process to build the source package."""
+        os.makedirs(get_chroot_path(self._buildid, 'work'))
+        args = [
+            "buildbranch.py", self.branch_url, self.revision_id,
+            self._buildid, self.author_name.encode('utf-8'),
+            self.author_email, self.suite, self.distroseries_name,
+            self.component, self.archive_purpose]
+        self.runSubProcess(self.build_branch_path, args)
+
+    def iterate_BUILD_BRANCH(self, retcode):
+        """Move from BUILD_BRANCH to the next logical state."""
+        if retcode == RETCODE_SUCCESS:
+            self.gatherResults()
+            print("Returning build status: OK")
+        elif retcode == RETCODE_FAILURE_INSTALL_BUILD_DEPS:
+            if not self.alreadyfailed:
+                tmpLog = self.getTmpLogContents()
+                rx = (
+                    'The following packages have unmet dependencies:\n'
+                    '.*: Depends: ([^ ]*( \([^)]*\))?)')
+                mo = re.search(rx, tmpLog, re.M)
+                if mo:
+                    self._slave.depFail(mo.group(1))
+                    print("Returning build status: DEPFAIL")
+                    print("Dependencies: " + mo.group(1))
+                else:
+                    print("Returning build status: Build failed")
+                    self._slave.buildFail()
+            self.alreadyfailed = True
+        elif (
+            retcode >= RETCODE_FAILURE_INSTALL and
+            retcode <= RETCODE_FAILURE_BUILD_SOURCE_PACKAGE):
+            # XXX AaronBentley 2009-01-13: We should handle depwait separately
+            if not self.alreadyfailed:
+                self._slave.buildFail()
+                print("Returning build status: Build failed.")
+            self.alreadyfailed = True
+        else:
+            if not self.alreadyfailed:
+                self._slave.builderFail()
+                print("Returning build status: Builder failed.")
+            self.alreadyfailed = True
+        self._state = DebianBuildState.REAP
+        self.doReapProcesses()
+
+    def getChangesFilename(self):
+        """Return the path to the changes file."""
+        work_path = get_build_path(self._buildid)
+        for name in os.listdir(work_path):
+            if name.endswith('_source.changes'):
+                return os.path.join(work_path, name)
+
+    def gatherResults(self):
+        """Gather the results of the build and add them to the file cache.
+
+        The primary file we care about is the .changes file.
+        The manifest is also a useful record.
+        """
+        DebianBuildManager.gatherResults(self)
+        self._slave.addWaitingFile(get_build_path(self._buildid, 'manifest'))

=== added file 'lib/canonical/buildd/test_buildd_branch'
--- lib/canonical/buildd/test_buildd_branch	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/test_buildd_branch	2011-06-09 15:37:32 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+#
+# This is a script to do end-to-end testing of the buildd with a bzr-builder
+# branch, without involving the BuilderBehaviour.
+
+country_code = 'us'
+apt_cacher_ng_host = 'stumpy'
+distroseries_name = 'maverick'
+branch_url = 'http://bazaar.launchpad.dev/~ppa-user/+junk/wakeonlan'
+revision_id = 'someemail@host-with-randomness'
+
+def deb_line(host, suites):
+    prefix = 'deb http://'
+    if apt_cacher_ng_host != None:
+        prefix += '%s:3142/' % apt_cacher_ng_host
+    return '%s%s %s %s' % (prefix, host, distroseries_name, suites)
+
+import sys
+from xmlrpclib import ServerProxy
+
+proxy = ServerProxy('http://localhost:8221/rpc')
+print proxy.echo('Hello World')
+print proxy.info()
+status = proxy.status()
+print status
+if status[0] != 'BuilderStatus.IDLE':
+    print "Aborting due to non-IDLE builder."
+    sys.exit(1)
+print proxy.build(
+    '1-2', 'sourcepackagebranch', '1ef177161c3cb073e66bf1550931c6fbaa0a94b0',
+    {}, {'author_name': u'Steve\u1234',
+         'author_email': '[e-mail]',
+         'suite': distroseries_name,
+         'distroseries_name': distroseries_name,
+         'ogrecomponent': 'universe',
+         'archive_purpose': 'puppies',
+         'branch_url': branch_url,
+         'revision_id': revision_id,
+         'archives': [
+            deb_line('%s.archive.ubuntu.com/ubuntu' % country_code,
+                     'main universe'),
+            deb_line('ppa.launchpad.net/launchpad/bzr-builder-dev/ubuntu',
+                     'main'),]})
+#status = proxy.status()
+#for filename, sha1 in status[3].iteritems():
+#    print filename
+#proxy.clean()

=== added file 'lib/canonical/launchpad/emailtemplates/branch-build-request.txt'
--- lib/canonical/launchpad/emailtemplates/branch-build-request.txt	1970-01-01 00:00:00 +0000
+++ lib/canonical/launchpad/emailtemplates/branch-build-request.txt	2011-06-09 15:37:32 +0000
@@ -0,0 +1,8 @@
+ * State: %(status)s
+ * Branch: %(branch_owner)s/%(branch)s
+ * Archive: %(archive_owner)s/%(archive)s
+ * Distroseries: %(distroseries)s
+ * Duration: %(duration)s
+ * Build Log: %(log_url)s
+ * Upload Log: %(upload_log_url)s
+ * Builder: %(builder_url)s

=== renamed file 'lib/canonical/launchpad/emailtemplates/build-request.txt' => 'lib/canonical/launchpad/emailtemplates/recipe-build-request.txt'
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2011-06-09 08:07:52 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2011-06-09 15:37:32 +0000
@@ -262,6 +262,10 @@
     IBranch, '_createMergeProposal', 'prerequisite_branch', IBranch)
 patch_collection_return_type(
     IBranch, 'getMergeProposals', IBranchMergeProposal)
+patch_plain_parameter_type(
+    IBranch, 'requestBuild', 'archive', IArchive)
+patch_plain_parameter_type(
+    IBranch, 'requestBuild', 'distroseries', IDistroSeries)
 
 IBranchMergeProposal['getComment'].queryTaggedValue(
     LAZR_WEBSERVICE_EXPORTED)['return_type'].schema = ICodeReviewComment

=== modified file 'lib/lp/app/browser/configure.zcml'
--- lib/lp/app/browser/configure.zcml	2011-05-28 15:08:55 +0000
+++ lib/lp/app/browser/configure.zcml	2011-06-09 15:37:32 +0000
@@ -504,6 +504,14 @@
       factory="lp.app.browser.tales.BuildImageDisplayAPI"
       name="image"
       />
+
+  <adapter
+      for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+      provides="zope.traversing.interfaces.IPathAdapter"
+      factory="lp.app.browser.tales.BuildImageDisplayAPI"
+      name="image"
+      />
+
   <adapter
       for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
       provides="zope.traversing.interfaces.IPathAdapter"

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2011-05-27 21:03:22 +0000
+++ lib/lp/code/browser/configure.zcml	2011-06-09 15:37:32 +0000
@@ -1354,9 +1354,52 @@
             name="+bmq-macros"
             permission="zope.Public"
             template="../templates/branchmergequeue-macros.pt"/>
-
-
-    </facet>
+    </facet>
+
+    <facet facet="branches">
+        <browser:defaultView
+            for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+            name="+index"
+            />
+        <browser:page
+            for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+            class="lp.code.browser.sourcepackagebranchbuild.SourcePackageBranchBuildView"
+            name="+index"
+            template="../templates/sourcepackagebranchbuild-index.pt"
+            permission="launchpad.View"/>
+        <browser:page
+            for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+            class="lp.code.browser.sourcepackagebranchbuild.SourcePackageBranchBuildCancelView"
+            name="+cancel"
+            template="../../app/templates/generic-edit.pt"
+            permission="launchpad.Admin"/>
+        <browser:page
+            for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+            class="lp.code.browser.sourcepackagebranchbuild.SourcePackageBranchBuildRescoreView"
+            name="+rescore"
+            template="../../app/templates/generic-edit.pt"
+            permission="launchpad.Admin"/>
+    </facet>
+
+    <browser:url
+        for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+        attribute_to_parent="archive"
+        path_expression="string:+branchbuild/${id}"
+        />
+    <adapter
+        for="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="lp.code.browser.sourcepackagebranchbuild.SourcePackageBranchBuildFormatterAPI"
+        name="fmt"
+        />
+
+    <browser:menus
+        classes="SourcePackageBranchBuildContextMenu"
+        module="lp.code.browser.sourcepackagebranchbuild"/>
+
+    <browser:navigation
+        module="lp.code.browser.sourcepackagebranchbuild"
+        classes="SourcePackageBranchBuildNavigation" />
 
     <browser:url
         for="lp.code.interfaces.branchmergequeue.IBranchMergeQueue"

=== added file 'lib/lp/code/browser/sourcepackagebranchbuild.py'
--- lib/lp/code/browser/sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,198 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""SourcePackageBranchBuild views."""
+
+__metaclass__ = type
+
+__all__ = [
+    'SourcePackageBranchBuildContextMenu',
+    'SourcePackageBranchBuildNavigation',
+    'SourcePackageBranchBuildView',
+    'SourcePackageBranchBuildCancelView',
+    'SourcePackageBranchBuildRescoreView',
+    ]
+
+from zope.interface import Interface
+from zope.schema import Int
+
+from canonical.launchpad.browser.librarian import FileNavigationMixin
+from canonical.launchpad.webapp import (
+    canonical_url,
+    ContextMenu,
+    enabled_with_permission,
+    LaunchpadView,
+    Link,
+    Navigation,
+    )
+from lp.app.browser.launchpadform import (
+    action,
+    LaunchpadFormView,
+    )
+from lp.app.browser.tales import CustomizableFormatter
+from lp.buildmaster.enums import BuildStatus
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuild,
+    )
+from lp.services.job.interfaces.job import JobStatus
+from lp.services.propertycache import cachedproperty
+
+
+UNEDITABLE_BUILD_STATES = (
+    BuildStatus.FULLYBUILT,
+    BuildStatus.FAILEDTOBUILD,
+    BuildStatus.SUPERSEDED,
+    BuildStatus.FAILEDTOUPLOAD,)
+
+
+class SourcePackageBranchBuildFormatterAPI(CustomizableFormatter):
+    """Adapter providing fmt support for ISourcePackageBranchBuild objects."""
+
+    _link_summary_template = '%(title)s [%(owner)s/%(archive)s]'
+
+    def _link_summary_values(self):
+        return {'title': self._context.title,
+                'owner': self._context.archive.owner.name,
+                'archive': self._context.archive.name}
+
+
+class SourcePackageBranchBuildNavigation(Navigation, FileNavigationMixin):
+
+    usedfor = ISourcePackageBranchBuild
+
+
+class SourcePackageBranchBuildContextMenu(ContextMenu):
+    """Navigation menu for sourcepackagebranch build."""
+
+    usedfor = ISourcePackageBranchBuild
+
+    facet = 'branches'
+
+    links = ('cancel', 'rescore')
+
+    @enabled_with_permission('launchpad.Admin')
+    def cancel(self):
+        if self.context.status in UNEDITABLE_BUILD_STATES:
+            enabled = False
+        else:
+            enabled = True
+        return Link('+cancel', 'Cancel build', icon='remove', enabled=enabled)
+
+    @enabled_with_permission('launchpad.Admin')
+    def rescore(self):
+        if self.context.status in UNEDITABLE_BUILD_STATES:
+            enabled = False
+        else:
+            enabled = True
+        return Link('+rescore', 'Rescore build', icon='edit', enabled=enabled)
+
+
+class SourcePackageBranchBuildView(LaunchpadView):
+    """Default view of a SourcePackageBranchBuild."""
+
+    @property
+    def status(self):
+        """A human-friendly status string."""
+        if (self.context.status == BuildStatus.NEEDSBUILD
+            and self.eta is None):
+            return 'No suitable builders'
+        return {
+            BuildStatus.NEEDSBUILD: 'Pending build',
+            BuildStatus.UPLOADING: 'Build uploading',
+            BuildStatus.FULLYBUILT: 'Successful build',
+            BuildStatus.MANUALDEPWAIT: (
+                'Could not build because of missing dependencies'),
+            BuildStatus.CHROOTWAIT: (
+                'Could not build because of chroot problem'),
+            BuildStatus.SUPERSEDED: (
+                'Could not build because source package was superseded'),
+            BuildStatus.FAILEDTOUPLOAD: 'Could not be uploaded correctly',
+            }.get(self.context.status, self.context.status.title)
+
+    @cachedproperty
+    def eta(self):
+        """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
+        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
+
+    @cachedproperty
+    def date(self):
+        """The date when the build completed or is estimated to complete."""
+        if self.estimate:
+            return self.eta
+        return self.context.date_finished
+
+    @cachedproperty
+    def estimate(self):
+        """If true, the date value is an estimate."""
+        if self.context.date_finished is not None:
+            return False
+        return self.eta is not None
+
+    def binary_builds(self):
+        return list(self.context.binary_builds)
+
+
+class SourcePackageBranchBuildCancelView(LaunchpadFormView):
+    """View for cancelling a build."""
+
+    class schema(Interface):
+        """Schema for cancelling a build."""
+
+    page_title = label = "Cancel build"
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+    next_url = cancel_url
+
+    @action('Cancel build', name='cancel')
+    def request_action(self, action, data):
+        """Cancel the build."""
+        self.context.cancelBuild()
+
+
+class SourcePackageBranchBuildRescoreView(LaunchpadFormView):
+    """View for rescoring a build."""
+
+    class schema(Interface):
+        """Schema for deleting a build."""
+        score = Int(
+            title=u'Score', required=True,
+            description=u'The score of the branch.')
+
+    page_title = label = "Rescore build"
+
+    def __call__(self):
+        if self.context.buildqueue_record is not None:
+            return super(SourcePackageBranchBuildRescoreView, self).__call__()
+        self.request.response.addWarningNotification(
+            'Cannot rescore this build because it is not queued.')
+        self.request.response.redirect(canonical_url(self.context))
+
+    @property
+    def cancel_url(self):
+        return canonical_url(self.context)
+    next_url = cancel_url
+
+    @action('Rescore build', name='rescore')
+    def request_action(self, action, data):
+        """Rescore the build."""
+        self.context.buildqueue_record.lastscore = int(data['score'])
+
+    @property
+    def initial_values(self):
+        return {'score': str(self.context.buildqueue_record.lastscore)}

=== added file 'lib/lp/code/browser/tests/test_sourcepackagebranchbuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,264 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+# pylint: disable-msg=F0401,E1002
+
+"""Tests for the source package branch view classes and templates."""
+
+__metaclass__ = type
+
+from mechanize import LinkNotFoundError
+from storm.locals import Store
+from testtools.matchers import StartsWith
+import transaction
+from zope.component import getUtility
+from zope.security.interfaces import Unauthorized
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.launchpad.testing.pages import (
+    extract_text,
+    find_main_content,
+    find_tags_by_class,
+    )
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.app.interfaces.launchpad import ILaunchpadCelebrities
+from lp.buildmaster.enums import BuildStatus
+from lp.soyuz.model.processor import ProcessorFamily
+from lp.testing import (
+    ANONYMOUS,
+    BrowserTestCase,
+    login,
+    logout,
+    person_logged_in,
+    TestCaseWithFactory,
+    )
+
+
+class TestCanonicalUrlForBranchBuild(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_canonical_url(self):
+        owner = self.factory.makePerson(name='ppa-owner')
+        ppa = self.factory.makeArchive(owner=owner, name='ppa')
+        build = self.factory.makeSourcePackageBranchBuild(archive=ppa)
+        self.assertThat(
+            canonical_url(build),
+            StartsWith(
+                'http://launchpad.dev/~ppa-owner/+archive/ppa/+branchbuild/'))
+
+
+class TestSourcePackageBranchBuild(BrowserTestCase):
+    """Create some sample data for branch tests."""
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        """Provide useful defaults."""
+        super(TestSourcePackageBranchBuild, self).setUp()
+        self.chef = self.factory.makePerson(
+            displayname='Master Chef', name='chef', password='test')
+        self.user = self.chef
+        self.ppa = self.factory.makeArchive(
+            displayname='Secret PPA', owner=self.chef, name='ppa')
+        self.squirrel = self.factory.makeDistroSeries(
+            displayname='Secret Squirrel', name='secret', version='100.04',
+            distribution=self.ppa.distribution)
+        naked_squirrel = removeSecurityProxy(self.squirrel)
+        naked_squirrel.nominatedarchindep = self.squirrel.newArch(
+            'i386', ProcessorFamily.get(1), False, self.chef,
+            supports_virtualized=True)
+
+    def makeBranchBuild(self):
+        """Create and return a specific bazaar revision."""
+        chocolate = self.factory.makeProduct(name='chocolate')
+        cake_branch = self.factory.makeProductBranch(
+            owner=self.chef, name='cake', product=chocolate)
+        return self.factory.makeSourcePackageBranchBuild(
+            branch=cake_branch, archive=self.ppa, distroseries=self.squirrel)
+
+    def test_cancel_build(self):
+        """An admin can cancel a build."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        queue = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue.specific_job.build
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        browser.getLink('Cancel build').click()
+
+        self.assertEqual(
+            browser.getLink('Cancel').url,
+            build_url)
+
+        browser.getControl('Cancel build').click()
+
+        self.assertEqual(
+            browser.url,
+            build_url)
+
+        login(ANONYMOUS)
+        self.assertEqual(
+            BuildStatus.SUPERSEDED,
+            build.status)
+
+    def test_cancel_build_not_admin(self):
+        """No one but admins can cancel a build."""
+        queue = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue.specific_job.build
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=self.chef)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink, 'Cancel build')
+
+        self.assertRaises(
+            Unauthorized,
+            self.getUserBrowser, build_url + '/+cancel', user=self.chef)
+
+    def test_cancel_build_wrong_state(self):
+        """If the build isn't queued, you can't cancel it."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        build = self.makeBranchBuild()
+        build.cancelBuild()
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink, 'Cancel build')
+
+    def test_rescore_build(self):
+        """An admin can rescore a build."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        queue = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue.specific_job.build
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        browser.getLink('Rescore build').click()
+
+        self.assertEqual(
+            browser.getLink('Cancel').url,
+            build_url)
+
+        browser.getControl('Score').value = '1024'
+
+        browser.getControl('Rescore build').click()
+
+        self.assertEqual(
+            browser.url,
+            build_url)
+
+        login(ANONYMOUS)
+        self.assertEqual(
+            build.buildqueue_record.lastscore,
+            1024)
+
+    def test_rescore_build_invalid_score(self):
+        """Build scores can only take numbers."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        queue = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue.specific_job.build
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        browser.getLink('Rescore build').click()
+
+        self.assertEqual(
+            browser.getLink('Cancel').url,
+            build_url)
+
+        browser.getControl('Score').value = 'tentwentyfour'
+
+        browser.getControl('Rescore build').click()
+
+        self.assertEqual(
+            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            'Invalid integer data')
+
+    def test_rescore_build_not_admin(self):
+        """No one but admins can rescore a build."""
+        queue = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue.specific_job.build
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=self.chef)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink, 'Rescore build')
+
+        self.assertRaises(
+            Unauthorized,
+            self.getUserBrowser, build_url + '/+rescore', user=self.chef)
+
+    def test_rescore_build_wrong_state(self):
+        """If the build isn't queued, you can't rescore it."""
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        build = self.makeBranchBuild()
+        build.cancelBuild()
+        transaction.commit()
+        build_url = canonical_url(build)
+        logout()
+
+        browser = self.getUserBrowser(build_url, user=experts)
+        self.assertRaises(
+            LinkNotFoundError,
+            browser.getLink, 'Rescore build')
+
+    def test_rescore_build_wrong_state_stale_link(self):
+        """Show sane error if you attempt to rescore a non-queued build.
+
+        This is the case where the user has a stale link that they click on.
+        """
+        build = self.factory.makeSourcePackageBranchBuild()
+        build.cancelBuild()
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        index_url = canonical_url(build)
+        browser = self.getViewBrowser(build, '+rescore', user=experts)
+        self.assertEqual(index_url, browser.url)
+        self.assertIn(
+            'Cannot rescore this build because it is not queued.',
+            browser.contents)
+
+    def test_rescore_build_wrong_state_stale_page(self):
+        """Show sane error if you attempt to rescore a non-queued build.
+
+        This is the case where the user is on the rescore page and submits.
+        """
+        build = self.factory.makeSourcePackageBranchBuild()
+        experts = getUtility(ILaunchpadCelebrities).bazaar_experts.teamowner
+        index_url = canonical_url(build)
+        browser = self.getViewBrowser(build, '+rescore', user=experts)
+        with person_logged_in(experts):
+            build.cancelBuild()
+        browser.getLink('Rescore build').click()
+        self.assertEqual(index_url, browser.url)
+        self.assertIn(
+            'Cannot rescore this build because it is not queued.',
+            browser.contents)
+
+    def test_builder_history(self):
+        build = self.makeBranchBuild()
+        Store.of(build).flush()
+        build_url = canonical_url(build)
+        removeSecurityProxy(build).builder = self.factory.makeBuilder()
+        browser = self.getViewBrowser(build.builder, '+history')
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+             'Build history.*~chef/chocolate/cake branch build',
+             extract_text(find_main_content(browser.contents)))
+        self.assertEqual(build_url,
+                browser.getLink('~chef/chocolate/cake branch build').url)

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2011-06-02 20:30:39 +0000
+++ lib/lp/code/configure.zcml	2011-06-09 15:37:32 +0000
@@ -903,6 +903,49 @@
       interface="lp.code.interfaces.diff.IStaticDiffSource" />
   </securedutility>
 
+  <!-- SourcePackageBranchBuild -->
+
+  <class
+     class="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuild">
+    <require permission="launchpad.View" interface="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuild"/>
+    <!-- This is needed for UploadProcessor to run. The permission isn't
+         important; launchpad.Edit isn't actually held by anybody. -->
+    <require permission="launchpad.Edit" set_attributes="status upload_log date_finished requester" />
+  </class>
+
+  <securedutility
+     component="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuild"
+     provides="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuildSource">
+    <allow interface="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuildSource"/>
+  </securedutility>
+
+  <securedutility
+     component="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuild"
+     provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"
+     name="BRANCHBUILD">
+    <allow interface="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJobSource"/>
+  </securedutility>
+
+  <class
+     class="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuildJob">
+    <require
+        permission="launchpad.View"
+        interface="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuildJob"/>
+  </class>
+
+  <securedutility
+     component="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuildJob"
+     provides="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuildJobSource">
+    <allow interface="lp.code.interfaces.sourcepackagebranchbuild.ISourcePackageBranchBuildJobSource"/>
+  </securedutility>
+
+  <adapter factory="lp.code.model.branchbuilder.BranchBuildBehavior"
+           permission="zope.Public" />
+
+  <utility component="lp.code.model.sourcepackagebranchbuild.SourcePackageBranchBuildJob"
+        name="BRANCHBUILD"
+        provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
+
   <!-- SourcePackageRecipe -->
 
   <securedutility
@@ -953,6 +996,7 @@
     <require permission="launchpad.View"
     interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeData"/>
   </class>
+
   <!-- SourcePackageRecipe -->
   <class
      class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe">

=== modified file 'lib/lp/code/doc/branch.txt'
--- lib/lp/code/doc/branch.txt	2011-05-27 19:53:20 +0000
+++ lib/lp/code/doc/branch.txt	2011-06-09 15:37:32 +0000
@@ -401,6 +401,7 @@
     productseries.branch
     productseries.translations_branch
     seriessourcepackagebranch.branch
+    sourcepackagebranchbuild.branch
     sourcepackagerecipedata.base_branch
     sourcepackagerecipedatainstruction.branch
     specificationbranch.branch

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2011-05-28 04:09:11 +0000
+++ lib/lp/code/interfaces/branch.py	2011-06-09 15:37:32 +0000
@@ -1026,6 +1026,27 @@
             required=False, readonly=True,
             vocabulary=ControlFormat))
 
+    @call_with(requester=REQUEST_USER)
+    @operation_parameters(
+        archive=Reference(schema=Interface), # Really IArchive
+        distroseries=Reference(schema=Interface), # Really IDistroSeries
+        pocket=Choice(vocabulary=PackagePublishingPocket,),
+        revision_id=TextLine(title=_("Revision id to build"), required=False))
+    @operation_returns_entry(Interface)
+    @export_write_operation()
+    @operation_for_version("beta")
+    def requestBuild(archive, distroseries, requester, pocket, revision_id):
+        """Request that the branch be built in to the specified archive.
+
+        :param archive: The IArchive which you want the build to end up in.
+        :param requester: the person requesting the build.
+        :param pocket: the pocket that should be targeted.
+        :param revision_id: optional revision_id of the revision to build
+            (defaults to tip)
+        :raises: various specific upload errors if the requestor is not
+            able to upload to the archive.
+        """
+
 
 class IBranchEdit(Interface):
     """IBranch attributes that require launchpad.Edit permission."""

=== added file 'lib/lp/code/interfaces/sourcepackagebranchbuild.py'
--- lib/lp/code/interfaces/sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/interfaces/sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,131 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0213,E0211
+
+"""Interfaces for source package branch builds."""
+
+__metaclass__ = type
+__all__ = [
+    'ISourcePackageBranchBuild',
+    'ISourcePackageBranchBuildSource',
+    'ISourcePackageBranchBuildJob',
+    'ISourcePackageBranchBuildJobSource',
+    ]
+
+from lazr.restful.declarations import export_as_webservice_entry
+from lazr.restful.fields import (
+    CollectionField,
+    Reference,
+    )
+from zope.interface import Interface
+from zope.schema import (
+    Bool,
+    Int,
+    Object,
+    )
+
+from canonical.launchpad import _
+from lp.buildmaster.interfaces.buildfarmjob import ISpecificBuildFarmJobSource
+from lp.buildmaster.interfaces.packagebuild import IPackageBuild
+from lp.code.interfaces.branch import IBranch
+from lp.code.interfaces.revision import IRevision
+#from lp.code.interfaces.sourcepackagerecipe import (
+#    ISourcePackageRecipeData,
+#    )
+from lp.registry.interfaces.distroseries import IDistroSeries
+from lp.registry.interfaces.person import IPerson
+from lp.services.job.interfaces.job import IJob
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
+from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
+from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
+
+
+class ISourcePackageBranchBuild(IPackageBuild):
+    """A build of a source package."""
+    export_as_webservice_entry()
+
+    id = Int(title=_("Identifier for this build."))
+
+    binary_builds = CollectionField(
+        Reference(IBinaryPackageBuild),
+        title=_("The binary builds that resulted from this."), readonly=True)
+
+    distroseries = Reference(
+        IDistroSeries, title=_("The distroseries being built for"),
+        readonly=True)
+
+    requester = Object(
+        schema=IPerson, required=False,
+        title=_("The person who wants this to be done."))
+
+    branch = Object(
+        schema=IBranch, title=_("The branch being built."), required=False)
+
+    revision = Object(schema=IRevision,
+        title=_("The revision in the branch being built."),
+        required=False)
+
+#    manifest = Object(
+#        schema=ISourcePackageRecipeData, title=_(
+#            'A snapshot of the recipe for this build.'))
+
+#    def getManifestText():
+#        """The text of the manifest for this build."""
+
+    source_package_release = Reference(
+        ISourcePackageRelease, title=_("The produced source package release"),
+        readonly=True)
+
+    is_virtualized = Bool(title=_('If True, this build is virtualized.'))
+
+    def getFileByName(filename):
+        """Return the file under +files with specified name."""
+
+    def cancelBuild():
+        """Cancel the build."""
+
+    def destroySelf():
+        """Delete the build itself."""
+
+
+class ISourcePackageBranchBuildSource(ISpecificBuildFarmJobSource):
+    """A utility of this interface be used to create source package builds."""
+
+    def new(distroseries, branch, requester, archive, date_created=None):
+        """Create an `ISourcePackageBranchBuild`.
+
+        :param distroseries: The `IDistroSeries` that this is building
+            against.
+        :param branch: The `IBranch` that this is building.
+        :param requester: The `IPerson` who wants to build it.
+        :param date_created: The date this build record was created. If not
+            provided, defaults to now.
+        :return: `ISourcePackageBranchBuild`.
+        """
+
+    def makeDailyBuilds(logger=None):
+        """Create and return builds for stale ISourcePackageBranches.
+
+        :param logger: An optional logger to write debug info to.
+        """
+
+
+class ISourcePackageBranchBuildJob(IBuildFarmBuildJob):
+    """A read-only interface for branch build jobs."""
+
+    job = Reference(
+        IJob, title=_("Job"), required=True, readonly=True,
+        description=_("Data common to all job types."))
+
+
+class ISourcePackageBranchBuildJobSource(Interface):
+    """A utility of this interface used to create _things_."""
+
+    def new(build, job):
+        """Create a new `ISourcePackageBranchBuildJob`.
+
+        :param build: An `ISourcePackageBranchBuild`.
+        :param job: An `IJob`.
+        :return: `ISourcePackageBranchBuildJob`.
+        """

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2011-05-04 03:49:28 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2011-06-09 15:37:32 +0000
@@ -3,7 +3,7 @@
 
 # pylint: disable-msg=E0213,E0211
 
-"""Interfaces for source package builds."""
+"""Interfaces for source package recipe builds."""
 
 __metaclass__ = type
 __all__ = [

=== added file 'lib/lp/code/mail/sourcepackagebranchbuild.py'
--- lib/lp/code/mail/sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/mail/sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,86 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+__all__ = [
+    'SourcePackageBranchBuildMailer',
+    ]
+
+
+from canonical.config import config
+from canonical.launchpad.webapp import canonical_url
+from lp.app.browser.tales import DurationFormatterAPI
+from lp.services.mail.basemailer import (
+    BaseMailer,
+    RecipientReason,
+    )
+
+
+class SourcePackageBranchBuildMailer(BaseMailer):
+
+    @classmethod
+    def forStatus(cls, build):
+        """Create a mailer for notifying about build status.
+
+        :param build: The build to notify about the state of.
+        """
+        requester = build.requester
+        recipients = {requester: RecipientReason.forBuildRequester(requester)}
+        return cls(
+            '[branch build #%(build_id)d] of ~%(branch_owner)s %(branch)s in'
+            ' %(distroseries)s: %(status)s',
+            'branch-build-request.txt', recipients,
+            config.canonical.noreply_from_address, build)
+
+    def __init__(self, subject, body_template, recipients, from_address,
+                 build):
+        BaseMailer.__init__(
+            self, subject, body_template, recipients, from_address,
+            notification_type='branch-build-status')
+        self.build = build
+
+    def _getHeaders(self, email):
+        """See `BaseMailer`"""
+        headers = super(
+            SourcePackageBranchBuildMailer, self)._getHeaders(email)
+        headers.update({
+            'X-Launchpad-Build-State': self.build.status.name,
+            })
+        return headers
+
+    def _getTemplateParams(self, email, recipient):
+        """See `BaseMailer`"""
+        params = super(
+            SourcePackageBranchBuildMailer, self)._getTemplateParams(
+                email, recipient)
+        params.update({
+            'status': self.build.status.title,
+            'build_id': self.build.id,
+            'distroseries': self.build.distroseries.name,
+            'branch': self.build.branch.name,
+            'branch_owner': self.build.branch.owner.name,
+            'archive': self.build.archive.name,
+            'archive_owner': self.build.archive.owner.name,
+            'log_url': '',
+            'component': self.build.current_component.name,
+            'duration': '',
+            'builder_url': '',
+            'build_url': canonical_url(self.build),
+            'upload_log_url': '',
+        })
+        if self.build.builder is not None:
+            params['builder_url'] = canonical_url(self.build.builder)
+        if self.build.duration is not None:
+            duration_formatter = DurationFormatterAPI(self.build.duration)
+            params['duration'] = duration_formatter.approximateduration()
+        if self.build.log is not None:
+            params['log_url'] = self.build.log.getURL()
+        if self.build.upload_log is not None:
+            params['upload_log_url'] = self.build.upload_log_url
+        return params
+
+    def _getFooter(self, params):
+        """See `BaseMailer`"""
+        return ('%(build_url)s\n'
+                '%(reason)s\n' % params)

=== modified file 'lib/lp/code/mail/sourcepackagerecipebuild.py'
--- lib/lp/code/mail/sourcepackagerecipebuild.py	2011-03-04 01:04:06 +0000
+++ lib/lp/code/mail/sourcepackagerecipebuild.py	2011-06-09 15:37:32 +0000
@@ -30,7 +30,7 @@
         return cls(
             '[recipe build #%(build_id)d] of ~%(recipe_owner)s %(recipe)s in'
             ' %(distroseries)s: %(status)s',
-            'build-request.txt', recipients,
+            'recipe-build-request.txt', recipients,
             config.canonical.noreply_from_address, build)
 
     def __init__(self, subject, body_template, recipients, from_address,

=== added file 'lib/lp/code/mail/tests/test_sourcepackagebranchbuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,132 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+
+__metaclass__ = type
+
+
+from datetime import timedelta
+from unittest import TestLoader
+
+from storm.locals import Store
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.config import config
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing.layers import LaunchpadFunctionalLayer
+from lp.buildmaster.enums import BuildStatus
+from lp.code.mail.sourcepackagerecipebuild import (
+    SourcePackageRecipeBuildMailer,
+    )
+from lp.testing import TestCaseWithFactory
+
+
+expected_body = u"""\
+ * State: Successfully built
+ * Recipe: person/recipe
+ * Archive: archiveowner/ppa
+ * Distroseries: distroseries
+ * Duration: five minutes
+ * Build Log: %s
+ * Upload Log: 
+ * Builder: http://launchpad.dev/builders/bob
+"""
+
+superseded_body = u"""\
+ * State: Build for superseded Source
+ * Recipe: person/recipe
+ * Archive: archiveowner/ppa
+ * Distroseries: distroseries
+ * Duration: 
+ * Build Log: 
+ * Upload Log: 
+ * Builder: 
+"""
+
+class TestSourcePackageRecipeBuildMailer(TestCaseWithFactory):
+
+    layer = LaunchpadFunctionalLayer
+
+    def makeStatusEmail(self, build):
+        mailer = SourcePackageRecipeBuildMailer.forStatus(build)
+        email = removeSecurityProxy(build.requester).preferredemail.email
+        return mailer.generateEmail(email, build.requester)
+
+    def test_generateEmail(self):
+        """GenerateEmail produces the right headers and body."""
+        person = self.factory.makePerson(name='person')
+        cake = self.factory.makeSourcePackageRecipe(
+            name=u'recipe', owner=person)
+        pantry_owner = self.factory.makePerson(name='archiveowner')
+        pantry = self.factory.makeArchive(name='ppa', owner=pantry_owner)
+        secret = self.factory.makeDistroSeries(name=u'distroseries')
+        build = self.factory.makeSourcePackageRecipeBuild(
+            recipe=cake, distroseries=secret, archive=pantry,
+            status=BuildStatus.FULLYBUILT, duration=timedelta(minutes=5))
+        naked_build = removeSecurityProxy(build)
+        naked_build.builder = self.factory.makeBuilder(name='bob')
+        naked_build.log = self.factory.makeLibraryFileAlias()
+        Store.of(build).flush()
+        ctrl = self.makeStatusEmail(build)
+        self.assertEqual(
+            u'[recipe build #%d] of ~person recipe in distroseries: '
+            'Successfully built' % (build.id), ctrl.subject)
+        body, footer = ctrl.body.split('\n-- \n')
+        self.assertEqual(
+            expected_body % build.log.getURL(), body)
+        build_url = canonical_url(build)
+        self.assertEqual(
+            '%s\nYou are the requester of the build.\n' % build_url, footer)
+        self.assertEqual(
+            config.canonical.noreply_from_address, ctrl.from_addr)
+        self.assertEqual(
+            'Requester', ctrl.headers['X-Launchpad-Message-Rationale'])
+        self.assertEqual(
+            'recipe-build-status',
+            ctrl.headers['X-Launchpad-Notification-Type'])
+        self.assertEqual(
+            'FULLYBUILT', ctrl.headers['X-Launchpad-Build-State'])
+
+    def test_generateEmail_with_null_fields(self):
+        """GenerateEmail works when many fields are NULL."""
+        person = self.factory.makePerson(name='person')
+        cake = self.factory.makeSourcePackageRecipe(
+            name=u'recipe', owner=person)
+        pantry_owner = self.factory.makePerson(name='archiveowner')
+        pantry = self.factory.makeArchive(name='ppa', owner=pantry_owner)
+        secret = self.factory.makeDistroSeries(name=u'distroseries')
+        build = self.factory.makeSourcePackageRecipeBuild(
+            recipe=cake, distroseries=secret, archive=pantry,
+            status=BuildStatus.SUPERSEDED)
+        Store.of(build).flush()
+        ctrl = self.makeStatusEmail(build)
+        self.assertEqual(
+            u'[recipe build #%d] of ~person recipe in distroseries: '
+            'Build for superseded Source' % (build.id), ctrl.subject)
+        body, footer = ctrl.body.split('\n-- \n')
+        self.assertEqual(superseded_body, body)
+        build_url = canonical_url(build)
+        self.assertEqual(
+            '%s\nYou are the requester of the build.\n' % build_url, footer)
+        self.assertEqual(
+            config.canonical.noreply_from_address, ctrl.from_addr)
+        self.assertEqual(
+            'Requester', ctrl.headers['X-Launchpad-Message-Rationale'])
+        self.assertEqual(
+            'recipe-build-status',
+            ctrl.headers['X-Launchpad-Notification-Type'])
+        self.assertEqual(
+            'SUPERSEDED', ctrl.headers['X-Launchpad-Build-State'])
+
+    def test_generateEmail_upload_failure(self):
+        """GenerateEmail works when many fields are NULL."""
+        build = self.factory.makeSourcePackageRecipeBuild()
+        removeSecurityProxy(build).upload_log = (
+            self.factory.makeLibraryFileAlias())
+        upload_log_fragment = 'Upload Log: %s' % build.upload_log_url
+        ctrl = self.makeStatusEmail(build)
+        self.assertTrue(upload_log_fragment in ctrl.body)
+
+
+def test_suite():
+    return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2011-06-06 20:56:43 +0000
+++ lib/lp/code/model/branch.py	2011-06-09 15:37:32 +0000
@@ -64,7 +64,10 @@
     )
 from canonical.launchpad.helpers import shortlist
 from canonical.launchpad.interfaces.launchpad import IPrivacy
-from canonical.launchpad.interfaces.lpstorm import IMasterStore
+from canonical.launchpad.interfaces.lpstorm import (
+    IMasterStore,
+    IStore,
+    )
 from canonical.launchpad.webapp import urlappend
 from lp.app.errors import UserCannotUnsubscribePerson
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
@@ -73,7 +76,10 @@
     IBugTaskSet,
     )
 from lp.bugs.interfaces.bugtaskfilter import filter_bugtasks_by_context
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildqueue import BuildQueue
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.code.bzr import (
     BranchFormat,
     ControlFormat,
@@ -92,9 +98,12 @@
     BranchMergeProposalExists,
     BranchTargetError,
     BranchTypeError,
+    BuildAlreadyPending,
+    BuildNotAllowedForDistro,
     CannotDeleteBranch,
     InvalidBranchMergeProposal,
     InvalidMergeQueueConfig,
+    TooManyBuilds,
     )
 from lp.code.event.branchmergeproposal import (
     BranchMergeProposalNeedsReviewEvent,
@@ -124,6 +133,9 @@
 from lp.code.interfaces.seriessourcepackagebranch import (
     IFindOfficialBranchLinks,
     )
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuildSource,
+    )
 from lp.code.mail.branch import send_branch_modified_notifications
 from lp.code.model.branchmergeproposal import (
     BranchMergeProposal,
@@ -135,17 +147,40 @@
     Revision,
     RevisionAuthor,
     )
+from lp.code.model.sourcepackagebranchbuild import SourcePackageBranchBuild
 from lp.code.model.seriessourcepackagebranch import SeriesSourcePackageBranch
 from lp.codehosting.bzrutils import safe_open
 from lp.registry.interfaces.person import (
     validate_person,
     validate_public_person,
     )
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.database.bulk import load_related
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
 from lp.services.mail.notificationrecipientset import NotificationRecipientSet
 from lp.services.propertycache import cachedproperty
+from lp.soyuz.interfaces.archive import IArchiveSet
+from lp.registry.interfaces.distroseries import IDistroSeriesSet
+
+
+class NonPPABuildRequest(Exception):
+    """A build was requested to a non-PPA and this is currently
+    unsupported."""
+
+
+def get_buildable_distroseries_set(user):
+    ppas = getUtility(IArchiveSet).getPPAsForUser(user)
+    supported_distros = set([ppa.distribution for ppa in ppas])
+    # Now add in Ubuntu.
+    supported_distros.add(getUtility(ILaunchpadCelebrities).ubuntu)
+    distros = getUtility(IDistroSeriesSet).search()
+
+    buildables = []
+    for distro in distros:
+        if distro.active and distro.distribution in supported_distros:
+            buildables.append(distro)
+    return buildables
 
 
 class Branch(SQLBase, BzrIdentityMixin):
@@ -1101,6 +1136,12 @@
             TranslationTemplatesBuild,
             TranslationTemplatesBuild.branch == self).remove()
 
+    def _deleteBuildReferencess(self):
+        store = Store.of(self)
+        builds = store.find(
+            SourcePackageBranchBuild, SourcePackageBranchBuild.branch==self)
+        builds.set(branch_id=None)
+
     def destroySelf(self, break_references=False):
         """See `IBranch`."""
         from lp.code.interfaces.branchjob import IReclaimBranchSpaceJobSource
@@ -1112,6 +1153,7 @@
 
         self._deleteBranchSubscriptions()
         self._deleteJobs()
+        self._deleteBuildReferencess()
 
         # Now destroy the branch.
         branch_id = self.id
@@ -1217,6 +1259,44 @@
         except ValueError:  # The json string is invalid
             raise InvalidMergeQueueConfig
 
+    def requestBuild(self, archive, requester, distroseries,
+                     pocket=PackagePublishingPocket.RELEASE,
+                     manual=False, revision_id=None):
+        """See `IBranchView`."""
+        if not archive.is_ppa:
+            raise NonPPABuildRequest
+
+        buildable_distros = get_buildable_distroseries_set(archive.owner)
+        if distroseries not in buildable_distros:
+            raise BuildNotAllowedForDistro(self, distroseries)
+
+        reject_reason = archive.checkUpload(
+            requester, self.distroseries, None, archive.default_component,
+            pocket)
+        if reject_reason is not None:
+            raise reject_reason
+        if SourcePackageBranchBuild.getRecentBuilds(
+            requester, self, distroseries).count() >= 5:
+            raise TooManyBuilds(self, distroseries)
+        pending = IStore(self).find(SourcePackageBranchBuild,
+            SourcePackageBranchBuild.branch_id == self.id,
+            SourcePackageBranchBuild.distroseries_id == distroseries.id,
+            PackageBuild.archive_id == archive.id,
+            PackageBuild.id == SourcePackageBranchBuild.package_build_id,
+            BuildFarmJob.id == PackageBuild.build_farm_job_id,
+            BuildFarmJob.status == BuildStatus.NEEDSBUILD)
+        if pending.any() is not None:
+            raise BuildAlreadyPending(self, distroseries)
+
+        build = getUtility(ISourcePackageBranchBuildSource).new(distroseries,
+            self, requester, archive)
+        build.queueBuild()
+        queue_record = build.buildqueue_record
+        if manual:
+            queue_record.manualScore(queue_record.lastscore + 100)
+        return build
+
+
 
 class DeletionOperation:
     """Represent an operation to perform as part of branch deletion."""

=== added file 'lib/lp/code/model/branchbuilder.py'
--- lib/lp/code/model/branchbuilder.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/model/branchbuilder.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,202 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Code to build branches on the buildfarm."""
+
+__metaclass__ = type
+__all__ = [
+    'BranchBuildBehavior',
+    ]
+
+import traceback
+
+from zope.component import adapts
+from zope.interface import implements
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.config import config
+from lp.buildmaster.interfaces.builder import CannotBuild
+from lp.buildmaster.interfaces.buildfarmjobbehavior import (
+    IBuildFarmJobBehavior,
+    )
+from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuildJob,
+    )
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.adapters.archivedependencies import (
+    get_primary_current_component,
+    get_sources_list_for_building,
+    )
+
+
+class BranchBuildBehavior(BuildFarmJobBehaviorBase):
+    """How to build a branch on the build farm."""
+
+    adapts(ISourcePackageBranchBuildJob)
+    implements(IBuildFarmJobBehavior)
+
+    status = None
+
+    @property
+    def build(self):
+        return self.buildfarmjob.build
+
+    @property
+    def display_name(self):
+        ret = "%s, %s" % (
+            self.build.distroseries.displayname, self.build.branch.unique_name)
+        if self._builder is not None:
+            ret += " (on %s)" % self._builder.url
+        return ret
+
+    def logStartBuild(self, logger):
+        """See `IBuildFarmJobBehavior`."""
+        logger.info("startBuild(%s)", self.display_name)
+
+    def _extraBuildArgs(self, distroarchseries, logger=None):
+        """
+        Return the extra arguments required by the slave for the given build.
+        """
+        # Build extra arguments.
+        args = {}
+        suite = self.build.distroseries.name
+        if self.build.pocket != PackagePublishingPocket.RELEASE:
+            suite += "-%s" % (self.build.pocket.name.lower())
+        args['suite'] = suite
+        args['arch_tag'] = distroarchseries.architecturetag
+        requester = self.build.requester
+        if requester.preferredemail is None:
+            # Use a constant, known, name and email.
+            args["author_name"] = 'Launchpad Package Builder'
+            args["author_email"] = config.canonical.noreply_from_address
+        else:
+            args["author_name"] = requester.displayname
+            # We have to remove the security proxy here b/c there's not a
+            # logged in entity, and anonymous email lookups aren't allowed.
+            # Don't keep the naked requester around though.
+            args["author_email"] = removeSecurityProxy(
+                requester).preferredemail.email
+        args["branch_url"] = str(self.build.branch.bzr_identity)
+        args["revision_id"] = self.build.revision_id
+        args['archive_purpose'] = self.build.archive.purpose.name
+        args["ogrecomponent"] = get_primary_current_component(
+            self.build.archive, self.build.distroseries,
+            None)
+        args['archives'] = get_sources_list_for_building(self.build,
+            distroarchseries, None)
+
+        # config.builddmaster.bzr_builder_sources_list can contain a
+        # sources.list entry for an archive that will contain a
+        # bzr-builder package that needs to be used to build this
+        # branch.
+        try:
+            extra_archive = config.builddmaster.bzr_builder_sources_list
+        except AttributeError:
+            extra_archive = None
+
+        if extra_archive is not None:
+            try:
+                sources_line = extra_archive % (
+                    {'series': self.build.distroseries.name})
+                args['archives'].append(sources_line)
+            except StandardError:
+                # Someone messed up the config, don't add it.
+                if logger:
+                    logger.error(
+                        "Exception processing bzr_builder_sources_list:\n%s"
+                        % traceback.format_exc())
+
+        args['distroseries_name'] = self.build.distroseries.name
+        return args
+
+    def dispatchBuildToSlave(self, build_queue_id, logger):
+        """See `IBuildFarmJobBehavior`."""
+
+        distroseries = self.build.distroseries
+        # Start the binary package build on the slave builder. First
+        # we send the chroot.
+        distroarchseries = distroseries.getDistroArchSeriesByProcessor(
+            self._builder.processor)
+        if distroarchseries is None:
+            raise CannotBuild("Unable to find distroarchseries for %s in %s" %
+                (self._builder.processor.name,
+                self.build.distroseries.displayname))
+        args = self._extraBuildArgs(distroarchseries, logger)
+        chroot = distroarchseries.getChroot()
+        if chroot is None:
+            raise CannotBuild("Unable to find a chroot for %s" %
+                              distroarchseries.displayname)
+        logger.info(
+            "Sending chroot file for branch build to %s" % self._builder.name)
+        d = self._builder.slave.cacheFile(logger, chroot)
+
+        def got_cache_file(ignored):
+            # Generate a string which can be used to cross-check when obtaining
+            # results so we know we are referring to the right database object in
+            # subsequent runs.
+            buildid = "%s-%s" % (self.build.id, build_queue_id)
+            cookie = self.buildfarmjob.generateSlaveBuildCookie()
+            chroot_sha1 = chroot.content.sha1
+            logger.info(
+                "Initiating build %s on %s" % (buildid, self._builder.url))
+
+            return self._builder.slave.build(
+                cookie, "sourcepackagebranch", chroot_sha1, {}, args)
+
+        def log_build_result((status, info)):
+            message = """%s (%s):
+            ***** RESULT *****
+            %s
+            %s: %s
+            ******************
+            """ % (
+                self._builder.name,
+                self._builder.url,
+                args,
+                status,
+                info,
+                )
+            logger.info(message)
+
+        return d.addCallback(got_cache_file).addCallback(log_build_result)
+
+    def verifyBuildRequest(self, logger):
+        """Assert some pre-build checks.
+
+        The build request is checked:
+         * Virtualized builds can't build on a non-virtual builder
+         * Ensure that we have a chroot
+         * Ensure that the build pocket allows builds for the current
+           distroseries state.
+        """
+        build = self.build
+        assert not (not self._builder.virtualized and build.is_virtualized), (
+            "Attempt to build virtual item on a non-virtual builder.")
+
+        # This should already have been checked earlier, but just check again
+        # here in case of programmer errors.
+        reason = build.archive.checkUploadToPocket(
+            build.distroseries, build.pocket)
+        assert reason is None, (
+                "%s (%s) can not be built for pocket %s: invalid pocket due "
+                "to the series status of %s." %
+                    (build.title, build.id, build.pocket.name,
+                     build.distroseries.name))
+
+    def updateSlaveStatus(self, raw_slave_status, status):
+        """Parse the branch build specific status info into the status dict.
+
+        This includes:
+        * filemap => dictionary or None
+        * dependencies => string or None
+        """
+        build_status_with_files = (
+            'BuildStatus.OK',
+            'BuildStatus.PACKAGEFAIL',
+            'BuildStatus.DEPFAIL',
+            )
+        if (status['builder_status'] == 'BuilderStatus.WAITING' and
+            status['build_status'] in build_status_with_files):
+            status['filemap'] = raw_slave_status[3]
+            status['dependencies'] = raw_slave_status[4]

=== added file 'lib/lp/code/model/sourcepackagebranchbuild.py'
--- lib/lp/code/model/sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/model/sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,362 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=F0401,E1002
+
+"""Implementation code for source package builds."""
+
+__metaclass__ = type
+__all__ = [
+    'SourcePackageBranchBuild',
+    ]
+
+from datetime import (
+    datetime,
+    timedelta,
+    )
+
+from pytz import utc
+from storm.locals import (
+    Int,
+    Reference,
+    Storm,
+    )
+from storm.store import Store
+from zope.component import (
+    getUtility,
+    )
+from zope.interface import (
+    classProvides,
+    implements,
+    )
+
+from canonical.database.constants import UTC_NOW
+from canonical.launchpad.browser.librarian import ProxiedLibraryFileAlias
+from canonical.launchpad.interfaces.lpstorm import (
+    IMasterStore,
+    )
+from lp.app.errors import NotFoundError
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
+from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
+from lp.buildmaster.model.buildqueue import BuildQueue
+from lp.buildmaster.model.packagebuild import (
+    PackageBuild,
+    PackageBuildDerived,
+    )
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuild,
+    ISourcePackageBranchBuildJob,
+    ISourcePackageBranchBuildJobSource,
+    ISourcePackageBranchBuildSource,
+    )
+from lp.code.mail.sourcepackagebranchbuild import (
+    SourcePackageBranchBuildMailer,
+    )
+#from lp.code.model.sourcepackagerecipedata import SourcePackageRecipeData
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.job.model.job import Job
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
+from lp.soyuz.model.buildfarmbuildjob import BuildFarmBuildJob
+from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
+
+
+class SourcePackageBranchBuild(PackageBuildDerived, Storm):
+
+    __storm_table__ = 'SourcePackageBranchBuild'
+
+    implements(ISourcePackageBranchBuild)
+    classProvides(ISourcePackageBranchBuildSource)
+
+    package_build_id = Int(name='package_build', allow_none=False)
+    package_build = Reference(package_build_id, 'PackageBuild.id')
+
+    build_farm_job_type = BuildFarmJobType.BRANCHBUILD
+
+    id = Int(primary=True)
+
+    is_private = False
+
+    # The list of build status values for which email notifications are
+    # allowed to be sent. It is up to each callback as to whether it will
+    # consider sending a notification but it won't do so if the status is not
+    # in this list.
+    ALLOWED_STATUS_NOTIFICATIONS = [
+        'OK', 'PACKAGEFAIL', 'DEPFAIL', 'CHROOTFAIL']
+
+    @property
+    def binary_builds(self):
+        """See `ISourcePackageBranchBuild`."""
+        return Store.of(self).find(BinaryPackageBuild,
+            BinaryPackageBuild.source_package_release ==
+            SourcePackageRelease.id,
+            SourcePackageRelease.source_package_branch_build == self.id)
+
+    @property
+    def current_component(self):
+        # Only PPAs currently have a sane default component at the
+        # moment, but we only support branch builds for PPAs.
+        component = self.archive.default_component
+        assert component is not None
+        return component
+
+    distroseries_id = Int(name='distroseries', allow_none=True)
+    distroseries = Reference(distroseries_id, 'DistroSeries.id')
+    distro_series = distroseries
+
+    @property
+    def distribution(self):
+        """See `IPackageBuild`."""
+        return self.distroseries.distribution
+
+    is_virtualized = True
+
+    branch_id = Int(name='branch', allow_none=True)
+    branch = Reference(branch_id, 'Branch.id')
+
+    revision_id = Int(name='revision', allow_none=True)
+    revision = Reference(revision_id, 'Revision.id')
+
+#    manifest = Reference(
+#        id, 'SourcePackageRecipeData.sourcepackage_recipe_build_id',
+#        on_remote=True)
+#
+#    def setManifestText(self, text):
+#        if text is None:
+#            if self.manifest is not None:
+#                IStore(self.manifest).remove(self.manifest)
+#        elif self.manifest is None:
+#            SourcePackageRecipeData.createManifestFromText(text, self)
+#        else:
+#            from bzrlib.plugins.builder.recipe import RecipeParser
+#            self.manifest.setRecipe(RecipeParser(text).parse())
+#
+#    def getManifestText(self):
+#        if self.manifest is None:
+#            return None
+#        return str(self.manifest.getRecipe())
+
+    requester_id = Int(name='requester', allow_none=False)
+    requester = Reference(requester_id, 'Person.id')
+
+    @property
+    def buildqueue_record(self):
+        """See `IBuildFarmJob`."""
+        store = Store.of(self)
+        results = store.find(
+            BuildQueue,
+            SourcePackageBranchBuildJob.job == BuildQueue.jobID,
+            SourcePackageBranchBuildJob.build == self.id)
+        return results.one()
+
+    @property
+    def source_package_release(self):
+        """See `ISourcePackageBranchBuild`."""
+        return Store.of(self).find(
+            SourcePackageRelease, source_package_branch_build=self).one()
+
+    @property
+    def title(self):
+        if self.branch is None:
+            return 'build for deleted branch'
+        else:
+            return '%s build' % self.branch.unique_name
+
+    def __init__(self, package_build, distroseries, branch, requester,
+                 revision):
+        """Construct a SourcePackageBranchBuild."""
+        super(SourcePackageBranchBuild, self).__init__()
+        self.package_build = package_build
+        self.distroseries = distroseries
+        self.branch = branch
+        self.requester = requester
+        self.revision = revision
+
+    @classmethod
+    def new(cls, distroseries, branch, requester, archive, pocket=None,
+            date_created=None, duration=None, revision=None):
+        """See `ISourcePackageBranchBuildSource`."""
+        store = IMasterStore(SourcePackageBranchBuild)
+        if pocket is None:
+            pocket = PackagePublishingPocket.RELEASE
+        if date_created is None:
+            date_created = UTC_NOW
+        packagebuild = PackageBuild.new(cls.build_farm_job_type,
+            True, archive, pocket, date_created=date_created)
+        spbuild = cls(packagebuild, distroseries, branch, requester, revision)
+        store.add(spbuild)
+        return spbuild
+
+    def _unqueueBuild(self):
+        """Remove the build's queue and job."""
+        store = Store.of(self)
+        if self.buildqueue_record is not None:
+            job = self.buildqueue_record.job
+            store.remove(self.buildqueue_record)
+            store.find(
+                SourcePackageBranchBuildJob,
+                SourcePackageBranchBuildJob.build == self.id).remove()
+            store.remove(job)
+
+    def cancelBuild(self):
+        """See `ISourcePackageBranchBuild.`"""
+        self._unqueueBuild()
+        self.status = BuildStatus.SUPERSEDED
+
+    def destroySelf(self):
+        self._unqueueBuild()
+        store = Store.of(self)
+        releases = store.find(
+            SourcePackageRelease,
+            SourcePackageRelease.source_package_branch_build == self.id)
+        for release in releases:
+            release.source_package_branch_build = None
+        package_build = self.package_build
+        store.remove(self)
+        package_build.destroySelf()
+
+    @classmethod
+    def getByID(cls, build_id):
+        """See `ISourcePackageBranchBuildSource`."""
+        store = IMasterStore(SourcePackageBranchBuild)
+        return store.find(cls, cls.id == build_id).one()
+
+    @classmethod
+    def getByBuildFarmJob(cls, build_farm_job):
+        """See `ISpecificBuildFarmJobSource`."""
+        return Store.of(build_farm_job).find(cls,
+            cls.package_build_id == PackageBuild.id,
+            PackageBuild.build_farm_job_id == build_farm_job.id).one()
+
+    @classmethod
+    def getRecentBuilds(cls, requester, branch, distroseries, _now=None):
+        from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+        if _now is None:
+            _now = datetime.now(utc)
+        store = IMasterStore(SourcePackageBranchBuild)
+        old_threshold = _now - timedelta(days=1)
+        return store.find(cls, cls.distroseries_id == distroseries.id,
+            cls.requester_id == requester.id, cls.branch_id == branch.id,
+            BuildFarmJob.date_created > old_threshold,
+            BuildFarmJob.id == PackageBuild.build_farm_job_id,
+            PackageBuild.id == cls.package_build_id)
+
+    def makeJob(self):
+        """See `ISourcePackageBranchBuildJob`."""
+        store = Store.of(self)
+        job = Job()
+        store.add(job)
+        specific_job = getUtility(
+            ISourcePackageBranchBuildJobSource).new(self, job)
+        return specific_job
+
+    def estimateDuration(self):
+        """See `IPackageBuild`."""
+        # FIXME
+        return timedelta(minutes=10)
+
+    def verifySuccessfulUpload(self):
+        return self.source_package_release is not None
+
+    def notify(self, extra_info=None):
+        """See `IPackageBuild`."""
+        # If our branch has been deleted, any notification will fail.
+        if self.branch is None:
+            return
+        if self.status == BuildStatus.FULLYBUILT:
+            # Don't send mail for successful builds; it can be just
+            # too much.
+            return
+        mailer = SourcePackageBranchBuildMailer.forStatus(self)
+        mailer.sendAll()
+
+    def lfaUrl(self, lfa):
+        """Return the URL for a LibraryFileAlias, in the context of self.
+        """
+        if lfa is None:
+            return None
+        return ProxiedLibraryFileAlias(lfa, self).http_url
+
+    @property
+    def log_url(self):
+        """See `IPackageBuild`.
+
+        Overridden here so that it uses the SourcePackageBranchBuild as
+        context.
+        """
+        return self.lfaUrl(self.log)
+
+    @property
+    def upload_log_url(self):
+        """See `IPackageBuild`.
+
+        Overridden here so that it uses the SourcePackageBranchBuild as
+        context.
+        """
+        return self.lfaUrl(self.upload_log)
+
+    def getFileByName(self, filename):
+        """See `ISourcePackageBranchBuild`."""
+        files = dict((lfa.filename, lfa)
+                     for lfa in [self.log, self.upload_log]
+                     if lfa is not None)
+        try:
+            return files[filename]
+        except KeyError:
+            raise NotFoundError(filename)
+
+    def getUploader(self, changes):
+        """See `IPackageBuild`."""
+        return self.requester
+
+
+class SourcePackageBranchBuildJob(BuildFarmJobOldDerived, Storm):
+    classProvides(ISourcePackageBranchBuildJobSource)
+    implements(ISourcePackageBranchBuildJob)
+
+    __storm_table__ = 'sourcepackagebranchbuildjob'
+
+    id = Int(primary=True)
+
+    job_id = Int(name='job', allow_none=False)
+    job = Reference(job_id, 'Job.id')
+
+    build_id = Int(name='sourcepackage_branch_build', allow_none=False)
+    build = Reference(
+        build_id, 'SourcePackageBranchBuild.id')
+
+    @property
+    def processor(self):
+        return self.build.distroseries.nominatedarchindep.default_processor
+
+    @property
+    def virtualized(self):
+        """See `IBuildFarmJob`."""
+        return self.build.is_virtualized
+
+    def __init__(self, build, job):
+        self.build = build
+        self.job = job
+        super(SourcePackageBranchBuildJob, self).__init__()
+
+    def _set_build_farm_job(self):
+        """Setup the IBuildFarmJob delegate.
+
+        We override this to provide a delegate specific to package builds."""
+        self.build_farm_job = BuildFarmBuildJob(self.build)
+
+    @classmethod
+    def new(cls, build, job):
+        """See `ISourcePackageBranchBuildJobSource`."""
+        specific_job = cls(build, job)
+        store = IMasterStore(cls)
+        store.add(specific_job)
+        return specific_job
+
+    def getName(self):
+        return "%s-%s" % (self.id, self.build_id)
+
+    def score(self):
+        return 2505 + self.build.archive.relative_build_score

=== modified file 'lib/lp/code/model/sourcepackagerecipedata.py'
--- lib/lp/code/model/sourcepackagerecipedata.py	2010-10-28 15:59:13 +0000
+++ lib/lp/code/model/sourcepackagerecipedata.py	2011-06-09 15:37:32 +0000
@@ -47,7 +47,6 @@
     TooNewRecipeFormat,
     )
 from lp.code.interfaces.branchlookup import IBranchLookup
-from lp.code.model.branch import Branch
 
 
 class InstructionType(DBEnumeratedType):
@@ -309,6 +308,7 @@
     def getReferencedBranches(self):
         """Return an iterator of the Branch objects referenced by this recipe.
         """
+        from lp.code.model.branch import Branch
         yield self.base_branch
         sub_branches = IStore(self).find(
             Branch,

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2011-05-04 02:41:23 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2011-06-09 15:37:32 +0000
@@ -243,7 +243,7 @@
             "Exception processing bzr_builder_sources_list:",
             logger.getLogBuffer())
 
-    def test_extraBuildArgs_withNoBZrBuilderConfigSet(self):
+    def test_extraBuildArgs_withNoBzrBuilderConfigSet(self):
         # Ensure _extraBuildArgs doesn't blow up when
         # bzr_builder_sources_list isn't set.
         job = self.makeJob()

=== added file 'lib/lp/code/model/tests/test_sourcepackagebranchbuild.py'
--- lib/lp/code/model/tests/test_sourcepackagebranchbuild.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/model/tests/test_sourcepackagebranchbuild.py	2011-06-09 15:37:32 +0000
@@ -0,0 +1,450 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for source package builds."""
+
+__metaclass__ = type
+
+from datetime import (
+    timedelta,
+    )
+import re
+
+from storm.locals import Store
+import transaction
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
+
+from twisted.trial.unittest import TestCase as TrialTestCase
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.launchpad.webapp.authorization import check_permission
+from canonical.launchpad.webapp.testing import verifyObject
+from canonical.testing.layers import (
+    LaunchpadFunctionalLayer,
+    LaunchpadZopelessLayer,
+    )
+from lp.app.errors import NotFoundError
+from lp.buildmaster.enums import BuildStatus
+from lp.buildmaster.interfaces.buildqueue import IBuildQueue
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.model.packagebuild import PackageBuild
+from lp.buildmaster.tests.mock_slaves import WaitingSlave
+from lp.buildmaster.tests.test_packagebuild import (
+    TestGetUploadMethodsMixin,
+    TestHandleStatusMixin,
+    )
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuild,
+    ISourcePackageBranchBuildJob,
+    ISourcePackageBranchBuildSource,
+    )
+from lp.code.mail.sourcepackagebranchbuild import (
+    SourcePackageBranchBuildMailer,
+    )
+from lp.code.model.sourcepackagebranchbuild import SourcePackageBranchBuild
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.mail.sendmail import format_address
+from lp.soyuz.interfaces.processor import IProcessorFamilySet
+from lp.soyuz.model.processor import ProcessorFamily
+from lp.testing import (
+    ANONYMOUS,
+    login,
+    person_logged_in,
+    TestCaseWithFactory,
+    )
+from lp.testing.fakemethod import FakeMethod
+from lp.testing.mail_helpers import pop_notifications
+
+
+class TestSourcePackageBranchBuild(TestCaseWithFactory):
+    """Test the source package build object."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def makeSourcePackageBranchBuild(self):
+        """Create a `SourcePackageBranchBuild` for testing."""
+        person = self.factory.makePerson()
+        distroseries = self.factory.makeDistroSeries()
+        distroseries_i386 = distroseries.newArch(
+            'i386', ProcessorFamily.get(1), False, person,
+            supports_virtualized=True)
+        removeSecurityProxy(distroseries).nominatedarchindep = (
+            distroseries_i386)
+
+        return getUtility(ISourcePackageBranchBuildSource).new(
+            distroseries=distroseries,
+            branch=self.factory.makeBranch(),
+            archive=self.factory.makeArchive(),
+            requester=person)
+
+    def test_providesInterfaces(self):
+        # SourcePackageBranchBuild provides IPackageBuild and
+        # ISourcePackageBranchBuild.
+        spb = self.makeSourcePackageBranchBuild()
+        self.assertProvides(spb, ISourcePackageBranchBuild)
+
+    def test_implements_interface(self):
+        build = self.makeSourcePackageBranchBuild()
+        verifyObject(ISourcePackageBranchBuild, build)
+
+    def test_saves_record(self):
+        # A source package branch build can be stored in the database
+        spb = self.makeSourcePackageBranchBuild()
+        transaction.commit()
+        self.assertProvides(spb, ISourcePackageBranchBuild)
+
+    def test_makeJob(self):
+        # A build farm job can be obtained from a SourcePackageBranchBuild
+        spb = self.makeSourcePackageBranchBuild()
+        job = spb.makeJob()
+        self.assertProvides(job, ISourcePackageBranchBuildJob)
+
+    def test_queueBuild(self):
+        spb = self.makeSourcePackageBranchBuild()
+        bq = spb.queueBuild(spb)
+
+        self.assertProvides(bq, IBuildQueue)
+        self.assertProvides(bq.specific_job, ISourcePackageBranchBuildJob)
+        self.assertEqual(True, bq.virtualized)
+
+        # The processor for SourcePackageBranchBuilds should not be None.
+        # They do require specific environments.
+        self.assertNotEqual(None, bq.processor)
+        self.assertEqual(
+            spb.distroseries.nominatedarchindep.default_processor,
+            bq.processor)
+        self.assertEqual(bq, spb.buildqueue_record)
+
+    def test_getBuildCookie(self):
+        # A build cookie is made up of the job type and record id.
+        # The uploadprocessor relies on this format.
+        sprb = self.makeSourcePackageBranchBuild()
+        Store.of(sprb).flush()
+        cookie = sprb.getBuildCookie()
+        expected_cookie = "BRANCHBUILD-%d" % sprb.id
+        self.assertEquals(expected_cookie, cookie)
+
+    def test_title(self):
+        # A branche build's title currently consists of the branch's
+        # unique name
+        spb = self.makeSourcePackageBranchBuild()
+        title = "%s build" % spb.branch.unique_name
+        self.assertEqual(spb.title, title)
+
+    def test_getTitle(self):
+        # A branch build job's title is the same as its build's title.
+        spb = self.makeSourcePackageBranchBuild()
+        job = spb.makeJob()
+        self.assertEqual(job.getTitle(), spb.title)
+
+    def test_distribution(self):
+        # A source package branch build has a distribution derived from
+        # its series.
+        spb = self.makeSourcePackageBranchBuild()
+        self.assertEqual(spb.distroseries.distribution, spb.distribution)
+
+    def test_current_component(self):
+        # Since branches build only into PPAs, they always build in main.
+        # PPAs lack indices for other components.
+        spb = self.makeSourcePackageBranchBuild()
+        self.assertEqual('main', spb.current_component.name)
+
+    def test_is_private(self):
+        # A source package branch build is currently always public.
+        spb = self.makeSourcePackageBranchBuild()
+        self.assertEqual(False, spb.is_private)
+
+    def test_view_private_branch(self):
+        """Branchbuilds with private branches are restricted."""
+        owner = self.factory.makePerson()
+        branch = self.factory.makeAnyBranch(owner=owner)
+        with person_logged_in(owner):
+            build = self.factory.makeSourcePackageBranchBuild(branch=branch)
+            self.assertTrue(check_permission('launchpad.View', build))
+        removeSecurityProxy(branch).private = True
+        with person_logged_in(self.factory.makePerson()):
+            self.assertFalse(check_permission('launchpad.View', build))
+        login(ANONYMOUS)
+        self.assertFalse(check_permission('launchpad.View', build))
+
+    def test_view_private_archive(self):
+        """branchbuilds with private branches are restricted."""
+        owner = self.factory.makePerson()
+        archive = self.factory.makeArchive(owner=owner, private=True)
+        build = self.factory.makeSourcePackageBranchBuild(archive=archive)
+        with person_logged_in(owner):
+            self.assertTrue(check_permission('launchpad.View', build))
+        with person_logged_in(self.factory.makePerson()):
+            self.assertFalse(check_permission('launchpad.View', build))
+        login(ANONYMOUS)
+        self.assertFalse(check_permission('launchpad.View', build))
+
+    def test_estimateDuration(self):
+        # The duration is currently hardcoded to 10 minutes.
+        spb = self.makeSourcePackageBranchBuild()
+        cur_date = self.factory.getUniqueDate()
+        self.assertEqual(timedelta(minutes=10), spb.estimateDuration())
+
+    def test_getFileByName(self):
+        """getFileByName returns the logs when requested by name."""
+        spb = self.factory.makeSourcePackageBranchBuild()
+        removeSecurityProxy(spb).log = (
+            self.factory.makeLibraryFileAlias(filename='buildlog.txt.gz'))
+        self.assertEqual(spb.log, spb.getFileByName('buildlog.txt.gz'))
+        self.assertRaises(NotFoundError, spb.getFileByName, 'foo')
+        removeSecurityProxy(spb).log = (
+            self.factory.makeLibraryFileAlias(filename='foo'))
+        self.assertEqual(spb.log, spb.getFileByName('foo'))
+        self.assertRaises(NotFoundError, spb.getFileByName, 'buildlog.txt.gz')
+        removeSecurityProxy(spb).upload_log = (
+            self.factory.makeLibraryFileAlias(filename='upload.txt.gz'))
+        self.assertEqual(spb.upload_log, spb.getFileByName('upload.txt.gz'))
+
+    def test_binary_builds(self):
+        """The binary_builds property should be populated automatically."""
+        spb = self.factory.makeSourcePackageBranchBuild()
+        multiverse = self.factory.makeComponent(name='multiverse')
+        spr = self.factory.makeSourcePackageRelease(
+            source_package_branch_build=spb, component=multiverse)
+        self.assertEqual([], list(spb.binary_builds))
+        binary = self.factory.makeBinaryPackageBuild(spr)
+        self.factory.makeBinaryPackageBuild()
+        Store.of(binary).flush()
+        self.assertEqual([binary], list(spb.binary_builds))
+
+    def test_requestBuild(self):
+        """Manifest should start empty, but accept SourcePackageBranchData."""
+        branch = self.factory.makeBranch()
+        archive = self.factory.makeArchive(owner=branch.owner)
+        distroseries = self.factory.makeUbuntuDistroSeries()
+        distroseries_i386 = distroseries.newArch(
+            'i386', ProcessorFamily.get(1), False, branch.owner,
+            supports_virtualized=True)
+        removeSecurityProxy(distroseries).nominatedarchindep = (
+            distroseries_i386)
+        build = branch.requestBuild(archive, branch.owner,
+            distroseries)
+        self.assertProvides(build, ISourcePackageBranchBuild)
+
+    def test_getRecentBuilds(self):
+        """Recent builds match the same person, series and receipe.
+
+        Builds do not match if they are older than 24 hours, or have a
+        different requester, series or branch.
+        """
+        requester = self.factory.makePerson()
+        branch = self.factory.makeBranch()
+        series = self.factory.makeDistroSeries()
+        now = self.factory.getUniqueDate()
+        build = self.factory.makeSourcePackageBranchBuild(branch=branch,
+            requester=requester)
+        self.factory.makeSourcePackageBranchBuild(
+            branch=branch, distroseries=series)
+        self.factory.makeSourcePackageBranchBuild(
+            requester=requester, distroseries=series)
+
+        def get_recent():
+            Store.of(build).flush()
+            return SourcePackageBranchBuild.getRecentBuilds(
+                requester, branch, series, _now=now)
+        self.assertContentEqual([], get_recent())
+        yesterday = now - timedelta(days=1)
+        recent_build = self.factory.makeSourcePackageBranchBuild(
+            branch=branch, distroseries=series, requester=requester,
+            date_created=yesterday)
+        self.assertContentEqual([], get_recent())
+        a_second = timedelta(seconds=1)
+        removeSecurityProxy(recent_build).date_created += a_second
+        self.assertContentEqual([recent_build], get_recent())
+
+    def test_destroySelf(self):
+        # ISourcePackageBranchBuild should make sure to remove jobs and build
+        # queue entries and then invalidate itself.
+        build = self.factory.makeSourcePackageBranchBuild()
+        build.destroySelf()
+
+    def test_destroySelf_clears_release(self):
+        # Destroying a sourcepackagebranchbuild removes references to it from
+        # its releases.
+        build = self.factory.makeSourcePackageBranchBuild()
+        release = self.factory.makeSourcePackageRelease(
+            source_package_branch_build=build)
+        self.assertEqual(build, release.source_package_branch_build)
+        build.destroySelf()
+        self.assertIs(None, release.source_package_branch_build)
+        transaction.commit()
+
+    def test_destroySelf_destroys_referenced(self):
+        # Destroying a sourcepackagebranchbuild also destroys the
+        # PackageBuild and BuildFarmJob it references.
+        build = self.factory.makeSourcePackageBranchBuild()
+        store = Store.of(build)
+        naked_build = removeSecurityProxy(build)
+        # Ensure database ids are set.
+        store.flush()
+        package_build_id = naked_build.package_build_id
+        build_farm_job_id = naked_build.package_build.build_farm_job_id
+        build.destroySelf()
+        result = store.find(PackageBuild, PackageBuild.id == package_build_id)
+        self.assertIs(None, result.one())
+        result = store.find(
+            BuildFarmJob, BuildFarmJob.id == build_farm_job_id)
+        self.assertIs(None, result.one())
+
+    def test_cancelBuild(self):
+        # ISourcePackageBranchBuild should make sure to remove jobs and build
+        # queue entries and then invalidate itself.
+        build = self.factory.makeSourcePackageBranchBuild()
+        build.cancelBuild()
+
+        self.assertEqual(
+            BuildStatus.SUPERSEDED,
+            build.status)
+
+    def test_getSpecificJob(self):
+        # getSpecificJob returns the SourcePackageBranchBuild
+        sprb = self.makeSourcePackageBranchBuild()
+        Store.of(sprb).flush()
+        job = sprb.build_farm_job.getSpecificJob()
+        self.assertEqual(sprb, job)
+
+    def test_getUploader(self):
+        # For ACL purposes the uploader is the build requester.
+        build = self.makeSourcePackageBranchBuild()
+        self.assertEquals(build.requester,
+            build.getUploader(None))
+
+
+class TestAsBuildmaster(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def test_notify(self):
+        """We do not send mail on completion of source package branch builds.
+
+        See bug 778437.
+        """
+        person = self.factory.makePerson(name='person')
+        cake = self.factory.makeBranch(
+            name=u'branch', owner=person)
+        pantry = self.factory.makeArchive(name='ppa')
+        secret = self.factory.makeDistroSeries(name=u'distroseries')
+        build = self.factory.makeSourcePackageBranchBuild(
+            branch=cake, distroseries=secret, archive=pantry)
+        removeSecurityProxy(build).status = BuildStatus.FULLYBUILT
+        IStore(build).flush()
+        build.notify()
+        self.assertEquals(0, len(pop_notifications()))
+
+    def assertBuildMessageValid(self, build, message):
+        # Not currently used; can be used if we do want to check about any
+        # notifications sent in other cases.
+        requester = build.requester
+        requester_address = format_address(
+            requester.displayname, requester.preferredemail.email)
+        mailer = SourcePackageBranchBuildMailer.forStatus(build)
+        expected = mailer.generateEmail(
+            requester.preferredemail.email, requester)
+        self.assertEqual(
+            requester_address, re.sub(r'\n\t+', ' ', message['To']))
+        self.assertEqual(expected.subject, message['Subject'].replace(
+            '\n\t', ' '))
+        self.assertEqual(
+            expected.body, message.get_payload(decode=True))
+
+    def test_notify_when_branch_deleted(self):
+        """Notify does nothing if branch has been deleted."""
+        person = self.factory.makePerson(name='person')
+        cake = self.factory.makeBranch(
+            name=u'branch', owner=person)
+        pantry = self.factory.makeArchive(name='ppa')
+        secret = self.factory.makeDistroSeries(name=u'distroseries')
+        build = self.factory.makeSourcePackageBranchBuild(
+            branch=cake, distroseries=secret, archive=pantry)
+        removeSecurityProxy(build).status = BuildStatus.FULLYBUILT
+        cake.destroySelf()
+        IStore(build).flush()
+        build.notify()
+        notifications = pop_notifications()
+        self.assertEquals(0, len(notifications))
+
+
+class TestBuildNotifications(TrialTestCase):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        super(TestBuildNotifications, self).setUp()
+        from lp.testing.factory import LaunchpadObjectFactory
+        self.factory = LaunchpadObjectFactory()
+
+    def prepare_build(self, fake_successful_upload=False):
+        queue_record = self.factory.makeSourcePackageBranchBuildJob()
+        build = queue_record.specific_job.build
+        naked_build = removeSecurityProxy(build)
+        naked_build.status = BuildStatus.FULLYBUILT
+        naked_build.date_started = self.factory.getUniqueDate()
+        if fake_successful_upload:
+            naked_build.verifySuccessfulUpload = FakeMethod(
+                result=True)
+        queue_record.builder = self.factory.makeBuilder()
+        slave = WaitingSlave('BuildStatus.OK')
+        queue_record.builder.setSlaveForTesting(slave)
+        return build
+
+    def assertDeferredNotifyCount(self, status, build, expected_count):
+        d = build.handleStatus(status, None, {'filemap': {}})
+        def cb(result):
+            self.assertEqual(expected_count, len(pop_notifications()))
+        d.addCallback(cb)
+        return d
+
+    def test_handleStatus_PACKAGEFAIL(self):
+        """Failing to build the package immediately sends a notification."""
+        return self.assertDeferredNotifyCount(
+            "PACKAGEFAIL", self.prepare_build(), 1)
+
+    def test_handleStatus_OK(self):
+        """Building the source package does _not_ immediately send mail.
+        
+        (The archive uploader mail send one later.
+        """
+        return self.assertDeferredNotifyCount(
+            "OK", self.prepare_build(), 0)
+
+#XXX 2011-05-20 gmb bug=785679
+#    This test has been disabled since it broke intermittently in
+#    buildbot (but does not fail in isolation locally).
+##    def test_handleStatus_OK_successful_upload(self):
+##        return self.assertDeferredNotifyCount(
+##            "OK", self.prepare_build(True), 0)
+
+
+class MakeSPBranchBuildMixin:
+    """Provide the common makeBuild method returning a queued build."""
+
+    def makeBuild(self):
+        person = self.factory.makePerson()
+        distroseries = self.factory.makeDistroSeries()
+        processor_fam = getUtility(IProcessorFamilySet).getByName('x86')
+        distroseries_i386 = distroseries.newArch(
+            'i386', processor_fam, False, person,
+            supports_virtualized=True)
+        distroseries.nominatedarchindep = distroseries_i386
+        build = self.factory.makeSourcePackageBranchBuild(
+            distroseries=distroseries,
+            status=BuildStatus.FULLYBUILT,
+            duration=timedelta(minutes=5))
+        build.queueBuild(build)
+        return build
+
+
+class TestGetUploadMethodsForSPBranchBuild(
+    MakeSPBranchBuildMixin, TestGetUploadMethodsMixin, TestCaseWithFactory):
+    """IPackageBuild.getUpload-related methods work with SPBranch builds."""
+
+
+class TestHandleStatusForSPRBuild(
+    MakeSPBranchBuildMixin, TestHandleStatusMixin, TrialTestCase):
+    """IPackageBuild.handleStatus works with SPBranch builds."""

=== added file 'lib/lp/code/templates/sourcepackagebranchbuild-index.pt'
--- lib/lp/code/templates/sourcepackagebranchbuild-index.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/sourcepackagebranchbuild-index.pt	2011-06-09 15:37:32 +0000
@@ -0,0 +1,199 @@
+<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>
+
+    <tal:registering metal:fill-slot="registering">
+        created
+        <span tal:content="context/date_created/fmt:displaydate"
+              tal:attributes="title context/date_created/fmt:datetime"
+          >on 2005-01-01</span>
+    </tal:registering>
+
+    <div metal:fill-slot="main">
+
+      <div class="yui-g">
+
+        <div id="status" class="yui-u first">
+          <div class="portlet">
+            <div metal:use-macro="template/macros/status" />
+          </div>
+        </div>
+
+        <div id="details" class="yui-u">
+          <div class="portlet">
+            <div metal:use-macro="template/macros/details" />
+          </div>
+        </div>
+
+      </div> <!-- yui-g  -->
+
+      <div id="buildlog" class="portlet"
+           tal:condition="context/status/enumvalue:BUILDING">
+        <div metal:use-macro="template/macros/buildlog" />
+      </div>
+
+   </div> <!-- main -->
+
+
+<metal:macros fill-slot="bogus">
+
+  <metal:macro define-macro="details">
+    <tal:comment replace="nothing">
+      Details section.
+    </tal:comment>
+    <h2>Build details</h2>
+    <div class="two-column-list">
+      <dl>
+        <dt>Branch:</dt>
+          <dd>
+            <tal:branch replace="structure context/branch/fmt:link" />
+          </dd>
+      </dl>
+      <dl>
+        <dt>Archive:</dt>
+          <dd>
+            <span tal:replace="structure context/archive/fmt:link"
+             >Celso PPA</span>
+          </dd>
+      </dl>
+      <dl>
+        <dt>Series:</dt>
+          <dd><a class="sprite distribution"
+                 tal:define="series context/distroseries"
+                 tal:attributes="href series/fmt:url"
+                 tal:content="series/displayname">Breezy Badger</a>
+          </dd>
+      </dl>
+      <dl>
+        <dt>Pocket:</dt>
+          <dd><span tal:replace="context/pocket/title">Release</span></dd>
+      </dl>
+      <dl>
+        <dt>Binary builds:</dt>
+        <dd tal:repeat="binary view/binary_builds"
+            tal:content="structure binary/fmt:link">
+        </dd>
+        <dd tal:condition="not: view/binary_builds">None</dd>
+      </dl>
+    </div>
+  </metal:macro>
+
+  <metal:macro define-macro="status">
+    <tal:comment replace="nothing">
+      Status section.
+    </tal:comment>
+    <h2>Build status</h2>
+    <p>
+      <span tal:replace="structure context/image:icon" />
+      <span tal:attributes="
+            class string:buildstatus${context/status/name};"
+            tal:content="context/status/title">Fully built</span>
+      <tal:building condition="context/status/enumvalue:BUILDING">
+        on <a tal:content="context/buildqueue_record/builder/title"
+              tal:attributes="href context/buildqueue_record/builder/fmt:url"/>
+      </tal:building>
+      <tal:built condition="context/builder">
+        on <a tal:content="context/builder/title"
+              tal:attributes="href context/builder/fmt:url"/>
+      </tal:built>
+    </p>
+
+    <ul>
+      <li tal:condition="context/dependencies">
+        Missing build dependencies: <em
+         tal:content="context/dependencies">x, y, z</em>
+     </li>
+      <tal:reallypending condition="context/buildqueue_record">
+      <tal:pending condition="context/buildqueue_record/job/status/enumvalue:WAITING">
+        <li tal:define="eta context/buildqueue_record/getEstimatedJobStartTime">
+          Start <tal:eta
+          replace="eta/fmt:approximatedate">in 3 hours</tal:eta>
+          (<span tal:replace="context/buildqueue_record/lastscore"/>)
+          <a href="https://help.launchpad.net/Packaging/BuildScores"
+             target="_blank">What's this?</a>
+        </li>
+      </tal:pending>
+      </tal:reallypending>
+      <tal:started condition="context/date_started">
+        <li tal:condition="context/date_started">
+          Started <span
+           tal:define="start context/date_started"
+           tal:attributes="title start/fmt:datetime"
+           tal:content="start/fmt:displaydate">2008-01-01</span>
+        </li>
+      </tal:started>
+      <tal:finish condition="not: context/date_finished">
+        <li tal:define="eta view/eta" tal:condition="view/eta">
+          Estimated finish <tal:eta
+            replace="eta/fmt:approximatedate">in 3 hours</tal:eta>
+        </li>
+      </tal:finish>
+
+      <li tal:condition="context/date_finished">
+        Finished <span
+          tal:attributes="title context/date_finished/fmt:datetime"
+          tal:content="context/date_finished/fmt:displaydate">2008-01-01</span>
+        <tal:duration condition="context/duration">
+          (took <span tal:replace="context/duration/fmt:exactduration"/>)
+        </tal:duration>
+      </li>
+      <li tal:define="file context/log"
+          tal:condition="file">
+        <a class="sprite download"
+           tal:attributes="href context/log_url">buildlog</a>
+        (<span tal:replace="file/content/filesize/fmt:bytes" />)
+      </li>
+      <li tal:define="file context/upload_log"
+          tal:condition="file">
+        <a class="sprite download"
+           tal:attributes="href context/upload_log_url">uploadlog</a>
+        (<span tal:replace="file/content/filesize/fmt:bytes" />)
+      </li>
+    </ul>
+
+    <div
+      style="margin-top: 1.5em"
+      tal:define="context_menu view/context/menu:context;
+                  link context_menu/cancel"
+      tal:condition="link/enabled"
+      >
+      <a tal:replace="structure link/fmt:link" />
+    </div>
+    <div
+      style="margin-top: 1.5em"
+      tal:define="context_menu view/context/menu:context;
+                  link context_menu/rescore"
+      tal:condition="link/enabled"
+      >
+      <a tal:replace="structure link/fmt:link" />
+    </div>
+
+
+  </metal:macro>
+
+  <metal:macro define-macro="buildlog">
+    <tal:comment replace="nothing">
+      Buildlog section.
+    </tal:comment>
+    <h2>Buildlog</h2>
+    <div id="buildlog-tail" class="logtail"
+         tal:define="logtail context/buildqueue_record/logtail"
+         tal:content="structure logtail/fmt:text-to-html">
+      <p>Things are crashing and burning all over the place.</p>
+    </div>
+    <p class="discreet" tal:condition="view/user">
+      Updated on <span tal:replace="structure view/user/fmt:local-time"/>
+    </p>
+  </metal:macro>
+
+</metal:macros>
+
+  </body>
+</html>

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2011-06-08 11:06:04 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2011-06-09 15:37:32 +0000
@@ -648,8 +648,8 @@
         dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
         dsc_binaries, archive, copyright, build_conflicts,
         build_conflicts_indep, dateuploaded=None,
-        source_package_recipe_build=None, user_defined_fields=None,
-        homepage=None):
+        source_package_recipe_build=None, source_package_branch_build=None,
+        user_defined_fields=None, homepage=None):
         """Create an uploads `SourcePackageRelease`.
 
         Set this distroseries set to be the uploadeddistroseries.
@@ -685,6 +685,7 @@
          :param archive: IArchive to where the upload was targeted
          :param dateuploaded: optional datetime, if omitted assumed nowUTC
          :param source_package_recipe_build: optional SourcePackageRecipeBuild
+         :param source_package_branch_build: optional SourcePackageBranchBuild
          :param user_defined_fields: optional sequence of key-value pairs with
                                      user defined fields.
          :param homepage: optional string with (unchecked) upstream homepage

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2011-06-08 15:27:40 +0000
+++ lib/lp/registry/model/distroseries.py	2011-06-09 15:37:32 +0000
@@ -1324,7 +1324,8 @@
         dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
         dsc_binaries, archive, copyright, build_conflicts,
         build_conflicts_indep, dateuploaded=DEFAULT,
-        source_package_recipe_build=None, user_defined_fields=None,
+        source_package_recipe_build=None,
+        source_package_branch_build=None, user_defined_fields=None,
         homepage=None):
         """See `IDistroSeries`."""
         return SourcePackageRelease(
@@ -1342,6 +1343,7 @@
             build_conflicts=build_conflicts,
             build_conflicts_indep=build_conflicts_indep,
             source_package_recipe_build=source_package_recipe_build,
+            source_package_branch_build=source_package_branch_build,
             user_defined_fields=user_defined_fields, homepage=homepage)
 
     def getComponentByName(self, name):

=== modified file 'lib/lp/soyuz/interfaces/sourcepackagerelease.py'
--- lib/lp/soyuz/interfaces/sourcepackagerelease.py	2011-03-06 06:26:38 +0000
+++ lib/lp/soyuz/interfaces/sourcepackagerelease.py	2011-06-09 15:37:32 +0000
@@ -163,10 +163,19 @@
         schema=Interface,
         description=_("The `SourcePackageRecipeBuild` which produced this "
             "source package release, or None if it was created from a "
-            "traditional upload."),
+            "traditional upload or a direct branch build."),
         title=_("Source package recipe build"),
         required=False, readonly=True)
 
+    # Really ISourcePackageBranchBuild -- see _schema_circular_imports.
+    source_package_branch_build = Reference(
+        schema=Interface,
+        description=_("The `SourcePackageBranchBuild` which produced this "
+            "source package release, or None if it was created from a "
+            "traditional upload or a recipe build."),
+        title=_("Source package branch build"),
+        required=False, readonly=True)
+
     def addFile(file):
         """Add the provided library file alias (file) to the list of files
         in this package.

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2011-05-27 21:12:25 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2011-06-09 15:37:32 +0000
@@ -154,6 +154,10 @@
     source_package_recipe_build = Reference(
         source_package_recipe_build_id, 'SourcePackageRecipeBuild.id')
 
+    source_package_branch_build_id = Int(name='sourcepackage_branch_build')
+    source_package_branch_build = Reference(
+        source_package_branch_build_id, 'SourcePackageBranchBuild.id')
+
     # XXX cprov 2006-09-26: Those fields are set as notNull and required in
     # ISourcePackageRelease, however they can't be not NULL in DB since old
     # records doesn't satisfy this condition. We will sort it before using

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2011-06-09 08:07:52 +0000
+++ lib/lp/testing/factory.py	2011-06-09 15:37:32 +0000
@@ -148,6 +148,9 @@
 from lp.code.interfaces.codeimportresult import ICodeImportResultSet
 from lp.code.interfaces.linkedbranch import ICanHasLinkedBranch
 from lp.code.interfaces.revision import IRevisionSet
+from lp.code.interfaces.sourcepackagebranchbuild import (
+    ISourcePackageBranchBuildSource
+    )
 from lp.code.interfaces.sourcepackagerecipe import (
     ISourcePackageRecipeSource,
     MINIMAL_RECIPE_TEXT,
@@ -2684,6 +2687,59 @@
         IStore(source_package_recipe).flush()
         return source_package_recipe
 
+    def makeSourcePackageBranchBuild(self, sourcepackage=None, branch=None,
+                                     requester=None, archive=None,
+                                     sourcename=None, distroseries=None,
+                                     pocket=None, date_created=None,
+                                     status=BuildStatus.NEEDSBUILD,
+                                     duration=None):
+        """Make a new SourcePackageBranchBuild."""
+        if branch is None:
+            branch = self.makeBranch(name=sourcename)
+        if archive is None:
+            archive = self.makeArchive()
+        if distroseries is None:
+            distroseries = self.makeDistroSeries(
+                distribution=archive.distribution)
+            arch = self.makeDistroArchSeries(distroseries=distroseries)
+            removeSecurityProxy(distroseries).nominatedarchindep = arch
+        if requester is None:
+            requester = self.makePerson()
+        spb_build = getUtility(ISourcePackageBranchBuildSource).new(
+            distroseries=distroseries,
+            branch=branch,
+            archive=archive,
+            requester=requester,
+            pocket=pocket,
+            date_created=date_created)
+        removeSecurityProxy(spb_build).status = status
+        if duration is not None:
+            naked_spbb = removeSecurityProxy(spb_build)
+            if naked_spbb.date_started is None:
+                naked_spbb.date_started = spb_build.date_created
+            naked_spbb.date_finished = naked_spbb.date_started + duration
+        IStore(spb_build).flush()
+        return spb_build
+
+    def makeSourcePackageBranchBuildJob(
+        self, score=9876, virtualized=True, estimated_duration=64,
+        sourcename=None, branch_build=None):
+        """Create a `SourcePackageBranchBuildJob` and a `BuildQueue` for
+        testing."""
+        if branch_build is None:
+            branch_build = self.makeSourcePackageBranchBuild(
+                sourcename=sourcename)
+        branch_build_job = branch_build.makeJob()
+
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        bq = BuildQueue(
+            job=branch_build_job.job, lastscore=score,
+            job_type=BuildFarmJobType.BRANCHBUILD,
+            estimated_duration=timedelta(seconds=estimated_duration),
+            virtualized=virtualized)
+        store.add(bq)
+        return bq
+
     def makeSourcePackageRecipeBuild(self, sourcepackage=None, recipe=None,
                                      requester=None, archive=None,
                                      sourcename=None, distroseries=None,
@@ -3398,6 +3454,7 @@
                                  dsc_format='1.0', dsc_binaries='foo-bin',
                                  date_uploaded=UTC_NOW,
                                  source_package_recipe_build=None,
+                                 source_package_branch_build=None,
                                  dscsigningkey=None,
                                  user_defined_fields=None,
                                  changelog_entry=None,
@@ -3407,6 +3464,8 @@
         if distroseries is None:
             if source_package_recipe_build is not None:
                 distroseries = source_package_recipe_build.distroseries
+            elif source_package_branch_build is not None:
+                distroseries = source_package_branch_build.distroseries
             else:
                 if archive is None:
                     distribution = None
@@ -3470,6 +3529,7 @@
             archive=archive,
             dateuploaded=date_uploaded,
             source_package_recipe_build=source_package_recipe_build,
+            source_package_branch_build=source_package_branch_build,
             user_defined_fields=user_defined_fields,
             homepage=homepage)