Fix 'git-obs staging' commands to be case insensitive as Gitea

Author: dmach

osc/commands_git/staging_group.py

@@ -96,14 +96,14 @@ def run(self, args):
             pr_map = {}
             for owner, repo, number in args.pr_list:
                 pr = gitea_api.StagingPullRequestWrapper(self.gitea_conn, owner, repo, number, topdir=temp_dir, cache_directory=cache_dir)
-                pr_map[(owner, repo, number)] = pr
+                pr_map[(owner.lower(), repo.lower(), number)] = pr
 
             # run checks
             target_owner = None
             target_repo = None
             target_branch = None
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
 
                 if pr.pr_obj.state != "open":
                     # we don't care about the state of the package pull requests - they can be merged already
@@ -133,12 +133,12 @@ def run(self, args):
 
             # clone the git repos, cache submodule data
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 pr.clone()
 
             # run checks #2
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 if not pr.package_pr_map:
                     # TODO: we don't know if the submodules are packages or not, we should cross-reference those with _manifest
                     raise gitea_api.GitObsRuntimeError(f"Pull request {owner}/{repo}#{number} doesn't have any submodules changed.")
@@ -175,10 +175,10 @@ def run(self, args):
                 desc = ""
                 updated_packages = []
                 for owner, repo, number in args.pr_list:
-                    pr = pr_map[(owner, repo, number)]
+                    pr = pr_map[(owner.lower(), repo.lower(), number)]
                     for (pkg_owner, pkg_repo, pkg_number), pr_obj in pr.package_pr_map.items():
                         desc += f"PR: {pkg_owner}/{pkg_repo}!{pkg_number}\n"
-                        updated_packages.append(os.path.basename(pr.submodules_by_owner_repo[pkg_owner, pkg_repo]["path"]))
+                        updated_packages.append(os.path.basename(pr.submodules_by_owner_repo[pkg_owner.lower(), pkg_repo.lower()]["path"]))
 
                 # TODO: it would be nice to mention the target OBS project
                 # we keep only the first ``max_packages``, because the title might get too long quite easily
@@ -206,12 +206,12 @@ def run(self, args):
             target = gitea_api.StagingPullRequestWrapper(self.gitea_conn, target_owner, target_repo, target_number, topdir=temp_dir, cache_directory=cache_dir)
             target.clone()
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 pr.clone()
 
             # locally merge package pull requests to the target project pull request (don't change anything on server yet)
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 target.merge(pr)
 
             # push to git repo associated with the target pull request
@@ -223,7 +223,7 @@ def run(self, args):
                 target.pr_obj.set(self.gitea_conn, target_owner, target_repo, target_number, description=target.pr_obj.body)
 
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 if args.remove_pr_references:
                     try:
                         # apply the removed 'PR:' reference to the package pull request

osc/commands_git/staging_remove.py

@@ -43,15 +43,15 @@ def run(self, args):
             pr_map = {}  # {(owner, repo, number):.
             for owner, repo, number in args.pr_list:
                 pr = gitea_api.StagingPullRequestWrapper(self.gitea_conn, owner, repo, number, topdir=temp_dir)
-                pr_map[(owner, repo, number)] = pr
+                pr_map[(owner.lower(), repo.lower(), number)] = pr
 
             # clone the git repos, cache submodule data
             target.clone()
             target.clone_base()
 
             # locally remove package pull requests from the target project pull request (don't change anything on server yet)
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 target.remove(pr)
 
             # push to git repo associated with the target pull request
@@ -60,7 +60,7 @@ def run(self, args):
             target.pr_obj.set(self.gitea_conn, target_owner, target_repo, target_number, description=target.pr_obj.body)
 
             for owner, repo, number in args.pr_list:
-                pr = pr_map[(owner, repo, number)]
+                pr = pr_map[(owner.lower(), repo.lower(), number)]
                 # close the removed package pull request
                 try:
                     gitea_api.PullRequest.close(self.gitea_conn, owner, repo, number)

osc/gitea_api/staging.py

