Merge pull request #777 from Lingghh/dev/support_svn_https

🎨支持svn https链接格式
Tencent · Feb 22, 2023 · a936c30 · a936c30
2 parents dade06e + f692ac5
commit a936c30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/server/projects/main/apps/codeproj/serializers/base.py b/server/projects/main/apps/codeproj/serializers/base.py
@@ -1175,7 +1175,7 @@ def check_branch_validate(self, repo, branch):
         if repo.scm_type == models.Repository.ScmTypeEnum.GIT:
             scm_url = "%s#%s" % (repo.get_scm_url_with_auth(), branch)
         else:
-            scm_url = "%s/%s" % (repo.scm_url, branch)
+            scm_url = "%s/%s" % (repo.get_scm_url_with_auth(), branch)
         logger.info("check branch validate: %s" % scm_url)
         scm_client = core.ScmClientManager.get_scm_client_with_repo(repo, scm_url=scm_url)
         try:
@@ -1312,7 +1312,7 @@ def check_branch_validate(self, repo, branch):
         if repo.scm_type == models.Repository.ScmTypeEnum.GIT:
             scm_url = "%s#%s" % (repo.get_scm_url_with_auth(), branch)
         else:
-            scm_url = "%s/%s" % (repo.scm_url, branch)
+            scm_url = "%s/%s" % (repo.get_scm_url_with_auth(), branch)
         logger.info("check branch validate: %s" % scm_url)
         scm_client = core.ScmClientManager.get_scm_client_with_repo(repo, scm_url=scm_url)
         try:

diff --git a/server/projects/scmproxy/lib/_cmdsvn.cpython-37m-aarch64-linux-gnu.so b/server/projects/scmproxy/lib/_cmdsvn.cpython-37m-aarch64-linux-gnu.so
diff --git a/server/projects/scmproxy/lib/_cmdsvn.cpython-37m-x86_64-linux-gnu.so b/server/projects/scmproxy/lib/_cmdsvn.cpython-37m-x86_64-linux-gnu.so