mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-01-10 23:52:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add support for diff and patch compare

Browse source
This commit is contained in:
mirko 2024-12-15 19:46:21 +01:00
parent 4b69aa5c10
commit 5132854603
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
routers/web/repo/compare.go
View file

@ -231,6 +231,10 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
if infoPath == "" { if infoPath == "" {
infos = []string{baseRepo.DefaultBranch, baseRepo.DefaultBranch} infos = []string{baseRepo.DefaultBranch, baseRepo.DefaultBranch}
} else { } else {
infoPath, isDiff := strings.CutSuffix(infoPath, ".diff")
ctx.Data["DownloadDiff"] = isDiff
infoPath, isPatch := strings.CutSuffix(infoPath, ".patch")
ctx.Data["DownloadPatch"] = isPatch
infos = strings.SplitN(infoPath, "...", 2) infos = strings.SplitN(infoPath, "...", 2)
if len(infos) != 2 { if len(infos) != 2 {
if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 { if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 {
@ -717,6 +721,22 @@ func CompareDiff(ctx *context.Context) {
return return
} }
if ctx.Data["DownloadDiff"].(bool) {
err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffNormal,"", ctx.Resp)
if err != nil {
ctx.ServerError("GetDiff", err)
return
}
}
if ctx.Data["DownloadPatch"].(bool) {
err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch,git.RawDiffPatch,"", ctx.Resp)
if err != nil {
ctx.ServerError("GetPatch", err)
return
}
}
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
ctx.Data["DirectComparison"] = ci.DirectComparison ctx.Data["DirectComparison"] = ci.DirectComparison
ctx.Data["OtherCompareSeparator"] = ".." ctx.Data["OtherCompareSeparator"] = ".."