wonderful
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'compare接口遵循旧版，创建文件分支名%处理' (#38) from yystopf/gitea-1156:develop into develop

This commit is contained in:
yystopf 2021-12-23 10:10:04 +08:00
parent 8cad2047c9 5fafa1c529
commit c617532f47
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/repofiles/content.go
View File

@ -188,6 +188,7 @@ func GetContents(repo *models.Repository, treePath, ref string, forList bool) (*
} }
// Handle links // Handle links
if entry.IsRegular() || entry.IsLink() { if entry.IsRegular() || entry.IsLink() {
ref = fmt.Sprintf("%s", strings.Replace(ref, "%", "%25", -1))
downloadURL, err := url.Parse(fmt.Sprintf("%s/raw/%s/%s/%s", repo.HTMLURL(), refType, ref, treePath)) downloadURL, err := url.Parse(fmt.Sprintf("%s/raw/%s/%s/%s", repo.HTMLURL(), refType, ref, treePath))
if err != nil { if err != nil {
return nil, err return nil, err

9
routers/api/v1/repo/repo.go
View File

@ -1152,8 +1152,13 @@ func PrepareCompareDiff(
ctx.ServerError("GetDiffRange", err) ctx.ServerError("GetDiffRange", err)
return false return false
} }
ctx.Data["Diff"] = diff if diff.NumFiles == 0 {
ctx.Data["DiffNotAvailable"] = diff.NumFiles == 0 ctx.Data["Diff"] = nil
ctx.Data["DiffNotAvailable"] = true
} else {
ctx.Data["Diff"] = diff
ctx.Data["DiffNotAvailable"] = false
}
return false return false
} }