Merge remote-tracking branch 'dmach/git-store-osc-allow-scmurl' into devel

mcepl · mcepl · commit fb0bf333b416 · 2025-09-26T15:01:19.000+02:00
diff --git a/behave/features/git-login.feature b/behave/features/git-login.feature
@@ -97,7 +97,7 @@ Scenario: Remove a credentials login entry
 
 
 Scenario: Update a credentials login entry
-    When I execute git-obs with args "login update alice --new-name=NEW_NAME --new-url=NEW_URL --new-user=NEW_USER --new-token=1234567890123456789012345678901234567890 --new-ssh-key= --set-as-default"
+    When I execute git-obs with args "login update alice --new-name=NEW_NAME --new-url=NEW_URL --new-user=NEW_USER --new-token=1234567890123456789012345678901234567890 --new-ssh-key= --new-quiet=1 --set-as-default"
     Then the exit code is 0
      And stderr is
          """
@@ -117,6 +117,7 @@ Scenario: Update a credentials login entry
         Default              : true
         URL                  : NEW_URL
         User                 : NEW_USER
+        Quiet                : yes
         """
     When I execute git-obs with args "login list"
     Then stdout is
@@ -130,6 +131,7 @@ Scenario: Update a credentials login entry
         Default              : true
         URL                  : NEW_URL
         User                 : NEW_USER
+        Quiet                : yes
 
         Name                 : bob
         URL                  : http://localhost:{context.podman.container.ports[gitea_http]}
diff --git a/osc/commandline_git.py b/osc/commandline_git.py
@@ -77,7 +77,17 @@ def gitea_conn(self):
     def gitea_conn(self, value):
         self.main_command.gitea_conn = value
 
+    @property
+    def quiet(self):
+        if self.main_command._args.quiet:
+            return True
+        if self.gitea_login and self.gitea_login.quiet:
+            return True
+        return False
+
     def print_gitea_settings(self):
+        if self.quiet:
+            return
         print(f"Using the following Gitea settings:", file=sys.stderr)
         print(f" * Config path: {self.gitea_conf.path}", file=sys.stderr)
         print(f" * Login (name of the entry in the config file): {self.gitea_login.name}", file=sys.stderr)
@@ -176,6 +186,13 @@ def __init__(self, *args, **kwargs):
         self._gitea_conn = None
 
     def init_arguments(self):
+        self.add_argument(
+            "-q",
+            "--quiet",
+            action="store_true",
+            help="Mute unnecessary output",
+        )
+
         self.add_argument(
             "--gitea-config",
             help="Path to gitea config. Default: $GIT_OBS_CONFIG or ~/.config/tea/config.yml.",
@@ -186,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"
@@ -245,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
diff --git a/osc/commands/fork.py b/osc/commands/fork.py
@@ -19,6 +19,13 @@ class ForkCommand(osc.commandline.OscCommand):
     post_parse_args = osc.commandline_git.GitObsMainCommand.post_parse_args
     print_gitea_settings = osc.commandline_git.GitObsCommand.print_gitea_settings
 
+    def quiet(self):
+        if self.main_command.args.quiet:
+            return True
+        if self.gitea_login and self.gitea_login.quiet:
+            return True
+        return False
+
     def init_arguments(self):
         # inherit global options from the main git-obs command
         osc.commandline_git.GitObsMainCommand.init_arguments(self)
diff --git a/osc/commands_git/login_add.py b/osc/commands_git/login_add.py
@@ -22,6 +22,7 @@ def init_arguments(self):
         self.parser.add_argument("--token", help="Gitea access token; omit or set to '-' to invoke a secure interactive prompt")
         self.parser.add_argument("--ssh-key", metavar="PATH", help="Path to a private SSH key").completer = complete_ssh_key_path
         self.parser.add_argument("--git-uses-http", action="store_true", help="Git uses http(s) instead of SSH", default=None)
+        self.parser.add_argument("--quiet", action="store_true", help="Mute unnecessary output when using this login entry")
         self.parser.add_argument("--set-as-default", help="Set the new login entry as default", action="store_true", default=None)
 
     def run(self, args):
diff --git a/osc/commands_git/login_update.py b/osc/commands_git/login_update.py
@@ -23,6 +23,7 @@ def init_arguments(self):
         self.parser.add_argument("--new-token", metavar="TOKEN", help="Gitea access token; set to '-' to invoke a secure interactive prompt")
         self.parser.add_argument("--new-ssh-key", metavar="PATH", help="Path to a private SSH key").completer = complete_ssh_key_path
         self.parser.add_argument("--new-git-uses-http", help="Git uses http(s) instead of SSH", choices=["0", "1", "yes", "no"], default=None)
+        self.parser.add_argument("--new-quiet", help="Mute unnecessary output when using this login entry", choices=["0", "1", "yes", "no"], default=None)
         self.parser.add_argument("--set-as-default", action="store_true", help="Set the login entry as default")
 
     def run(self, args):
@@ -51,6 +52,13 @@ def run(self, args):
         else:
             new_git_uses_http = None
 
+        if args.new_quiet in ("0", "no"):
+            new_quiet = False
+        elif args.new_quiet in ("1", "yes"):
+            new_quiet = True
+        else:
+            new_quiet = None
+
         updated_login_obj = self.gitea_conf.update_login(
             args.name,
             new_name=args.new_name,
@@ -59,6 +67,7 @@ def run(self, args):
             new_token=args.new_token,
             new_ssh_key=args.new_ssh_key,
             new_git_uses_http=new_git_uses_http,
+            new_quiet=new_quiet,
             set_as_default=args.set_as_default,
         )
         print("")
diff --git a/osc/core.py b/osc/core.py
@@ -6490,9 +6490,15 @@ def parse_multibuild_data(s: str):
 
         root = xml_fromstring(s)
         for node in root.findall("flavor"):
+            if node.text is None:
+                result.add("")
+                continue
             result.add(node.text)
         # <package> is deprecated according to OBS Multibuild.pm, but it is widely used
         for node in root.findall("package"):
+            if node.text is None:
+                result.add("")
+                continue
             result.add(node.text)
         return result
 
diff --git a/osc/git_scm/store.py b/osc/git_scm/store.py
@@ -117,7 +117,10 @@ def __init__(self, path: str, *, check: bool = True):
 
         if not self._git.current_branch:
             # branch is required for determining and storing metadata
-            msg = f"Directory '{path}' is not a Git SCM working copy because it has no branch or is in a detached HEAD state"
+            msg = (
+                f"Directory '{path}' contains a git repo that has no branch or is in a detached HEAD state.\n"
+                "If it is a Git SCM working copy, switch to a branch to continue."
+            )
             raise oscerr.NoWorkingCopy(msg)
 
         # 'package' is the default type that applies to all git repos that are not projects (we have no means of detecting packages)
diff --git a/osc/gitea_api/conf.py b/osc/gitea_api/conf.py
@@ -21,6 +21,7 @@ class Login(BaseModel):
     token: str = Field()  # type: ignore[assignment]
     ssh_key: Optional[str] = Field()  # type: ignore[assignment]
     git_uses_http: Optional[bool] = Field()  # type: ignore[assignment]
+    quiet: Optional[bool] = Field()  # type: ignore[assignment]
     default: Optional[bool] = Field()  # type: ignore[assignment]
 
     class AlreadyExists(oscerr.OscBaseError):
@@ -43,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):
@@ -69,6 +79,8 @@ def to_human_readable_string(self, *, show_token: bool = False):
             table.add("Private SSH key path", self.ssh_key)
         if self.git_uses_http:
             table.add("Git uses http(s)", "yes" if self.git_uses_http else "no")
