Merge pull request openSUSE#1973 from dmach/stop-using_server_diff_noex

Use server_diff() instead of server_diff_noex() to exit with a non-zero return code

Author: dmach

osc/commandline.py

@@ -4822,7 +4822,6 @@ def do_diff(self, subcmd, opts, *args):
         from .core import parseargs
         from .core import run_pager
         from .core import server_diff
-        from .core import server_diff_noex
         from .store import git_is_unsupported
 
         msg = f"Command 'osc {subcmd}' is not supported with git. Use 'git diff' instead."
@@ -4903,7 +4902,7 @@ def do_diff(self, subcmd, opts, *args):
                     files = None
                 else:
                     files = args
-                diff += server_diff_noex(pac.apiurl, pac.prjname, pac.name, rev1,
+                diff += server_diff(pac.apiurl, pac.prjname, pac.name, rev1,
                                          pac.prjname, pac.name, rev2,
                                          not opts.plain, opts.missingok, opts.meta, not opts.unexpand, files=files)
         hldiff = highlight_diff(diff)
@@ -4950,7 +4949,7 @@ def do_rdiff(self, subcmd, opts, *args):
         from .core import highlight_diff
         from .core import parseRevisionOption
         from .core import run_pager
-        from .core import server_diff_noex
+        from .core import server_diff
 
         apiurl = self.get_api_url()
 
@@ -4996,7 +4995,7 @@ def do_rdiff(self, subcmd, opts, *args):
             if opts.revision:
                 rev1, rev2 = parseRevisionOption(opts.revision)
 
-        rdiff = server_diff_noex(apiurl,
+        rdiff = server_diff(apiurl,
                                  old_project, old_package, rev1,
                                  new_project, new_package, rev2, not opts.plain, opts.missingok,
                                  meta=opts.meta,
@@ -5276,7 +5275,7 @@ def do_prdiff(self, subcmd, opts, *args):
         from .core import get_request_collection
         from .core import is_project_dir
         from .core import meta_get_packagelist
-        from .core import server_diff_noex
+        from .core import server_diff
 
         if len(args) > 2:
             raise oscerr.WrongArgs('Too many arguments.')
@@ -5322,7 +5321,7 @@ def do_prdiff(self, subcmd, opts, *args):
                     print(f"old only:  {pkg}")
                 continue
 
-            rdiff = server_diff_noex(
+            rdiff = server_diff(
                 apiurl,
                 oldprj, pkg, None,
                 newprj, pkg, None,

osc/core.py

@@ -4908,7 +4908,7 @@ def get_commitlog(
             yield revision.comment or "<no message>"
             yield ""
             if patch:
-                rdiff = server_diff_noex(
+                rdiff = server_diff(
                     apiurl,
                     prj,
                     package,