Merge lp:~cjwatson/launchpad/git-recipe-browser-create into lp:launchpad

[Colin Watson]

Add views to create new Git recipes.

Add views to create new Git recipes.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2016-01-12 15:10:57 +0000
+++ lib/lp/code/browser/configure.zcml	2016-01-20 12:22:22 +0000
@@ -1219,6 +1219,18 @@
             name="+new-recipe"
             template="../templates/sourcepackagerecipe-new.pt"/>
         <browser:page
+            for="lp.code.interfaces.gitrepository.IGitRepository"
+            class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
+            permission="launchpad.AnyPerson"
+            name="+new-recipe"
+            template="../templates/sourcepackagerecipe-new.pt"/>
+        <browser:page
+            for="lp.code.interfaces.gitref.IGitRef"
+            class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeAddView"
+            permission="launchpad.AnyPerson"
+            name="+new-recipe"
+            template="../templates/sourcepackagerecipe-new.pt"/>
+        <browser:page
             for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
             class="lp.code.browser.sourcepackagerecipe.SourcePackageRecipeEditView"
             permission="launchpad.Edit"

=== modified file 'lib/lp/code/browser/gitref.py'
--- lib/lp/code/browser/gitref.py	2016-01-12 15:10:57 +0000
+++ lib/lp/code/browser/gitref.py	2016-01-20 12:22:22 +0000
@@ -41,6 +41,8 @@
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
 from lp.code.interfaces.gitref import IGitRef
 from lp.code.interfaces.gitrepository import IGitRepositorySet
+from lp.code.interfaces.sourcepackagerecipe import GIT_RECIPES_FEATURE_FLAG
+from lp.services.features import getFeatureFlag
 from lp.services.helpers import english_list
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp import (
@@ -62,7 +64,9 @@
 
     usedfor = IGitRef
     facet = 'branches'
-    links = ['create_snap', 'register_merge', 'source', 'view_recipes']
+    links = [
+        'create_recipe', 'create_snap', 'register_merge', 'source',
+        'view_recipes']
 
     def source(self):
         """Return a link to the branch's browsing interface."""
@@ -75,6 +79,14 @@
         enabled = self.context.namespace.supports_merge_proposals
         return Link('+register-merge', text, icon='add', enabled=enabled)
 
+    def create_recipe(self):
+        # You can't create a recipe for a reference in a private repository.
+        enabled = (
+            not self.context.private and
+            bool(getFeatureFlag(GIT_RECIPES_FEATURE_FLAG)))
+        text = "Create packaging recipe"
+        return Link("+new-recipe", text, enabled=enabled, icon="add")
+
 
 class GitRefView(LaunchpadView, HasSnapsViewMixin):
 

=== modified file 'lib/lp/code/browser/gitrepository.py'
--- lib/lp/code/browser/gitrepository.py	2016-01-12 15:10:57 +0000
+++ lib/lp/code/browser/gitrepository.py	2016-01-20 12:22:22 +0000
@@ -70,6 +70,7 @@
     IPerson,
     IPersonSet,
     )
+from lp.code.interfaces.sourcepackagerecipe import GIT_RECIPES_FEATURE_FLAG
 from lp.registry.vocabularies import UserTeamsParticipationPlusSelfVocabulary
 from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
@@ -210,7 +211,7 @@
     usedfor = IGitRepository
     facet = "branches"
     links = [
-        "add_subscriber", "source", "subscription",
+        "add_subscriber", "create_recipe", "source", "subscription",
         "view_recipes", "visibility"]
 
     @enabled_with_permission("launchpad.AnyPerson")
@@ -242,6 +243,14 @@
         text = "Change information type"
         return Link("+edit-information-type", text)
 
+    def create_recipe(self):
+        # You can't create a recipe for a private repository.
+        enabled = (
+            not self.context.private and
+            bool(getFeatureFlag(GIT_RECIPES_FEATURE_FLAG)))
+        text = "Create packaging recipe"
+        return Link("+new-recipe", text, enabled=enabled, icon="add")
+
 
 @implementer(IGitRefBatchNavigator)
 class GitRefBatchNavigator(TableBatchNavigator):

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2016-01-15 12:42:28 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2016-01-20 12:22:22 +0000
@@ -92,11 +92,14 @@
     )
 from lp.code.interfaces.branch import IBranch
 from lp.code.interfaces.branchtarget import IBranchTarget
+from lp.code.interfaces.gitref import IGitRef
+from lp.code.interfaces.gitrepository import IGitRepository
 from lp.code.interfaces.sourcepackagerecipe import (
     IRecipeBranchSource,
     ISourcePackageRecipe,
     ISourcePackageRecipeSource,
     MINIMAL_RECIPE_TEXT_BZR,
+    MINIMAL_RECIPE_TEXT_GIT,
     )
 from lp.code.vocabularies.sourcepackagerecipe import BuildableDistroSeries
 from lp.registry.interfaces.series import SeriesStatus
@@ -737,14 +740,18 @@
         self.form_fields['distroseries'].for_input = True
 
     def getBranch(self):
-        """The branch on which the recipe is built."""
+        """The branch or repository on which the recipe is built."""
         return self.context
 
     def _recipe_names(self):
         """A generator of recipe names."""
         # +junk-daily doesn't make a very good recipe name, so use the
