Merge pull request openSUSE#1944 from dmach/git-obs-G-url

Change 'git-obs -G' to accept url to select a gitea login entry

Author: dmach

osc/commandline_git.py

@@ -203,7 +203,9 @@ def init_arguments(self):
             "--gitea-login",
             help=(
                 "Name of the login entry in the config file. Default: $GIT_OBS_LOGIN or the default entry from the config file.\n"
-                "Alternatively, you can omit this argument and set GIT_OBS_GITEA_URL, GIT_OBS_GITEA_USER, and GIT_OBS_GITEA_TOKEN environmental variables instead.\n"
+                "Alternatively, you can use gitea url as long as there's only a single matching entry in the config file.\n"
+                "\n"
+                "You can omit this argument and set GIT_OBS_GITEA_URL, GIT_OBS_GITEA_USER, and GIT_OBS_GITEA_TOKEN environmental variables instead.\n"
                 "Optional variables: GIT_OBS_GITEA_SSH_KEY\n"
                 "\n"
                 "To override the existing values from the config file, you can specify the following environmental variables:\n"
@@ -262,8 +264,17 @@ def gitea_conf(self, value):
 
     @property
     def gitea_login(self):
+        from . import gitea_api
+
         if self._gitea_login is None:
-            self._gitea_login = self.gitea_conf.get_login(name=self._args.gitea_login)
+            try:
+                self._gitea_login = self.gitea_conf.get_login(name=self._args.gitea_login)
+            except gitea_api.Login.DoesNotExist as e:
+                try:
+                    self._gitea_login = self.gitea_conf.get_login_by_url_user(url=self._args.gitea_login)
+                except gitea_api.Login.DoesNotExist:
+                    raise e
+
         return self._gitea_login
 
     @gitea_login.setter

osc/gitea_api/conf.py

@@ -44,12 +44,21 @@ def __str__(self):
                     " * either set the default entry by running `git-obs login update <login> --set-as-default`\n"
                     " * or run the command with `-G/--gitea-login <login>` option"
                 )
-            kwargs_str = ", ".join([f"{key}={value}" for key, value in self.kwargs.items()])
+            kwargs_str = ", ".join([f"{key}={value}" for key, value in self.kwargs.items() if value])
             return (
                 f"Could not find a matching Gitea config entry: {kwargs_str}\n"
                 " * see `git-obs login list` for valid entries"
             )
 
+    class MultipleEntriesReturned(oscerr.OscBaseError):
+        def __init__(self, **kwargs):
+            super().__init__()
+            self.kwargs = kwargs
+
+        def __str__(self):
+            kwargs_str = ", ".join([f"{key}={value}" for key, value in self.kwargs.items() if value])
+            return f"Multiple login entries returned for the following args: {kwargs_str}"
+
     def __init__(self, **kwargs):
         # ignore extra fields
         for key in list(kwargs):
@@ -150,16 +159,25 @@ def get_login(self, name: Optional[str] = None) -> Login:
                 return login
         raise Login.DoesNotExist(name=name)
 
-    def get_login_by_url_user(self, url: str, user: str) -> Login:
+    def get_login_by_url_user(self, url: str, user: Optional[str] = None) -> Login:
         """
         Return ``Login`` object for the given ``url`` and ``user``.
         """
         from .git import Git
 
         # exact match
+        matches = []
         for login in self.list_logins():
-            if (login.url, login.user) == (url, user):
-                return login
+            if user is None:
+                if login.url == url:
+                    matches.append(login)
+            elif (login.url, login.user) == (url, user):
+                matches.append(login)
+
+        if len(matches) == 1:
+            return matches[0]
+        if len(matches) >= 2:
+            raise Login.MultipleEntriesReturned(url=url, user=user)
 
         def url_to_hostname(value):
             netloc = Git.urlparse(value).netloc
@@ -175,9 +193,18 @@ def url_to_hostname(value):
             return netloc
 
         # match only hostname (netloc without 'user@' and ':port') + user
+        matches = []
         for login in self.list_logins():
-            if (url_to_hostname(login.url), login.user) == (url_to_hostname(url), user):
-                return login
+            if user is None:
+                if url_to_hostname(login.url) == url_to_hostname(url):
+                    matches.append(login)
+            elif (url_to_hostname(login.url), login.user) == (url_to_hostname(url), user):
+                matches.append(login)
+
+        if len(matches) == 1:
+            return matches[0]
+        if len(matches) >= 2:
+            raise Login.MultipleEntriesReturned(url=url, user=user)
 
         raise Login.DoesNotExist(url=url, user=user)