Merge lp:~cjwatson/launchpad/git-recipe-delete into lp:launchpad

[Colin Watson]

Handle recipes when deleting Git repositories.

Handle recipes when deleting Git repositories.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2015-10-19 10:48:28 +0000
+++ lib/lp/code/model/branch.py	2016-01-14 20:27:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -860,7 +860,8 @@
         alteration_operations.extend(
             map(ClearOfficialPackageBranch, series_set.findForBranch(self)))
         deletion_operations.extend(
-            DeletionCallable.forSourcePackageRecipe(recipe)
+            DeletionCallable(
+                recipe, _('This recipe uses this branch.'), recipe.destroySelf)
             for recipe in self.recipes)
         if not getUtility(ISnapSet).findByBranch(self).is_empty():
             alteration_operations.append(DeletionCallable(
@@ -1498,11 +1499,6 @@
     def __call__(self):
         self.func(*self.args, **self.kwargs)
 
-    @classmethod
-    def forSourcePackageRecipe(cls, recipe):
-        return cls(
-            recipe, _('This recipe uses this branch.'), recipe.destroySelf)
-
 
 class ClearDependentBranch(DeletionOperation):
     """Delete operation that clears a merge proposal's prerequisite branch."""
 
=== modified file 'lib/lp/code/model/gitrepository.py'
--- lib/lp/code/model/gitrepository.py	2016-01-14 20:27:26 +0000
+++ lib/lp/code/model/gitrepository.py	2016-01-14 20:27:26 +0000
@@ -1047,6 +1047,11 @@
             prerequisite_git_repository=self):
             alteration_operations.append(
                 ClearPrerequisiteRepository(merge_proposal))
+        deletion_operations.extend(
+            DeletionCallable(
+                recipe, msg("This recipe uses this repository."),
+                recipe.destroySelf)
+            for recipe in self.recipes)
         if not getUtility(ISnapSet).findByGitRepository(self).is_empty():
             alteration_operations.append(DeletionCallable(
                 None, msg("Some snap packages build from this repository."),
 
=== modified file 'lib/lp/code/model/tests/test_gitrepository.py'
--- lib/lp/code/model/tests/test_gitrepository.py	2015-12-10 00:05:41 +0000
+++ lib/lp/code/model/tests/test_gitrepository.py	2016-01-14 20:27:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for Git repositories."""
@@ -452,6 +452,19 @@
             [ReclaimGitRepositorySpaceJob(job).repository_path
              for job in jobs])
 
+    def test_destroySelf_with_SourcePackageRecipe(self):
+        # If repository is a base_git_repository in a recipe, it is deleted.
+        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.
+        [ref1] = self.factory.makeGitRefs(owner=self.user)
+        [ref2] = self.factory.makeGitRefs(owner=self.user)
+        self.factory.makeSourcePackageRecipe(branches=[ref1, ref2])
+        ref2.repository.destroySelf(break_references=True)
+
     def test_destroySelf_with_inline_comments_draft(self):
         # Draft inline comments related to a deleted repository (source or
         # target MP repository) also get removed.
@@ -683,6 +696,14 @@
         self.assertRaises(
             SQLObjectNotFound, BranchMergeProposal.get, merge_proposal_id)
 
+    def test_deletionRequirements_with_SourcePackageRecipe(self):
+        # Recipes are listed as deletion requirements.
+        recipe = self.factory.makeSourcePackageRecipe(
+            branches=self.factory.makeGitRefs())
+        self.assertEqual(
+            {recipe: ("delete", "This recipe uses this repository.")},
+            recipe.base_git_repository.getDeletionRequirements())
+
 
 class TestGitRepositoryModifications(TestCaseWithFactory):
     """Tests for Git repository modifications."""