+        if self.quiet:
+            table.add("Quiet", "yes" if self.quiet else "no")
         if show_token:
             # tokens are stored in the plain text, there's not reason to protect them too much
             # let's only hide them from the output by default
@@ -147,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
@@ -172,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)
 
@@ -212,6 +242,7 @@ def update_login(
         new_token: Optional[str] = None,
         new_ssh_key: Optional[str] = None,
         new_git_uses_http: Optional[bool] = None,
+        new_quiet: Optional[bool] = None,
         set_as_default: Optional[bool] = None,
     ) -> Login:
         login = self.get_login(name)
@@ -236,6 +267,9 @@ def update_login(
             # remove from the config instead of setting to False
             login.git_uses_http = None
 
+        if new_quiet is not None:
+            login.quiet = new_quiet
+
         if set_as_default:
             login.default = True
 
diff --git a/osc/obs_api/token.py b/osc/obs_api/token.py
@@ -94,7 +94,7 @@ class Kind(str, Enum):
         ),
     )
 
-    triggered_at: str = Field(
+    triggered_at: Optional[str] = Field(
         xml_attribute=True,
         description=textwrap.dedent(
             """
diff --git a/osc/store.py b/osc/store.py
@@ -56,5 +56,5 @@ def git_is_unsupported(path: str, msg: str):
         # not a working copy, we're not handling it
         return
 
-    if isinstance(store, git_scm.GitStore) or store.scmurl:
+    if isinstance(store, git_scm.GitStore):
         raise oscerr.NoWorkingCopy(msg)
diff --git a/tests/test_git_scm_store.py b/tests/test_git_scm_store.py
@@ -103,6 +103,8 @@ def _git_init(self, path, *, separate_git_dir=None):
         if separate_git_dir:
             git_init_cmd += ["--separate-git-dir", separate_git_dir]
         subprocess.check_output(git_init_cmd, cwd=path)
+        subprocess.check_output(["git", "config", "user.email", "user@example.com"], cwd=path)
+        subprocess.check_output(["git", "config", "user.name", "User Name"], cwd=path)
         subprocess.check_output(["git", "commit", "-m", "empty", "--allow-empty"], cwd=path)
         subprocess.check_output(["git", "checkout", "-b", "factory", "-q"], cwd=path)
         subprocess.check_output(["git", "remote", "add", "origin", "https://example.com/packages/my-package.git"], cwd=path)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class Kind(str, Enum):`
`94`	`94`	`),`
`95`	`95`	`)`
`96`	`96`
`97`		`- triggered_at: str = Field(`
	`97`	`+ triggered_at: Optional[str] = Field(`
`98`	`98`	`xml_attribute=True,`
`99`	`99`	`description=textwrap.dedent(`
`100`	`100`	`"""`