-        # branch name in that case.
-        if self.context.target.allow_recipe_name_from_target:
+        # branch name in that case; similarly for personal Git repositories.
+        if ((IBranch.providedBy(self.context) and
+                self.context.target.allow_recipe_name_from_target) or
+            ((IGitRepository.providedBy(self.context) or
+              IGitRef.providedBy(self.context)) and
+                self.context.namespace.allow_recipe_name_from_target)):
             branch_target_name = self.context.target.name.split('/')[-1]
         else:
             branch_target_name = self.context.name
@@ -765,9 +772,27 @@
         distroseries = BuildableDistroSeries.findSeries(self.user)
         series = [series for series in distroseries if series.status in (
                 SeriesStatus.CURRENT, SeriesStatus.DEVELOPMENT)]
+        if IBranch.providedBy(self.context):
+            recipe_text = MINIMAL_RECIPE_TEXT_BZR % self.context.identity
+        elif IGitRepository.providedBy(self.context):
+            default_ref = None
+            if self.context.default_branch is not None:
+                default_ref = self.context.getRefByPath(
+                    self.context.default_branch)
+            if default_ref is not None:
+                branch_name = default_ref.name
+            else:
+                branch_name = "ENTER-BRANCH-NAME"
+            recipe_text = MINIMAL_RECIPE_TEXT_GIT % (
+                self.context.identity, branch_name)
+        elif IGitRef.providedBy(self.context):
+            recipe_text = MINIMAL_RECIPE_TEXT_GIT % (
+                self.context.repository.identity, self.context.name)
+        else:
+            raise AssertionError("Unsupported context: %r" % (self.context,))
         return {
             'name': self._find_unused_name(self.user),
-            'recipe_text': MINIMAL_RECIPE_TEXT_BZR % self.context.bzr_identity,
+            'recipe_text': recipe_text,
             'owner': self.user,
             'distroseries': series,
             'build_daily': True,

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2016-01-12 12:28:09 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2016-01-20 12:22:22 +0000
@@ -36,6 +36,7 @@
     SourcePackageRecipeBuildView,
     )
 from lp.code.interfaces.sourcepackagerecipe import (
+    GIT_RECIPES_FEATURE_FLAG,
     MINIMAL_RECIPE_TEXT_BZR,
     MINIMAL_RECIPE_TEXT_GIT,
     )
@@ -45,6 +46,7 @@
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.teammembership import TeamMembershipStatus
 from lp.services.database.constants import UTC_NOW
+from lp.services.features.testing import FeatureFixture
 from lp.services.propertycache import clear_property_cache
 from lp.services.webapp import canonical_url
 from lp.services.webapp.escaping import html_escape
@@ -204,6 +206,10 @@
     branch_type = "repository"
     no_such_object_message = "is not a Git repository on Launchpad."
 
+    def setUp(self):
+        super(GitMixin, self).setUp()
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
+
     def makeBranch(self, **kwargs):
         return self.factory.makeGitRefs(**kwargs)[0]
 
@@ -265,36 +271,10 @@
             daily_build_archive=self.ppa, **kwargs)
 
 
-class TestSourcePackageRecipeAddViewInitalValues(TestCaseWithFactory):
+class TestSourcePackageRecipeAddViewInitialValuesMixin:
 
     layer = DatabaseFunctionalLayer
 
-    def test_project_branch_initial_name(self):
-        # When a project branch is used, the initial name is the name of the
-        # project followed by "-daily"
-        widget = self.factory.makeProduct(name='widget')
-        branch = self.factory.makeProductBranch(widget)
-        with person_logged_in(branch.owner):
-            view = create_initialized_view(branch, '+new-recipe')
-        self.assertThat('widget-daily', Equals(view.initial_values['name']))
-
-    def test_package_branch_initial_name(self):
-        # When a package branch is used, the initial name is the name of the
-        # source package followed by "-daily"
-        branch = self.factory.makePackageBranch(sourcepackagename='widget')
-        with person_logged_in(branch.owner):
-            view = create_initialized_view(branch, '+new-recipe')
-        self.assertThat('widget-daily', Equals(view.initial_values['name']))
-
-    def test_personal_branch_initial_name(self):
-        # When a personal branch is used, the initial name is the name of the
-        # branch followed by "-daily". +junk-daily is not valid nor
-        # helpful.
-        branch = self.factory.makePersonalBranch(name='widget')
-        with person_logged_in(branch.owner):
-            view = create_initialized_view(branch, '+new-recipe')
-        self.assertThat('widget-daily', Equals(view.initial_values['name']))
-
     def test_initial_name_exists(self):
         # If the initial name exists, a generator is used to find an unused
         # name by appending a numbered suffix on the end.
@@ -302,7 +282,7 @@
         self.factory.makeSourcePackageRecipe(
             owner=owner, name=u'widget-daily')
         widget = self.factory.makeProduct(name='widget')
-        branch = self.factory.makeProductBranch(widget)
+        branch = self.makeBranch(target=widget)
         with person_logged_in(owner):
             view = create_initialized_view(branch, '+new-recipe')
         self.assertThat('widget-daily-1', Equals(view.initial_values['name']))
@@ -331,7 +311,7 @@
         future = self.factory.makeDistroSeries(
             distribution=archive.distribution,
             status=SeriesStatus.FUTURE)
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
         with person_logged_in(archive.owner):
             view = create_initialized_view(branch, '+new-recipe')
         series = set(view.initial_values['distroseries'])
@@ -342,30 +322,88 @@
         self.assertEqual(set(), series.intersection(other_series))
 
 