@@ -18,8 +18,8 @@ def __init__(self, conn, owner: str, repo: str, number: int, *, topdir: str, cac
 
         self.pr_obj = PullRequest.get(conn, owner, repo, number)
         self.git = None
-        self.submodules_by_owner_repo = {}
-        self.package_pr_map = {}
+        self.submodules_by_owner_repo = {}  # (owner, repo) -> submodule metadata; owner, repo must be lower case (Gitea is case insensitive)
+        self.package_pr_map = {}  # (owner, repo, number) -> StagingPullRequestWrapper; owner, repo must be lower case (Gitea is case insensitive)
 
         self.base_git = None
         self.base_submodules_by_owner_repo = {}
@@ -44,13 +44,13 @@ def clone(self):
         self.git.fetch()
 
         submodules = self.git.get_submodules()
-        self.submodules_by_owner_repo = dict([((i["owner"], i["repo"]), i) for i in submodules.values()])
+        self.submodules_by_owner_repo = dict([((i["owner"].lower(), i["repo"].lower()), i) for i in submodules.values()])
 
         for pkg_owner, pkg_repo, pkg_number in self.pr_obj.parse_pr_references():
             pkg_pr_obj = self.__class__(self.conn, pkg_owner, pkg_repo, pkg_number, topdir=self._topdir)
-            self.package_pr_map[(pkg_owner, pkg_repo, pkg_number)] = pkg_pr_obj
+            self.package_pr_map[(pkg_owner.lower(), pkg_repo.lower(), pkg_number)] = pkg_pr_obj
             # FIXME: doesn't work when the commits are padded with zeros
-            # assert self.submodules_by_owner_repo[(pkg_owner, pkg_repo)]["commit"] == pkg_pr_obj.pr_obj.head_commit
+            # assert self.submodules_by_owner_repo[(pkg_owner.lower(), pkg_repo.lower())]["commit"] == pkg_pr_obj.pr_obj.head_commit
 
     def clone_base(self):
         from . import Git
@@ -72,7 +72,7 @@ def clone_base(self):
         self.base_git.fetch()
 
         submodules = self.base_git.get_submodules()
-        self.base_submodules_by_owner_repo = dict([((i["owner"], i["repo"]), i) for i in submodules.values()])
+        self.base_submodules_by_owner_repo = dict([((i["owner"].lower(), i["repo"].lower()), i) for i in submodules.values()])
 
     def merge(self, other):
         """
@@ -88,8 +88,8 @@ def merge(self, other):
         submodule_paths = []
 
         for pkg_owner, pkg_repo, pkg_number in other.package_pr_map:
-            other_submodule = other.submodules_by_owner_repo[(pkg_owner, pkg_repo)]
-            self_submodule = self.submodules_by_owner_repo.get((pkg_owner, pkg_repo), None)
+            other_submodule = other.submodules_by_owner_repo[(pkg_owner.lower(), pkg_repo.lower())]
+            self_submodule = self.submodules_by_owner_repo.get((pkg_owner.lower(), pkg_repo.lower()), None)
 
             if self_submodule:
                 # use an existing path if the submodule already exists
@@ -127,8 +127,8 @@ def remove(self, package_pr):
 
         self.pr_obj._data["body"] = PullRequest.remove_pr_references(self.pr_obj.body, [(package_pr.owner, package_pr.repo, package_pr.number)])
 
-        submodule = self.submodules_by_owner_repo.get((package_pr.owner, package_pr.repo), None)
-        base_submodule = self.base_submodules_by_owner_repo.get((package_pr.owner, package_pr.repo), None)
+        submodule = self.submodules_by_owner_repo.get((package_pr.owner.lower(), package_pr.repo.lower()), None)
+        base_submodule = self.base_submodules_by_owner_repo.get((package_pr.owner.lower(), package_pr.repo.lower()), None)
 
         if not submodule:
             raise GitObsRuntimeError(f"Unable to find a submodule for pull request {package_pr.owner}/{package_pr.repo}!{package_pr.number}")