From eb69c7ec8c1f732c67978355f6efff1f7dfe2fac Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Mon, 6 Dec 2021 11:04:07 -0600 Subject: Allow default branch to be inferred on compare page (#17908) * Allow default branch to be inferred Signed-off-by: jolheiser * Add test for inferred default branch Signed-off-by: jolheiser Co-authored-by: Lunny Xiao --- routers/web/repo/compare.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'routers/web') diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 865a734caf..54d7e77f2d 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -186,6 +186,9 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo { // 1. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headBranch} // 2. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headOwner}:{:headBranch} // 3. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headOwner}/{:headRepoName}:{:headBranch} + // 4. /{:baseOwner}/{:baseRepoName}/compare/{:headBranch} + // 5. /{:baseOwner}/{:baseRepoName}/compare/{:headOwner}:{:headBranch} + // 6. /{:baseOwner}/{:baseRepoName}/compare/{:headOwner}/{:headRepoName}:{:headBranch} // // Here we obtain the infoPath "{:baseBranch}...[{:headOwner}/{:headRepoName}:]{:headBranch}" as ctx.Params("*") // with the :baseRepo in ctx.Repo. @@ -213,9 +216,12 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo { infos := strings.SplitN(infoPath, "...", 2) if len(infos) != 2 { - infos = strings.SplitN(infoPath, "..", 2) - ci.DirectComparison = true - ctx.Data["PageIsComparePull"] = false + infos = []string{baseRepo.DefaultBranch, infoPath} + if strings.Contains(infoPath, "..") { + infos = strings.SplitN(infoPath, "..", 2) + ci.DirectComparison = true + ctx.Data["PageIsComparePull"] = false + } } if len(infos) != 2 { -- cgit v1.2.3