-class TestSourcePackageRecipeAddView(BzrMixin, TestCaseForRecipe):
+class TestSourcePackageRecipeAddViewInitialValuesBzr(
+    TestSourcePackageRecipeAddViewInitialValuesMixin, BzrMixin,
+    TestCaseWithFactory):
+
+    def test_project_branch_initial_name(self):
+        # When a project branch is used, the initial name is the name of the
+        # project followed by "-daily".
+        widget = self.factory.makeProduct(name='widget')
+        branch = self.factory.makeProductBranch(widget)
+        with person_logged_in(branch.owner):
+            view = create_initialized_view(branch, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+    def test_package_branch_initial_name(self):
+        # When a package branch is used, the initial name is the name of the
+        # source package followed by "-daily".
+        branch = self.factory.makePackageBranch(sourcepackagename='widget')
+        with person_logged_in(branch.owner):
+            view = create_initialized_view(branch, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+    def test_personal_branch_initial_name(self):
+        # When a personal branch is used, the initial name is the name of
+        # the branch followed by "-daily".  +junk-daily is neither valid nor
+        # helpful.
+        branch = self.factory.makePersonalBranch(name='widget')
+        with person_logged_in(branch.owner):
+            view = create_initialized_view(branch, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+
+class TestSourcePackageRecipeAddViewInitialValuesGit(
+    TestSourcePackageRecipeAddViewInitialValuesMixin, GitMixin,
+    TestCaseWithFactory):
+
+    def test_project_repository_initial_name(self):
+        # When a project repository is used, the initial name is the name of
+        # the project followed by "-daily".
+        widget = self.factory.makeProduct(name='widget')
+        repository = self.factory.makeGitRepository(target=widget)
+        with person_logged_in(repository.owner):
+            view = create_initialized_view(repository, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+    def test_package_repository_initial_name(self):
+        # When a package repository is used, the initial name is the name of
+        # the source package followed by "-daily".
+        dsp = self.factory.makeDistributionSourcePackage(
+            sourcepackagename='widget')
+        repository = self.factory.makeGitRepository(target=dsp)
+        with person_logged_in(repository.owner):
+            view = create_initialized_view(repository, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+    def test_personal_repository_initial_name(self):
+        # When a personal repository is used, the initial name is the name
+        # of the repository followed by "-daily".  <person-name>-daily is
+        # not helpful.
+        owner = self.factory.makePerson()
+        repository = self.factory.makeGitRepository(
+            owner=owner, target=owner, name=u'widget')
+        with person_logged_in(repository.owner):
+            view = create_initialized_view(repository, '+new-recipe')
+        self.assertThat('widget-daily', Equals(view.initial_values['name']))
+
+
+class TestSourcePackageRecipeAddViewMixin:
 
     layer = DatabaseFunctionalLayer
 
-    def makeBranch(self):
-        product = self.factory.makeProduct(
-            name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
-        self.factory.makeSourcePackage(sourcepackagename='ratatouille')
-        return branch
-
     def test_create_new_recipe_not_logged_in(self):
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
+        branch = self.makeBranch(
+            owner=self.chef, target=product, name=u'veggies')
 
         browser = self.getViewBrowser(branch, no_login=True)
         self.assertRaises(
             Unauthorized, browser.getLink('Create packaging recipe').click)
 
     def test_create_new_recipe(self):
-        branch = self.makeBranch()
+        branch = self.makeBranchAndPackage()
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
         browser.getLink('Create packaging recipe').click()
@@ -388,7 +426,7 @@
     def test_create_new_recipe_private_branch(self):
         # Recipes can't be created on private branches.
         with person_logged_in(self.chef):
-            branch = self.factory.makeBranch(
+            branch = self.makeBranch(
                 owner=self.chef, information_type=InformationType.USERDATA)
             branch_url = canonical_url(branch)
 
@@ -403,7 +441,7 @@
         self.factory.makeTeam(
             name='good-chefs', displayname='Good Chefs', members=[self.chef])
         browser = self.getViewBrowser(
-            self.makeBranch(), '+new-recipe', user=self.chef)
+            self.makeBranchAndPackage(), '+new-recipe', user=self.chef)
         # The options for the owner include the Good Chefs team.
         options = browser.getControl(name='field.owner.owner').displayOptions
         self.assertEquals(
@@ -415,7 +453,7 @@
         team = self.factory.makeTeam(
             name='good-chefs', displayname='Good Chefs', members=[self.chef])
         browser = self.getViewBrowser(
-            self.makeBranch(), '+new-recipe', user=self.chef)
+            self.makeBranchAndPackage(), '+new-recipe', user=self.chef)
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'
         browser.getControl('Other').click()
@@ -430,7 +468,7 @@
 
     def test_create_new_recipe_suggests_user(self):
         """The current user is suggested as a recipe owner, once."""
-        branch = self.factory.makeBranch(owner=self.chef)
+        branch = self.makeBranch(owner=self.chef)
         text = self.getMainText(branch, '+new-recipe')
         self.assertTextMatchesExpressionIgnoreWhitespace(
             r'Owner: Master Chef \(chef\) Other:', text)
@@ -440,7 +478,7 @@
         team = self.factory.makeTeam(
             name='branch-team', displayname='Branch Team',
             members=[self.chef])
-        branch = self.factory.makeBranch(owner=team)
+        branch = self.makeBranch(owner=team)
         text = self.getMainText(branch, '+new-recipe')
         self.assertTextMatchesExpressionIgnoreWhitespace(
             r'Owner: Master Chef \(chef\)'
@@ -450,7 +488,7 @@
         """If current user isn't a member of branch owner, it is ignored."""
         team = self.factory.makeTeam(
             name='branch-team', displayname='Branch Team')
-        branch = self.factory.makeBranch(owner=team)
+        branch = self.makeBranch(owner=team)
         text = self.getMainText(branch, '+new-recipe')
         self.assertTextMatchesExpressionIgnoreWhitespace(
             r'Owner: Master Chef \(chef\) Other:', text)
@@ -460,8 +498,8 @@
         # is communicated to the user properly.
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
+        branch = self.makeBranch(
+            owner=self.chef, target=product, name=u'veggies')
         browser = self.getViewBrowser(branch, '+new-recipe', user=self.chef)
         browser.getControl('Description').value = 'Make some food!'
         browser.getControl('Recipe text').value = (
@@ -475,8 +513,8 @@
         if branch is None:
             product = self.factory.makeProduct(
                 name='ratatouille', displayname='Ratatouille')
-            branch = self.factory.makeBranch(
-                owner=self.chef, product=product, name='veggies')
+            branch = self.makeBranch(
+                owner=self.chef, target=product, name=u'veggies')
         browser = self.getViewBrowser(branch, '+new-recipe', user=self.chef)
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'
@@ -487,18 +525,11 @@
     def test_create_recipe_usage(self):
         # The error for a recipe with invalid instruction parameters should
         # include instruction usage.
-        branch = self.factory.makeBranch(name='veggies')
-        self.factory.makeBranch(name='packaging')
+        branch = self.makeBranch(name=u'veggies')
+        self.makeBranch(name=u'packaging')
 
         browser = self.createRecipe(
-            dedent('''\
-                # bzr-builder format 0.2 deb-version 0+{revno}
-                %(branch)s
-                merge
-                ''' % {
-                    'branch': branch.bzr_identity,
-                }),
-            branch=branch)
+            self.getMinimalRecipeText(branch) + "merge\n", branch=branch)
         self.assertEqual(
             'Error parsing recipe:3:6: '
             'End of line while looking for the branch id.\n'
@@ -506,7 +537,8 @@
             get_feedback_messages(browser.contents)[1])
 
     def test_create_recipe_no_distroseries(self):
-        browser = self.getViewBrowser(self.makeBranch(), '+new-recipe')
+        browser = self.getViewBrowser(
+            self.makeBranchAndPackage(), '+new-recipe')
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'
         browser.getControl(name='field.distroseries').value = []
@@ -518,7 +550,11 @@
     def test_create_recipe_bad_base_branch(self):
         # If a user tries to create source package recipe with a bad base
         # branch location, they should get an error.
-        browser = self.createRecipe(MINIMAL_RECIPE_TEXT_BZR % 'foo')
+        browser = self.createRecipe(
+            self.minimal_recipe_text.splitlines()[0] + '\nfoo\n')
+        # This page doesn't know whether the user was aiming for a Bazaar
+        # branch or a Git repository; the error message always says
+        # "branch".
         self.assertEqual(
             get_feedback_messages(browser.contents)[1],
             'foo is not a branch on Launchpad.')
@@ -528,28 +564,27 @@
         # instruction branch location, they should get an error.
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
-        recipe = MINIMAL_RECIPE_TEXT_BZR % branch.bzr_identity
+        branch = self.makeBranch(
+            owner=self.chef, target=product, name=u'veggies')
+        recipe = self.getMinimalRecipeText(branch)
         recipe += 'nest packaging foo debian'
         browser = self.createRecipe(recipe, branch)
         self.assertEqual(
             get_feedback_messages(browser.contents)[1],
-            'foo is not a branch on Launchpad.')
+            'foo %s' % self.no_such_object_message)
 
     def test_create_recipe_format_too_new(self):
         # If the recipe's format version is too new, we should notify the
         # user.
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
+        branch = self.makeBranch(
+            owner=self.chef, target=product, name=u'veggies')
 
         with recipe_parser_newest_version(145.115):
-            recipe = dedent(u'''\
-              # bzr-builder format 145.115 deb-version {debupstream}-0~{revno}
-              %s
-              ''') % branch.bzr_identity
+            recipe = re.sub(
+                'format [^ ]*', 'format 145.115',
+                self.getMinimalRecipeText(branch))
             browser = self.createRecipe(recipe, branch)
             self.assertEqual(
                 get_feedback_messages(browser.contents)[1],
@@ -564,8 +599,8 @@
 
         product = self.factory.makeProduct(
             name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
+        branch = self.makeBranch(
+            owner=self.chef, target=product, name=u'veggies')
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
@@ -583,15 +618,16 @@
     def test_create_recipe_private_branch(self):
         # If a user tries to create source package recipe with a private
         # base branch, they should get an error.
-        branch = self.factory.makeAnyBranch(
+        branch = self.makeBranch(
             owner=self.user, information_type=InformationType.USERDATA)
         with person_logged_in(self.user):
-            bzr_identity = branch.bzr_identity
-        recipe_text = MINIMAL_RECIPE_TEXT_BZR % bzr_identity
+            identity = self.getRepository(branch).identity
+            recipe_text = self.getMinimalRecipeText(branch)
         browser = self.createRecipe(recipe_text)
         self.assertEqual(
             get_feedback_messages(browser.contents)[1],
-            'Recipe may not refer to private branch: %s' % bzr_identity)
+            'Recipe may not refer to private %s: %s' % (
+                self.branch_type, identity))
 
     def _test_new_recipe_with_no_related_branches(self, branch):
         # The Related Branches section should not appear if there are no
@@ -607,72 +643,20 @@
 
     def test_new_product_branch_with_no_related_branches_recipe(self):
         # We can create a new recipe off a product branch.
-        branch = self.factory.makeBranch()
+        branch = self.makeBranch()
         self._test_new_recipe_with_no_related_branches(branch)
 
     def test_new_package_branch_with_no_linked_branches_recipe(self):
         # We can create a new recipe off a sourcepackage branch where the
         # sourcepackage has no linked branches.
-        branch = self.factory.makePackageBranch()
+        branch = self.makePackageBranch()
         self._test_new_recipe_with_no_related_branches(branch)
 
-    def test_new_recipe_with_package_branches(self):
-        # The series branches table should not appear if there are none.
-        (branch, related_series_branch_info, related_package_branches) = (
-            self.factory.makeRelatedBranches(with_series_branches=False))
-        browser = self.getUserBrowser(
-            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
-        soup = BeautifulSoup(browser.contents)
-        related_branches = soup.find('fieldset', {'id': 'related-branches'})
-        self.assertIsNot(related_branches, None)
-        related_branches = soup.find(
-            'div', {'id': 'related-package-branches'})
-        self.assertIsNot(related_branches, None)
-        related_branches = soup.find(
-            'div', {'id': 'related-series-branches'})
-        self.assertIs(related_branches, None)
-
-    def test_new_recipe_with_series_branches(self):
-        # The package branches table should not appear if there are none.
-        (branch, related_series_branch_info, related_package_branches) = (
-            self.factory.makeRelatedBranches(with_package_branches=False))
-        browser = self.getUserBrowser(
-            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
-        soup = BeautifulSoup(browser.contents)
-        related_branches = soup.find('fieldset', {'id': 'related-branches'})
-        self.assertIsNot(related_branches, None)
-        related_branches = soup.find(
-            'div', {'id': 'related-series-branches'})
-        self.assertIsNot(related_branches, None)
-        related_branches = soup.find(
-            'div', {'id': 'related-package-branches'})
-        self.assertIs(related_branches, None)
-
-    def test_new_product_branch_recipe_with_related_branches(self):
-        # The related branches should be rendered correctly on the page.
-        (branch, related_series_branch_info,
-            related_package_branch_info) = self.factory.makeRelatedBranches()
-        browser = self.getUserBrowser(
-            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
-        self.checkRelatedBranches(
-            related_series_branch_info, related_package_branch_info,
-            browser.contents)
-
-    def test_new_sourcepackage_branch_recipe_with_related_branches(self):
-        # The related branches should be rendered correctly on the page.
-        reference_branch = self.factory.makePackageBranch()
-        (branch, ignore, related_package_branch_info) = (
-                self.factory.makeRelatedBranches(reference_branch))
-        browser = self.getUserBrowser(
-            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
-        self.checkRelatedBranches(
-                set(), related_package_branch_info, browser.contents)
-
     def test_ppa_selector_not_shown_if_user_has_no_ppas(self):
         # If the user creating a recipe has no existing PPAs, the selector
         # isn't shown, but the field to enter a new PPA name is.
         self.user = self.factory.makePerson()
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
         with person_logged_in(self.user):
             content = self.getMainContent(branch, '+new-recipe')
         ppa_name = content.find(attrs={'id': 'field.ppa_name'})
@@ -692,7 +676,7 @@
         # If the user creating a recipe has existing PPAs, the selector is
         # shown, along with radio buttons to decide whether to use an existing
         # ppa or to create a new one.
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
         with person_logged_in(self.user):
             content = self.getMainContent(branch, '+new-recipe')
         ppa_name = content.find(attrs={'id': 'field.ppa_name'})
@@ -712,7 +696,7 @@
     def test_create_new_ppa(self):
         # If the user doesn't have any PPAs, a new once can be created.
         self.user = self.factory.makePerson(name='eric')
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.user)
@@ -737,7 +721,7 @@
         # Make a PPA called 'ppa' using the default.
         with person_logged_in(self.user):
             self.user.createPPA(name='foo')
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.user)
@@ -756,7 +740,7 @@
         # If a new PPA is being created, and the user has not specified a
         # name, an error is shown.
         self.user = self.factory.makePerson(name='eric')
-        branch = self.factory.makeAnyBranch()
+        branch = self.makeBranch()
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.user)
@@ -779,7 +763,7 @@
         with person_logged_in(team.teamowner):
             team.setMembershipData(
                 self.user, TeamMembershipStatus.ADMIN, team.teamowner)
-        branch = self.factory.makeAnyBranch(owner=team)
+        branch = self.makeBranch(owner=team)
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.user)
@@ -799,6 +783,83 @@
         self.assertIsNot(None, new_ppa)
 
 
+class TestSourcePackageRecipeAddViewBzr(
+    TestSourcePackageRecipeAddViewMixin, BzrMixin, TestCaseForRecipe):
+
+    def makeBranchAndPackage(self):
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        branch = self.factory.makeBranch(
+            owner=self.chef, product=product, name='veggies')
+        self.factory.makeSourcePackage(sourcepackagename='ratatouille')
+        return branch
+
+    def test_new_recipe_with_package_branches(self):
+        # The series branches table should not appear if there are none.
+        branch, related_series_branch_info, related_package_branches = (
+            self.makeRelatedBranches(with_series_branches=False))
+        browser = self.getUserBrowser(
+            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
+        soup = BeautifulSoup(browser.contents)
+        related_branches = soup.find('fieldset', {'id': 'related-branches'})
+        self.assertIsNot(related_branches, None)
+        related_branches = soup.find(
+            'div', {'id': 'related-package-branches'})
+        self.assertIsNot(related_branches, None)
+        related_branches = soup.find(
+            'div', {'id': 'related-series-branches'})
+        self.assertIs(related_branches, None)
+
+    def test_new_recipe_with_series_branches(self):
+        # The package branches table should not appear if there are none.
+        branch, related_series_branch_info, related_package_branches = (
+            self.makeRelatedBranches(with_package_branches=False))
+        browser = self.getUserBrowser(
+            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
+        soup = BeautifulSoup(browser.contents)
+        related_branches = soup.find('fieldset', {'id': 'related-branches'})
+        self.assertIsNot(related_branches, None)
+        related_branches = soup.find(
+            'div', {'id': 'related-series-branches'})
+        self.assertIsNot(related_branches, None)
+        related_branches = soup.find(
+            'div', {'id': 'related-package-branches'})
+        self.assertIs(related_branches, None)
+
+    def test_new_product_branch_recipe_with_related_branches(self):
+        # The related branches should be rendered correctly on the page.
+        branch, related_series_branch_info, related_package_branch_info = (
+            self.makeRelatedBranches())
+        browser = self.getUserBrowser(
+            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
+        self.checkRelatedBranches(
+            related_series_branch_info, related_package_branch_info,
+            browser.contents)
+
+    def test_new_sourcepackage_branch_recipe_with_related_branches(self):
+        # The related branches should be rendered correctly on the page.
+        reference_branch = self.makePackageBranch()
+        branch, _, related_package_branch_info = (
+            self.makeRelatedBranches(reference_branch))
+        browser = self.getUserBrowser(
+            canonical_url(branch, view_name='+new-recipe'), user=self.chef)
+        self.checkRelatedBranches(
+            set(), related_package_branch_info, browser.contents)
+
+
+class TestSourcePackageRecipeAddViewGit(
+    TestSourcePackageRecipeAddViewMixin, GitMixin, TestCaseForRecipe):
+
+    def makeBranchAndPackage(self):
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        repository = self.factory.makeGitRepository(
+            owner=self.chef, target=product, name=u'veggies')
+        self.factory.makeDistributionSourcePackage(
+            sourcepackagename='ratatouille')
+        return repository
+
+
 class TestSourcePackageRecipeEditViewMixin:
     """Test the editing behaviour of a source package recipe."""
 

=== modified file 'lib/lp/code/browser/tests/test_tales.py'
--- lib/lp/code/browser/tests/test_tales.py	2015-09-11 06:04:36 +0000
+++ lib/lp/code/browser/tests/test_tales.py	2016-01-20 12:22:22 +0000
@@ -235,7 +235,7 @@
                 '<a href="%s">%s recipe build in ubuntu shiny</a> '
                 '[~eric/ubuntu/ppa]'
                 % (canonical_url(build, path_only_if_possible=True),
-                   build.recipe.base_branch.unique_name)))
+                   build.recipe.base.unique_name)))
 
     def test_link_no_recipe(self):
         eric = self.factory.makePerson(name='eric')

=== modified file 'lib/lp/code/errors.py'
--- lib/lp/code/errors.py	2016-01-12 01:24:06 +0000
+++ lib/lp/code/errors.py	2016-01-20 12:22:22 +0000
@@ -30,6 +30,7 @@
     'ClaimReviewFailed',
     'DiffNotFound',
     'GitDefaultConflict',
+    'GitRecipesFeatureDisabled',
     'GitRepositoryCreationException',
     'GitRepositoryCreationFault',
     'GitRepositoryCreationForbidden',
@@ -485,6 +486,15 @@
         self.newest_supported = newest_supported
 
 
+@error_status(httplib.UNAUTHORIZED)
+class GitRecipesFeatureDisabled(Exception):
+    """Only certain users can create new Git recipes."""
+
+    def __init__(self):
+        message = "You do not have permission to create Git recipes."
+        Exception.__init__(self, message)
+
+
 @error_status(httplib.BAD_REQUEST)
 class RecipeBuildException(Exception):
 

=== modified file 'lib/lp/code/help/related-recipes.html'
--- lib/lp/code/help/related-recipes.html	2010-11-04 22:50:52 +0000
+++ lib/lp/code/help/related-recipes.html	2016-01-20 12:22:22 +0000
@@ -18,8 +18,8 @@
     </p>
 
     <p>A "recipe" is a description of the steps Launchpad's package builder
-      should take to construct a source package from a set of Bazaar branches
-      that you specify.
+      should take to construct a source package from a set of Bazaar or Git
+      branches that you specify.
     </p>
 
     <p>

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2016-01-15 11:50:57 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2016-01-20 12:22:22 +0000
@@ -8,6 +8,7 @@
 
 
 __all__ = [
+    'GIT_RECIPES_FEATURE_FLAG',
     'IRecipeBranchSource',
     'ISourcePackageRecipe',
     'ISourcePackageRecipeData',
@@ -68,6 +69,9 @@
 from lp.soyuz.interfaces.archive import IArchive
 
 
+GIT_RECIPES_FEATURE_FLAG = u'code.git.recipes.enabled'
+
+
 MINIMAL_RECIPE_TEXT_BZR = dedent(u'''\
     # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
     %s

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2016-01-15 11:50:57 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2016-01-20 12:22:22 +0000
@@ -41,8 +41,10 @@
 from lp.code.errors import (
     BuildAlreadyPending,
     BuildNotAllowedForDistro,
+    GitRecipesFeatureDisabled,
     )
 from lp.code.interfaces.sourcepackagerecipe import (
+    GIT_RECIPES_FEATURE_FLAG,
     IRecipeBranchSource,
     ISourcePackageRecipe,
     ISourcePackageRecipeData,
@@ -68,6 +70,7 @@
     IStore,
     )
 from lp.services.database.stormexpr import Greatest
+from lp.services.features import getFeatureFlag
 from lp.services.propertycache import (
     cachedproperty,
     get_property_cache,
@@ -227,6 +230,15 @@
         sprecipe.date_created = date_created
         sprecipe.date_last_modified = date_created
         store.add(sprecipe)
+        # We can only do this feature flag check at the end, because we need
+        # to have constructed the SourcePackageRecipeData in order to know
+        # whether it refers to a Git repository and then we need the
+        # SourcePackageRecipe to respect DB constraints before doing
+        # anything else.  The transaction will be aborted either way if the
+        # check fails.
+        if (sprecipe.base_git_repository is not None and
+                not getFeatureFlag(GIT_RECIPES_FEATURE_FLAG)):
+            raise GitRecipesFeatureDisabled
         return sprecipe
 
     @staticmethod

=== modified file 'lib/lp/code/model/tests/test_gitrepository.py'
--- lib/lp/code/model/tests/test_gitrepository.py	2016-01-12 04:34:09 +0000
+++ lib/lp/code/model/tests/test_gitrepository.py	2016-01-20 12:22:22 +0000
@@ -72,6 +72,7 @@
     IGitRepositoryView,
     )
 from lp.code.interfaces.revision import IRevisionSet
+from lp.code.interfaces.sourcepackagerecipe import GIT_RECIPES_FEATURE_FLAG
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.branchmergeproposaljob import (
     BranchMergeProposalJob,
@@ -454,12 +455,14 @@
 
     def test_destroySelf_with_SourcePackageRecipe(self):
         # If repository is a base_git_repository in a recipe, it is deleted.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         recipe = self.factory.makeSourcePackageRecipe(
             branches=self.factory.makeGitRefs(owner=self.user))
         recipe.base_git_repository.destroySelf(break_references=True)
 
     def test_destroySelf_with_SourcePackageRecipe_as_non_base(self):
         # If repository is referred to by a recipe, it is deleted.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         [ref1] = self.factory.makeGitRefs(owner=self.user)
         [ref2] = self.factory.makeGitRefs(owner=self.user)
         self.factory.makeSourcePackageRecipe(branches=[ref1, ref2])
@@ -698,6 +701,7 @@
 
     def test_deletionRequirements_with_SourcePackageRecipe(self):
         # Recipes are listed as deletion requirements.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         recipe = self.factory.makeSourcePackageRecipe(
             branches=self.factory.makeGitRefs())
         self.assertEqual(
@@ -1845,6 +1849,10 @@
 
     layer = ZopelessDatabaseLayer
 
+    def setUp(self):
+        super(TestGitRepositoryMarkRecipesStale, self).setUp()
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
+
     def test_base_repository_recipe(self):
         # On ref changes, recipes where this ref is the base become stale.
         [ref] = self.factory.makeGitRefs()

=== modified file 'lib/lp/code/model/tests/test_hasrecipes.py'
--- lib/lp/code/model/tests/test_hasrecipes.py	2016-01-14 17:24:14 +0000
+++ lib/lp/code/model/tests/test_hasrecipes.py	2016-01-20 12:22:22 +0000
@@ -6,6 +6,8 @@
 __metaclass__ = type
 
 from lp.code.interfaces.hasrecipes import IHasRecipes
+from lp.code.interfaces.sourcepackagerecipe import GIT_RECIPES_FEATURE_FLAG
+from lp.services.features.testing import FeatureFixture
 from lp.testing import TestCaseWithFactory
 from lp.testing.layers import DatabaseFunctionalLayer
 
@@ -47,6 +49,7 @@
     def test_git_repository_recipes(self):
         # IGitRepository.recipes should provide all the SourcePackageRecipes
         # attached to that repository.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         base_ref1, base_ref2 = self.factory.makeGitRefs(
             paths=[u"refs/heads/ref1", u"refs/heads/ref2"])
         [other_ref] = self.factory.makeGitRefs()
@@ -58,6 +61,7 @@
     def test_git_repository_recipes_nonbase(self):
         # IGitRepository.recipes should provide all the SourcePackageRecipes
         # that refer to the repository, even as a non-base branch.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         [base_ref] = self.factory.makeGitRefs()
         [nonbase_ref] = self.factory.makeGitRefs()
         [other_ref] = self.factory.makeGitRefs()
@@ -88,6 +92,7 @@
     def test_product_recipes(self):
         # IProduct.recipes should provide all the SourcePackageRecipes
         # attached to that product's branches and Git repositories.
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         product = self.factory.makeProduct()
         branch = self.factory.makeBranch(product=product)
         [ref] = self.factory.makeGitRefs(target=product)

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2016-01-15 11:50:57 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2016-01-20 12:22:22 +0000
@@ -29,11 +29,13 @@
     TestHandleStatusMixin,
     TestVerifySuccessfulBuildMixin,
     )
+from lp.code.interfaces.sourcepackagerecipe import GIT_RECIPES_FEATURE_FLAG
 from lp.code.model.recipebuilder import RecipeBuildBehaviour
 from lp.code.model.sourcepackagerecipebuild import SourcePackageRecipeBuild
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.config import config
+from lp.services.features.testing import FeatureFixture
 from lp.services.log.logger import BufferLogger
 from lp.soyuz.adapters.archivedependencies import (
     get_sources_list_for_building,
@@ -258,6 +260,7 @@
         self.assertEqual(args["archives"], expected_archives)
 
     def test_extraBuildArgs_git(self):
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
         job = self.makeJob(git=True)
         distroarchseries = job.build.distroseries.architectures[0]
         expected_archives = get_sources_list_for_building(

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2016-01-12 03:54:38 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2016-01-20 12:22:22 +0000
@@ -31,11 +31,13 @@
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.errors import (
     BuildAlreadyPending,
+    GitRecipesFeatureDisabled,
     PrivateBranchRecipe,
     PrivateGitRepositoryRecipe,
     TooNewRecipeFormat,
     )
 from lp.code.interfaces.sourcepackagerecipe import (
+    GIT_RECIPES_FEATURE_FLAG,
     ISourcePackageRecipe,
     ISourcePackageRecipeSource,
     ISourcePackageRecipeView,
@@ -56,6 +58,7 @@
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.database.bulk import load_referencing
 from lp.services.database.constants import UTC_NOW
+from lp.services.features.testing import FeatureFixture
 from lp.services.propertycache import clear_property_cache
 from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.publisher import canonical_url
@@ -122,6 +125,10 @@
     branch_type = "repository"
     recipe_id = "git-build-recipe"
 
+    def setUp(self):
+        super(GitMixin, self).setUp()
+        self.useFixture(FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}))
+
     def makeBranch(self, **kwargs):
         return self.factory.makeGitRefs(**kwargs)[0]
 
@@ -823,6 +830,12 @@
     TestSourcePackageRecipeMixin, GitMixin, TestCaseWithFactory):
     """Test `SourcePackageRecipe` objects for Git."""
 
+    def test_feature_flag_disabled(self):
+        # Without a feature flag, we will not create new Git recipes.
+        self.useFixture(FeatureFixture({}))
+        self.assertRaises(
+            GitRecipesFeatureDisabled, self.makeSourcePackageRecipe)
+
 
 class TestRecipeBranchRoundTrippingMixin:
 

=== modified file 'lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt'
--- lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2016-01-12 15:10:57 +0000
+++ lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2016-01-20 12:22:22 +0000
@@ -74,15 +74,21 @@
 Create a new sample repository, some branches in it, and some source package
 recipes to go along with them.
 
+    >>> from lp.code.interfaces.sourcepackagerecipe import (
+    ...     GIT_RECIPES_FEATURE_FLAG,
+    ...     )
+    >>> from lp.services.features.testing import FeatureFixture
+
     >>> login('[e-mail]')
     >>> repository = factory.makeGitRepository()
     >>> ref1, ref2, ref3 = factory.makeGitRefs(
     ...     repository=repository,
     ...     paths=[u"refs/heads/a", u"refs/heads/b", u"refs/heads/c"])
-    >>> recipe1a = factory.makeSourcePackageRecipe(branches=[ref1])
-    >>> recipe1b = factory.makeSourcePackageRecipe(branches=[ref1])
-    >>> recipe2 = factory.makeSourcePackageRecipe(branches=[ref2])
-    >>> recipe3 = factory.makeSourcePackageRecipe(branches=[ref3])
+    >>> with FeatureFixture({GIT_RECIPES_FEATURE_FLAG: u"on"}):
+    ...     recipe1a = factory.makeSourcePackageRecipe(branches=[ref1])
+    ...     recipe1b = factory.makeSourcePackageRecipe(branches=[ref1])
+    ...     recipe2 = factory.makeSourcePackageRecipe(branches=[ref2])
+    ...     recipe3 = factory.makeSourcePackageRecipe(branches=[ref3])
 
 Keep these urls, including the target url.  We'll use these later.
 

=== modified file 'lib/lp/code/templates/gitref-recipes.pt'
--- lib/lp/code/templates/gitref-recipes.pt	2016-01-12 15:10:57 +0000
+++ lib/lp/code/templates/gitref-recipes.pt	2016-01-20 12:22:22 +0000
@@ -2,6 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  tal:define="context_menu view/context/menu:context"
   id="related-recipes">
 
   <h3>Related source package recipes</h3>
@@ -14,6 +15,12 @@
       <a href="/+help-code/related-recipes.html" target="help"
          class="sprite maybe action-icon">(?)</a>
     </div>
+
+    <span
+      tal:define="link context_menu/create_recipe"
+      tal:condition="link/enabled"
+      tal:replace="structure link/render"
+      />
   </div>
 
 </div>

=== modified file 'lib/lp/code/templates/gitrepository-recipes.pt'
--- lib/lp/code/templates/gitrepository-recipes.pt	2016-01-12 15:10:57 +0000
+++ lib/lp/code/templates/gitrepository-recipes.pt	2016-01-20 12:22:22 +0000
@@ -2,6 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  tal:define="context_menu view/context/menu:context"
   id="related-recipes">
 
   <h3>Related source package recipes</h3>
@@ -14,6 +15,12 @@
       <a href="/+help-code/related-recipes.html" target="help"
          class="sprite maybe action-icon">(?)</a>
     </div>
+
+    <span
+      tal:define="link context_menu/create_recipe"
+      tal:condition="link/enabled"
+      tal:replace="structure link/render"
+      />
   </div>
 
 </div>