mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-11-26 14:39:50 +01:00
Code Activity

Add 'remote' argument to gitea_api.Repo.clone_or_update()

Browse Source
This commit is contained in:
Daniel Mach
2025-10-15 14:49:03 +02:00
parent 089ad90fae
commit e860043815
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osc/gitea_api/repo.py
View File

@@ -205,9 +205,10 @@ class Repo(GiteaModel):
*,
pr_number: Optional[int] = None,
branch: Optional[str] = None,
commit: str,
commit: Optional[str] = None,
directory: str,
reference: Optional[str] = None,
remote: Optional[str] = None,
):
from osc import gitea_api
@@ -225,7 +226,7 @@ class Repo(GiteaModel):
)
git = gitea_api.Git(directory)
git_owner, git_repo = git.get_owner_repo()
git_owner, git_repo = git.get_owner_repo(remote)
assert git_owner.lower() == owner.lower(), f"owner does not match: {git_owner} != {owner}"
assert git_repo.lower() == repo.lower(), f"repo does not match: {git_repo} != {repo}"
@@ -243,14 +244,17 @@ class Repo(GiteaModel):
elif branch:
git.switch(branch)
# run 'git fetch' only when the branch head is different to the expected commit
head_commit = git.get_branch_head()
if head_commit != commit:
git.fetch()
if commit:
# run 'git fetch' only when the branch head is different to the expected commit
head_commit = git.get_branch_head()
if head_commit != commit:
git.fetch()
if not git.branch_contains_commit(commit=commit, remote="origin"):
raise RuntimeError(f"Branch '{branch}' doesn't contain commit '{commit}'")
git.reset(commit, hard=True)
if not git.branch_contains_commit(commit=commit, remote="origin"):
raise RuntimeError(f"Branch '{branch}' doesn't contain commit '{commit}'")
git.reset(commit, hard=True)
else:
git.fetch()
else:
raise ValueError("Either 'pr_number' or 'branch' must be specified")