Merge pull request openSUSE#1946 from dmach/git-store-osc-allow-scmurl

Make scmsync (scmurl) packages work again with git commands

Author: dmach

behave/features/osc-commands-unsupported-git.feature

@@ -285,15 +285,6 @@ Scenario: Run 'osc status'
         """
 
 
-Scenario: Run 'osc submitrequest'
-    When I execute osc with args "submitrequest"
-    Then the exit code is 1
-     And stderr is
-        """
-        Command 'osc submitrequest' is not supported with git. Use 'git-obs pr create' instead.
-        """
-
-
 Scenario: Run 'osc update'
     When I execute osc with args "update"
     Then the exit code is 1

osc/commandline.py

@@ -2003,10 +2003,6 @@ def do_submitrequest(self, subcmd, opts, *args):
         from .core import store_read_project
         from .store import git_is_unsupported
 
-        if len(args) <= 2:
-            msg = f"Command 'osc {subcmd}' is not supported with git. Use 'git-obs pr create' instead."
-            git_is_unsupported(".", msg)
-
         def _check_service(root):
             serviceinfo = root.find('serviceinfo')
             if serviceinfo is not None:

osc/git_scm/store.py

@@ -111,7 +111,7 @@ def __init__(self, path: str, *, check: bool = True):
         self._git = Git(path)
         self._check = check
 
-        if not self._git.topdir:
+        if not os.path.isdir(self.abspath) or not self._git.topdir:
             msg = f"Directory '{path}' is not a Git SCM working copy"
             raise oscerr.NoWorkingCopy(msg)
 

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) or (store.is_project and store.scmurl):
         raise oscerr.NoWorkingCopy(msg)