mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-19 08:42:11 +01:00
Code

checkout: allow to checkout obs imported sources of scmsync sources

Browse Source 
This allows to skip the check of obs-scm-bridge and checks out what
is stored in OBS src server.

Note: This is not necessarly the same representation as in git
      (.obscpio instead of directories or sub modules).
      Also no modification can be committed.
      So this is only intended for people who understand the current
      internal implementation of the source storage. There is no
      guarantee that this won't change.

Checkout of entire project git is not working with this switch, as
the packagelist of osc is empty. It may also make no sense to do
this as it will not perform for large projects.
This commit is contained in:
Adrian Schröter 2024-09-11 09:32:39 +02:00 committed by Daniel Mach
parent aaad3c7a10
commit 8dff7f58d7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/commandline.py
View File

@ -5007,6 +5007,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='Use server side generated sources instead of local generation.')
@cmdln.option('-l', '--limit-size', metavar='limit_size',
help='Skip all files with a given size')
@cmdln.option('--native-obs-package', action='store_true',
help='Do not clone native scm repositories: Different representation and you will not be able to submit changes!')
@cmdln.alias('co')
def do_checkout(self, subcmd, opts, *args):
"""
@ -5103,7 +5105,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj_dir=project_dir, service_files=opts.source_service_files,
server_service_files=opts.server_side_source_service_files,
progress_obj=self.download_progress, size_limit=opts.limit_size,
meta=opts.meta, outdir=opts.output_dir)
meta=opts.meta, outdir=opts.output_dir, native_obs_package=opts.native_obs_package)
if os.isatty(sys.stdout.fileno()):
print_request_list(apiurl, project, package)
@ -5118,7 +5120,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
show_project_meta(apiurl, project)
scm_url = show_scmsync(apiurl, project)
if scm_url is not None:
if scm_url is not None and opts.native_obs_package is False:
if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'):
raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!')
os.putenv("OSC_VERSION", get_osc_version())
@ -5156,7 +5158,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj_dir=prj_dir, service_files=opts.source_service_files,
server_service_files=opts.server_side_source_service_files,
progress_obj=self.download_progress, size_limit=opts.limit_size,
meta=opts.meta)
meta=opts.meta, native_obs_package=opts.native_obs_package)
except oscerr.LinkExpandError as e:
print('Link cannot be expanded:\n', e, file=sys.stderr)
print('Use "osc repairlink" for fixing merge conflicts:\n', file=sys.stderr)
@ -5165,7 +5167,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
prj_dir=prj_dir, service_files=opts.source_service_files,
server_service_files=opts.server_side_source_service_files,
progress_obj=self.download_progress, size_limit=opts.limit_size,
meta=opts.meta)
meta=opts.meta, native_obs_package=opts.native_obs_package)
if os.isatty(sys.stdout.fileno()):
print_request_list(apiurl, project)

3
osc/core.py
View File

@ -3091,6 +3091,7 @@ def checkout_package(
prj_dir: Path=None,
server_service_files=None,
service_files=None,
native_obs_package=False,
progress_obj=None,
size_limit=None,
meta=False,
@ -3151,7 +3152,7 @@ def checkout_package(
meta_data = b''.join(show_package_meta(apiurl, project, package))
root = ET.fromstring(meta_data)
scmsync_element = root.find("scmsync")
if scmsync_element is not None and scmsync_element.text is not None:
if native_obs_package is False and scmsync_element is not None and scmsync_element.text is not None:
if not os.path.isfile('/usr/lib/obs/service/obs_scm_bridge'):
raise oscerr.OscIOError(None, 'Install the obs-scm-bridge package to work on packages managed in scm (git)!')
scm_url = scmsync_element.text