Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-06-04 03:46:53 +02:00
Code Issues Activity

cover all head ref format cases

Browse Source
This commit is contained in:
badhezi 2025-05-29 16:04:16 +03:00
parent c80f0b9d46
commit e9fac73bcf
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
routers/web/repo/compare.go
View File

@ -234,25 +234,6 @@ 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 {
// check if head is a branch or tag only if infoPath ends with .diff or .patch
if strings.HasSuffix(infoPath, ".diff") || strings.HasSuffix(infoPath, ".patch") {
infos = strings.SplitN(infoPath, "...", 2)
if len(infos) != 2 {
infos = strings.SplitN(infoPath, "..", 2) // match github behavior
}
ref2IsBranch := gitrepo.IsBranchExist(ctx, ctx.Repo.Repository, infos[1])
ref2IsTag := gitrepo.IsTagExist(ctx, ctx.Repo.Repository, infos[1])
if !ref2IsBranch && !ref2IsTag {
if strings.HasSuffix(infoPath, ".diff") {
ci.RawDiffType = git.RawDiffNormal
infoPath = strings.TrimSuffix(infoPath, ".diff")
} else if strings.HasSuffix(infoPath, ".patch") {
ci.RawDiffType = git.RawDiffPatch
infoPath = strings.TrimSuffix(infoPath, ".patch")
}
}
}
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 {
@ -273,7 +254,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
if len(headInfos) == 1 { if len(headInfos) == 1 {
isSameRepo = true isSameRepo = true
ci.HeadUser = ctx.Repo.Owner ci.HeadUser = ctx.Repo.Owner
ci.HeadBranch = headInfos[0] ci.HeadBranch = parseRefForRawDiff(ctx, ci, headInfos[0])
} else if len(headInfos) == 2 { } else if len(headInfos) == 2 {
headInfosSplit := strings.Split(headInfos[0], "/") headInfosSplit := strings.Split(headInfos[0], "/")
if len(headInfosSplit) == 1 { if len(headInfosSplit) == 1 {
@ -286,7 +267,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
} }
return nil return nil
} }
ci.HeadBranch = headInfos[1] ci.HeadBranch = parseRefForRawDiff(ctx, ci, headInfos[1])
isSameRepo = ci.HeadUser.ID == ctx.Repo.Owner.ID isSameRepo = ci.HeadUser.ID == ctx.Repo.Owner.ID
if isSameRepo { if isSameRepo {
ci.HeadRepo = baseRepo ci.HeadRepo = baseRepo
@ -309,7 +290,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
} }
return nil return nil
} }
ci.HeadBranch = headInfos[1] ci.HeadBranch = parseRefForRawDiff(ctx, ci, headInfos[1])
ci.HeadUser = ci.HeadRepo.Owner ci.HeadUser = ci.HeadRepo.Owner
isSameRepo = ci.HeadRepo.ID == ctx.Repo.Repository.ID isSameRepo = ci.HeadRepo.ID == ctx.Repo.Repository.ID
} }
@ -317,6 +298,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
ctx.NotFound(nil) ctx.NotFound(nil)
return nil return nil
} }
ctx.Data["HeadUser"] = ci.HeadUser ctx.Data["HeadUser"] = ci.HeadUser
ctx.Data["HeadBranch"] = ci.HeadBranch ctx.Data["HeadBranch"] = ci.HeadBranch
ctx.Repo.PullRequest.SameRepo = isSameRepo ctx.Repo.PullRequest.SameRepo = isSameRepo
@ -1016,3 +998,26 @@ func getExcerptLines(commit *git.Commit, filePath string, idxLeft, idxRight, chu
} }
return diffLines, nil return diffLines, nil
} }
func parseRefForRawDiff(ctx *context.Context, ci *common.CompareInfo, ref string) string {
if strings.HasSuffix(ref, ".diff") || strings.HasSuffix(ref, ".patch") {
var headRepo *repo_model.Repository
if ci.HeadRepo != nil {
headRepo = ci.HeadRepo
} else {
headRepo = ctx.Repo.Repository
}
ref2IsBranch := gitrepo.IsBranchExist(ctx, headRepo, ref)
ref2IsTag := gitrepo.IsTagExist(ctx, headRepo, ref)
if !ref2IsBranch && !ref2IsTag {
if strings.HasSuffix(ref, ".diff") {
ci.RawDiffType = git.RawDiffNormal
ref = strings.TrimSuffix(ref, ".diff")
} else if strings.HasSuffix(ref, ".patch") {
ci.RawDiffType = git.RawDiffPatch
ref = strings.TrimSuffix(ref, ".patch")
}
}
}
return ref
}