Merge pull request openSUSE#1979 from dmach/osc-fork-target-org

Add '--gitea-fork-org' option to 'osc fork' command

Author: dmach

behave/features/fork.feature

@@ -4,9 +4,30 @@ Feature: `osc fork` command
 Background:
     Given I set working directory to "{context.osc.temp}"
 
+
 @destructive
 Scenario: Fork a git repo
     When I execute osc with args "fork test:factory test-GitPkgA"
     Then the exit code is 0
      And stdout contains " scmsync URL: "
      And stdout contains "/Admin/test-GitPkgA#factory"
+
+
+@destructive
+Scenario: Fork multiple git repos from different orgs
+    When I execute git-obs with args "-G admin api -X POST /orgs --data '{{"username": "devel"}}'"
+    When I execute osc with args "fork test:factory test-GitPkgA --target-project=test:devel --no-devel-project --gitea-fork-org=devel"
+    Then the exit code is 0
+     And stdout contains " scmsync URL: "
+     And stdout contains "/devel/test-GitPkgA#factory"
+    When I execute osc with args "fork test:factory test-GitPkgA --target-project=home:Admin --no-devel-project"
+    Then the exit code is 0
+     And stdout contains " scmsync URL: "
+     And stdout contains "/Admin/test-GitPkgA#factory"
+    When I execute osc with args "fork test:devel test-GitPkgA --target-project=home:Admin --no-devel-project"
+    # there's an existing fork from a different org, the command fails
+    Then the exit code is 1
+    When I execute osc with args "fork test:devel test-GitPkgA --target-project=home:Admin --new-repo-name="test-GitPkgA-devel" --no-devel-project"
+    Then the exit code is 0
+     And stdout contains " scmsync URL: "
+     And stdout contains "/Admin/test-GitPkgA-devel#factory"

osc/commands/fork.py

@@ -51,6 +51,11 @@ def init_arguments(self):
             help="Name of the package (defaults to $package)",
         )
 
+        self.add_argument(
+            "--gitea-fork-org",
+            help="Name of the org owning the fork",
+        )
+
         self.add_argument_new_repo_name()
 
         self.add_argument(
@@ -155,14 +160,19 @@ def run(self, args):
         parent_branch_obj = gitea_api.Branch.get(gitea_conn, owner, repo, fork_branch)
 
         try:
-            repo_obj = gitea_api.Fork.create(gitea_conn, owner, repo, new_repo_name=args.new_repo_name)
+            repo_obj = gitea_api.Fork.create(gitea_conn, owner, repo, new_repo_name=args.new_repo_name, target_org=args.gitea_fork_org)
             fork_owner = repo_obj.owner
             fork_repo = repo_obj.repo
             print(f" * Fork created: {fork_owner}/{fork_repo}")
         except gitea_api.ForkExists as e:
             fork_owner = e.fork_owner
             fork_repo = e.fork_repo
             print(f" * Fork already exists: {fork_owner}/{fork_repo}")
+        except gitea_api.RepoExists as e:
+            print(f"{tty.colorize('ERROR', 'red,bold')}: Repo already exists '{e.owner}/{e.repo}' and is not a fork of '{owner}/{repo}'")
+            print(" * Consider forking with an alternative repo name")
+            print(f" * You may also want to delete '{e.owner}/{e.repo}' and retry")
+            sys.exit(1)
 
         # XXX: implicit branch name should be forbidden; assumptions are bad
         fork_scmsync = urllib.parse.urlunparse(

osc/gitea_api/exceptions.py

@@ -154,7 +154,11 @@ def __init__(self, response: GiteaHTTPResponse, owner: str, repo: str):
         self.repo = repo
 
     def __str__(self):
-        result = f"Repo '{self.owner}/{self.repo}' already exists"
+        result = (
+            f"Repo '{self.owner}/{self.repo}' already exists.\n"
+            " - If you were forking a repo, you may consider forking with an alternative repo name.\n"
+            " - You may also want to delete the repo and fork it from elsewhere."
+        )
         return result