Merge ~pappacena/launchpad:forked-repo-owner-default into launchpad:master

[Thiago F. Pappacena]

Setting forked repo as owner-default if no other repo is set that way.

[Colin Watson (cjwatson)]

review: Needs Information

59de4d8... by Thiago F. Pappacena on 2020-10-16

Marking repository as owner-default when forking, not confirming

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/code/model/gitrepository.py b/lib/lp/code/model/gitrepository.py
index 44b9315..f7a2a0b 100644
--- a/lib/lp/code/model/gitrepository.py
+++ b/lib/lp/code/model/gitrepository.py
@@ -1772,6 +1772,13 @@ class GitRepositorySet:
             date_created=UTC_NOW, description=origin.description,
             with_hosting=True, async_hosting=True,
             status=GitRepositoryStatus.CREATING)
+        try:
+            # Try to set the new repo as owner-default.
+            repository.setOwnerDefault(True)
+        except GitDefaultConflict:
+            # If there is already a owner-default for this owner/target,
+            # just move on.
+            pass
         return repository
 
     def getByPath(self, user, path):
diff --git a/lib/lp/code/model/tests/test_gitrepository.py b/lib/lp/code/model/tests/test_gitrepository.py
index 6f65250..7d7464e 100644
--- a/lib/lp/code/model/tests/test_gitrepository.py
+++ b/lib/lp/code/model/tests/test_gitrepository.py
@@ -2750,6 +2750,21 @@ class TestGitRepositoryFork(TestCaseWithFactory):
             repo, another_person, another_team)
         self.assertEqual(another_team, forked_repo.owner)
         self.assertEqual(another_person, forked_repo.registrant)
+        self.assertTrue(forked_repo.owner_default)
+        self.assertEqual(1, self.hosting_fixture.create.call_count)
+
+    def test_fork_not_owner_default(self):
+        repo = self.factory.makeGitRepository()
+        # The person forking the repo already has another repo which is the
+        # owner-default for that owner & target.
+        previous_repo = self.factory.makeGitRepository(target=repo.target)
+        previous_repo.setOwnerDefault(True)
+
+        forked_repo = getUtility(IGitRepositorySet).fork(
+            repo, previous_repo.owner, previous_repo.owner)
+        self.assertEqual(previous_repo.owner, forked_repo.owner)
+        self.assertEqual(previous_repo.owner, forked_repo.registrant)
+        self.assertFalse(forked_repo.owner_default)
         self.assertEqual(1, self.hosting_fixture.create.call_count)
 
     def test_fork_same_name(self):
@@ -2762,6 +2777,7 @@ class TestGitRepositoryFork(TestCaseWithFactory):
 
         forked_repo = getUtility(IGitRepositorySet).fork(repo, person, person)
         self.assertEqual(forked_repo.target, repo.target)
+        self.assertTrue(forked_repo.owner_default)
         self.assertEqual(forked_repo.name, "%s-1" % same_name_repo.name)