ClearML/clearml-agent
1
0
Fork 0
mirror of https://github.com/clearml/clearml-agent synced 2025-04-05 21:15:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ssh filter into regex and use list.insert in path

Browse Source
This commit is contained in:
Mads Oestergaard 2024-02-02 10:50:52 +01:00
parent 04fa8a9a86
commit f640eb6707
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clearml_agent/helper/repo.py
View File

@ -219,13 +219,15 @@ class VCS(object):
return branch return branch
# parse scp-like git ssh URLs, e.g: git@host:user/project.git # parse scp-like git ssh URLs, e.g: git@host:user/project.git
# or git@ssh.dev.azure.com:v3/org/project/repo
SSH_URL_GIT_SYNTAX = re.compile( SSH_URL_GIT_SYNTAX = re.compile(
r""" r"""
^ ^
(?:(?P<user>{regular}*?)@)? (?:(?P<user>{regular}*?)@)?
(?:ssh\.)?
(?P<host>{regular}*?) (?P<host>{regular}*?)
: :
(?:v3/)? # present in azure ssh urls (?:v3/)?
(?P<path>{regular}.*)? (?P<path>{regular}.*)?
$ $
""".format( """.format(
@ -255,14 +257,12 @@ class VCS(object):
if match: if match:
user, host, path = match.groups() user, host, path = match.groups()
# handle special azure cases # handle the dev.azure format by inserting _git between project and repo
if "ssh" and "azure" in host: # as format is https://dev.azure.com/{organization}/{project}/_git/{repo}
host = host.replace("ssh.", "") if "azure" in host:
# azure http url is different than ssh url
# the format is https://dev.azure.com/{organization}/{project}/_git/{repo}
path_components = path.split("/") path_components = path.split("/")
path = "/".join(path_components[:-1]) + "/_git/" + path_components[-1] path_components.insert(-1, "_git")
path = "/".join(path_components)
return ( return (
furl() furl()