2019-06-07 16:29:29 -04:00
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
|
|
package repo
|
|
|
|
|
|
|
|
|
|
import (
|
2019-11-14 21:52:59 -05:00
|
|
|
"bufio"
|
2019-10-04 15:58:54 -04:00
|
|
|
"fmt"
|
2019-11-14 21:52:59 -05:00
|
|
|
"html"
|
2019-06-07 16:29:29 -04:00
|
|
|
"path"
|
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/models"
|
|
|
|
|
"code.gitea.io/gitea/modules/base"
|
|
|
|
|
"code.gitea.io/gitea/modules/context"
|
|
|
|
|
"code.gitea.io/gitea/modules/git"
|
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2019-09-05 22:20:09 -04:00
|
|
|
"code.gitea.io/gitea/services/gitdiff"
|
2019-06-07 16:29:29 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
const (
|
2019-11-14 21:52:59 -05:00
|
|
|
tplCompare base.TplName = "repo/diff/compare"
|
|
|
|
|
tplBlobExcerpt base.TplName = "repo/diff/blob_excerpt"
|
2019-06-07 16:29:29 -04:00
|
|
|
)
|
|
|
|
|
|
2019-10-04 15:58:54 -04:00
|
|
|
// setPathsCompareContext sets context data for source and raw paths
|
|
|
|
|
func setPathsCompareContext(ctx *context.Context, base *git.Commit, head *git.Commit, headTarget string) {
|
|
|
|
|
sourcePath := setting.AppSubURL + "/%s/src/commit/%s"
|
|
|
|
|
rawPath := setting.AppSubURL + "/%s/raw/commit/%s"
|
|
|
|
|
|
|
|
|
|
ctx.Data["SourcePath"] = fmt.Sprintf(sourcePath, headTarget, head.ID)
|
|
|
|
|
ctx.Data["RawPath"] = fmt.Sprintf(rawPath, headTarget, head.ID)
|
|
|
|
|
if base != nil {
|
|
|
|
|
baseTarget := path.Join(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
|
|
|
|
|
ctx.Data["BeforeSourcePath"] = fmt.Sprintf(sourcePath, baseTarget, base.ID)
|
|
|
|
|
ctx.Data["BeforeRawPath"] = fmt.Sprintf(rawPath, baseTarget, base.ID)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// setImageCompareContext sets context data that is required by image compare template
|
|
|
|
|
func setImageCompareContext(ctx *context.Context, base *git.Commit, head *git.Commit) {
|
|
|
|
|
ctx.Data["IsImageFileInHead"] = head.IsImageFile
|
|
|
|
|
ctx.Data["IsImageFileInBase"] = base.IsImageFile
|
|
|
|
|
ctx.Data["ImageInfoBase"] = func(name string) *git.ImageMetaData {
|
|
|
|
|
if base == nil {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
result, err := base.ImageInfo(name)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Error("ImageInfo failed: %v", err)
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["ImageInfo"] = func(name string) *git.ImageMetaData {
|
|
|
|
|
result, err := head.ImageInfo(name)
|
|
|
|
|
if err != nil {
|
|
|
|
|
log.Error("ImageInfo failed: %v", err)
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
return result
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
// ParseCompareInfo parse compare info between two commit for preparing comparing references
|
|
|
|
|
func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *git.Repository, *git.CompareInfo, string, string) {
|
|
|
|
|
baseRepo := ctx.Repo.Repository
|
|
|
|
|
|
|
|
|
|
// Get compared branches information
|
2020-05-12 01:52:46 -04:00
|
|
|
// A full compare url is of the form:
|
|
|
|
|
//
|
|
|
|
|
// 1. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headBranch}
|
|
|
|
|
// 2. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headOwner}:{:headBranch}
|
|
|
|
|
// 3. /{:baseOwner}/{:baseRepoName}/compare/{:baseBranch}...{:headOwner}/{:headRepoName}:{:headBranch}
|
|
|
|
|
//
|
|
|
|
|
// Here we obtain the infoPath "{:baseBranch}...[{:headOwner}/{:headRepoName}:]{:headBranch}" as ctx.Params("*")
|
|
|
|
|
// with the :baseRepo in ctx.Repo.
|
|
|
|
|
//
|
|
|
|
|
// Note: Generally :headRepoName is not provided here - we are only passed :headOwner.
|
|
|
|
|
//
|
|
|
|
|
// How do we determine the :headRepo?
|
|
|
|
|
//
|
|
|
|
|
// 1. If :headOwner is not set then the :headRepo = :baseRepo
|
|
|
|
|
// 2. If :headOwner is set - then look for the fork of :baseRepo owned by :headOwner
|
|
|
|
|
// 3. But... :baseRepo could be a fork of :headOwner's repo - so check that
|
|
|
|
|
// 4. Now, :baseRepo and :headRepos could be forks of the same repo - so check that
|
|
|
|
|
//
|
2019-06-07 16:29:29 -04:00
|
|
|
// format: <base branch>...[<head repo>:]<head branch>
|
|
|
|
|
// base<-head: master...head:feature
|
|
|
|
|
// same repo: master...feature
|
|
|
|
|
|
|
|
|
|
var (
|
|
|
|
|
headUser *models.User
|
2020-05-12 01:52:46 -04:00
|
|
|
headRepo *models.Repository
|
2019-06-07 16:29:29 -04:00
|
|
|
headBranch string
|
|
|
|
|
isSameRepo bool
|
|
|
|
|
infoPath string
|
|
|
|
|
err error
|
|
|
|
|
)
|
|
|
|
|
infoPath = ctx.Params("*")
|
2020-05-12 01:52:46 -04:00
|
|
|
infos := strings.SplitN(infoPath, "...", 2)
|
2019-06-07 16:29:29 -04:00
|
|
|
if len(infos) != 2 {
|
|
|
|
|
log.Trace("ParseCompareInfo[%d]: not enough compared branches information %s", baseRepo.ID, infos)
|
|
|
|
|
ctx.NotFound("CompareAndPullRequest", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
ctx.Data["BaseName"] = baseRepo.OwnerName
|
2019-06-07 16:29:29 -04:00
|
|
|
baseBranch := infos[0]
|
|
|
|
|
ctx.Data["BaseBranch"] = baseBranch
|
|
|
|
|
|
|
|
|
|
// If there is no head repository, it means compare between same repository.
|
|
|
|
|
headInfos := strings.Split(infos[1], ":")
|
|
|
|
|
if len(headInfos) == 1 {
|
|
|
|
|
isSameRepo = true
|
|
|
|
|
headUser = ctx.Repo.Owner
|
|
|
|
|
headBranch = headInfos[0]
|
|
|
|
|
|
|
|
|
|
} else if len(headInfos) == 2 {
|
2020-05-12 01:52:46 -04:00
|
|
|
headInfosSplit := strings.Split(headInfos[0], "/")
|
|
|
|
|
if len(headInfosSplit) == 1 {
|
|
|
|
|
headUser, err = models.GetUserByName(headInfos[0])
|
|
|
|
|
if err != nil {
|
|
|
|
|
if models.IsErrUserNotExist(err) {
|
|
|
|
|
ctx.NotFound("GetUserByName", nil)
|
|
|
|
|
} else {
|
|
|
|
|
ctx.ServerError("GetUserByName", err)
|
|
|
|
|
}
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
2019-06-07 16:29:29 -04:00
|
|
|
}
|
2020-05-12 01:52:46 -04:00
|
|
|
headBranch = headInfos[1]
|
|
|
|
|
isSameRepo = headUser.ID == ctx.Repo.Owner.ID
|
|
|
|
|
if isSameRepo {
|
|
|
|
|
headRepo = baseRepo
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
headRepo, err = models.GetRepositoryByOwnerAndName(headInfosSplit[0], headInfosSplit[1])
|
|
|
|
|
if err != nil {
|
|
|
|
|
if models.IsErrRepoNotExist(err) {
|
|
|
|
|
ctx.NotFound("GetRepositoryByOwnerAndName", nil)
|
|
|
|
|
} else {
|
|
|
|
|
ctx.ServerError("GetRepositoryByOwnerAndName", err)
|
|
|
|
|
}
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
if err := headRepo.GetOwner(); err != nil {
|
|
|
|
|
if models.IsErrUserNotExist(err) {
|
|
|
|
|
ctx.NotFound("GetUserByName", nil)
|
|
|
|
|
} else {
|
|
|
|
|
ctx.ServerError("GetUserByName", err)
|
|
|
|
|
}
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
headBranch = headInfos[1]
|
|
|
|
|
headUser = headRepo.Owner
|
|
|
|
|
isSameRepo = headRepo.ID == ctx.Repo.Repository.ID
|
2019-06-07 16:29:29 -04:00
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ctx.NotFound("CompareAndPullRequest", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["HeadUser"] = headUser
|
|
|
|
|
ctx.Data["HeadBranch"] = headBranch
|
|
|
|
|
ctx.Repo.PullRequest.SameRepo = isSameRepo
|
|
|
|
|
|
|
|
|
|
// Check if base branch is valid.
|
|
|
|
|
baseIsCommit := ctx.Repo.GitRepo.IsCommitExist(baseBranch)
|
|
|
|
|
baseIsBranch := ctx.Repo.GitRepo.IsBranchExist(baseBranch)
|
|
|
|
|
baseIsTag := ctx.Repo.GitRepo.IsTagExist(baseBranch)
|
|
|
|
|
if !baseIsCommit && !baseIsBranch && !baseIsTag {
|
|
|
|
|
// Check if baseBranch is short sha commit hash
|
|
|
|
|
if baseCommit, _ := ctx.Repo.GitRepo.GetCommit(baseBranch); baseCommit != nil {
|
|
|
|
|
baseBranch = baseCommit.ID.String()
|
|
|
|
|
ctx.Data["BaseBranch"] = baseBranch
|
|
|
|
|
baseIsCommit = true
|
|
|
|
|
} else {
|
|
|
|
|
ctx.NotFound("IsRefExist", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["BaseIsCommit"] = baseIsCommit
|
|
|
|
|
ctx.Data["BaseIsBranch"] = baseIsBranch
|
|
|
|
|
ctx.Data["BaseIsTag"] = baseIsTag
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
// Now we have the repository that represents the base
|
|
|
|
|
|
|
|
|
|
// The current base and head repositories and branches may not
|
|
|
|
|
// actually be the intended branches that the user wants to
|
|
|
|
|
// create a pull-request from - but also determining the head
|
|
|
|
|
// repo is difficult.
|
|
|
|
|
|
|
|
|
|
// We will want therefore to offer a few repositories to set as
|
|
|
|
|
// our base and head
|
|
|
|
|
|
|
|
|
|
// 1. First if the baseRepo is a fork get the "RootRepo" it was
|
|
|
|
|
// forked from
|
|
|
|
|
var rootRepo *models.Repository
|
|
|
|
|
if baseRepo.IsFork {
|
|
|
|
|
err = baseRepo.GetBaseRepo()
|
|
|
|
|
if err != nil {
|
|
|
|
|
if !models.IsErrRepoNotExist(err) {
|
|
|
|
|
ctx.ServerError("Unable to find root repo", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
rootRepo = baseRepo.BaseRepo
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 2. Now if the current user is not the owner of the baseRepo,
|
|
|
|
|
// check if they have a fork of the base repo and offer that as
|
|
|
|
|
// "OwnForkRepo"
|
|
|
|
|
var ownForkRepo *models.Repository
|
2020-05-15 16:44:33 -04:00
|
|
|
if ctx.User != nil && baseRepo.OwnerID != ctx.User.ID {
|
2020-05-12 01:52:46 -04:00
|
|
|
repo, has := models.HasForkedRepo(ctx.User.ID, baseRepo.ID)
|
|
|
|
|
if has {
|
|
|
|
|
ownForkRepo = repo
|
|
|
|
|
ctx.Data["OwnForkRepo"] = ownForkRepo
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
has := headRepo != nil
|
|
|
|
|
// 3. If the base is a forked from "RootRepo" and the owner of
|
|
|
|
|
// the "RootRepo" is the :headUser - set headRepo to that
|
|
|
|
|
if !has && rootRepo != nil && rootRepo.OwnerID == headUser.ID {
|
|
|
|
|
headRepo = rootRepo
|
|
|
|
|
has = true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 4. If the ctx.User has their own fork of the baseRepo and the headUser is the ctx.User
|
|
|
|
|
// set the headRepo to the ownFork
|
|
|
|
|
if !has && ownForkRepo != nil && ownForkRepo.OwnerID == headUser.ID {
|
|
|
|
|
headRepo = ownForkRepo
|
|
|
|
|
has = true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 5. If the headOwner has a fork of the baseRepo - use that
|
|
|
|
|
if !has {
|
|
|
|
|
headRepo, has = models.HasForkedRepo(headUser.ID, baseRepo.ID)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 6. If the baseRepo is a fork and the headUser has a fork of that use that
|
|
|
|
|
if !has && baseRepo.IsFork {
|
|
|
|
|
headRepo, has = models.HasForkedRepo(headUser.ID, baseRepo.ForkID)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 7. Otherwise if we're not the same repo and haven't found a repo give up
|
|
|
|
|
if !isSameRepo && !has {
|
2019-06-07 16:29:29 -04:00
|
|
|
ctx.Data["PageIsComparePull"] = false
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
// 8. Finally open the git repo
|
2019-06-07 16:29:29 -04:00
|
|
|
var headGitRepo *git.Repository
|
|
|
|
|
if isSameRepo {
|
|
|
|
|
headRepo = ctx.Repo.Repository
|
|
|
|
|
headGitRepo = ctx.Repo.GitRepo
|
2020-05-12 01:52:46 -04:00
|
|
|
} else if has {
|
|
|
|
|
headGitRepo, err = git.OpenRepository(headRepo.RepoPath())
|
2019-06-07 16:29:29 -04:00
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("OpenRepository", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
2020-01-16 14:59:07 -05:00
|
|
|
defer headGitRepo.Close()
|
2019-06-07 16:29:29 -04:00
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
ctx.Data["HeadRepo"] = headRepo
|
|
|
|
|
|
|
|
|
|
// Now we need to assert that the ctx.User has permission to read
|
|
|
|
|
// the baseRepo's code and pulls
|
|
|
|
|
// (NOT headRepo's)
|
2019-06-07 16:29:29 -04:00
|
|
|
permBase, err := models.GetUserRepoPermission(baseRepo, ctx.User)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetUserRepoPermission", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
if !permBase.CanRead(models.UnitTypeCode) {
|
|
|
|
|
if log.IsTrace() {
|
|
|
|
|
log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in baseRepo has Permissions: %-+v",
|
|
|
|
|
ctx.User,
|
|
|
|
|
baseRepo,
|
|
|
|
|
permBase)
|
|
|
|
|
}
|
|
|
|
|
ctx.NotFound("ParseCompareInfo", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
// If we're not merging from the same repo:
|
2020-01-16 14:59:07 -05:00
|
|
|
if !isSameRepo {
|
2020-05-12 01:52:46 -04:00
|
|
|
// Assert ctx.User has permission to read headRepo's codes
|
2020-01-16 14:59:07 -05:00
|
|
|
permHead, err := models.GetUserRepoPermission(headRepo, ctx.User)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetUserRepoPermission", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
if !permHead.CanRead(models.UnitTypeCode) {
|
|
|
|
|
if log.IsTrace() {
|
|
|
|
|
log.Trace("Permission Denied: User: %-v cannot read code in Repo: %-v\nUser in headRepo has Permissions: %-+v",
|
|
|
|
|
ctx.User,
|
|
|
|
|
headRepo,
|
|
|
|
|
permHead)
|
|
|
|
|
}
|
|
|
|
|
ctx.NotFound("ParseCompareInfo", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
2019-06-07 16:29:29 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
// If we have a rootRepo and it's different from:
|
|
|
|
|
// 1. the computed base
|
|
|
|
|
// 2. the computed head
|
|
|
|
|
// then get the branches of it
|
|
|
|
|
if rootRepo != nil &&
|
|
|
|
|
rootRepo.ID != headRepo.ID &&
|
|
|
|
|
rootRepo.ID != baseRepo.ID {
|
|
|
|
|
perm, branches, err := getBranchesForRepo(ctx.User, rootRepo)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetBranchesForRepo", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
if perm {
|
|
|
|
|
ctx.Data["RootRepo"] = rootRepo
|
|
|
|
|
ctx.Data["RootRepoBranches"] = branches
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If we have a ownForkRepo and it's different from:
|
|
|
|
|
// 1. The computed base
|
|
|
|
|
// 2. The computed hea
|
|
|
|
|
// 3. The rootRepo (if we have one)
|
|
|
|
|
// then get the branches from it.
|
|
|
|
|
if ownForkRepo != nil &&
|
|
|
|
|
ownForkRepo.ID != headRepo.ID &&
|
|
|
|
|
ownForkRepo.ID != baseRepo.ID &&
|
|
|
|
|
(rootRepo == nil || ownForkRepo.ID != rootRepo.ID) {
|
|
|
|
|
perm, branches, err := getBranchesForRepo(ctx.User, ownForkRepo)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetBranchesForRepo", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
if perm {
|
|
|
|
|
ctx.Data["OwnForkRepo"] = ownForkRepo
|
|
|
|
|
ctx.Data["OwnForkRepoBranches"] = branches
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
// Check if head branch is valid.
|
2020-01-16 14:59:07 -05:00
|
|
|
headIsCommit := headGitRepo.IsCommitExist(headBranch)
|
2019-06-07 16:29:29 -04:00
|
|
|
headIsBranch := headGitRepo.IsBranchExist(headBranch)
|
|
|
|
|
headIsTag := headGitRepo.IsTagExist(headBranch)
|
|
|
|
|
if !headIsCommit && !headIsBranch && !headIsTag {
|
|
|
|
|
// Check if headBranch is short sha commit hash
|
2020-01-16 14:59:07 -05:00
|
|
|
if headCommit, _ := headGitRepo.GetCommit(headBranch); headCommit != nil {
|
2019-06-07 16:29:29 -04:00
|
|
|
headBranch = headCommit.ID.String()
|
|
|
|
|
ctx.Data["HeadBranch"] = headBranch
|
|
|
|
|
headIsCommit = true
|
|
|
|
|
} else {
|
|
|
|
|
ctx.NotFound("IsRefExist", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["HeadIsCommit"] = headIsCommit
|
|
|
|
|
ctx.Data["HeadIsBranch"] = headIsBranch
|
|
|
|
|
ctx.Data["HeadIsTag"] = headIsTag
|
|
|
|
|
|
|
|
|
|
// Treat as pull request if both references are branches
|
|
|
|
|
if ctx.Data["PageIsComparePull"] == nil {
|
|
|
|
|
ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ctx.Data["PageIsComparePull"] == true && !permBase.CanReadIssuesOrPulls(true) {
|
|
|
|
|
if log.IsTrace() {
|
|
|
|
|
log.Trace("Permission Denied: User: %-v cannot create/read pull requests in Repo: %-v\nUser in baseRepo has Permissions: %-+v",
|
|
|
|
|
ctx.User,
|
|
|
|
|
baseRepo,
|
|
|
|
|
permBase)
|
|
|
|
|
}
|
|
|
|
|
ctx.NotFound("ParseCompareInfo", nil)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-11 19:49:47 -04:00
|
|
|
baseBranchRef := baseBranch
|
|
|
|
|
if baseIsBranch {
|
|
|
|
|
baseBranchRef = git.BranchPrefix + baseBranch
|
|
|
|
|
} else if baseIsTag {
|
|
|
|
|
baseBranchRef = git.TagPrefix + baseBranch
|
|
|
|
|
}
|
|
|
|
|
headBranchRef := headBranch
|
|
|
|
|
if headIsBranch {
|
|
|
|
|
headBranchRef = git.BranchPrefix + headBranch
|
|
|
|
|
} else if headIsTag {
|
|
|
|
|
headBranchRef = git.TagPrefix + headBranch
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
compareInfo, err := headGitRepo.GetCompareInfo(baseRepo.RepoPath(), baseBranchRef, headBranchRef)
|
2019-06-07 16:29:29 -04:00
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetCompareInfo", err)
|
|
|
|
|
return nil, nil, nil, nil, "", ""
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["BeforeCommitID"] = compareInfo.MergeBase
|
|
|
|
|
|
|
|
|
|
return headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// PrepareCompareDiff renders compare diff page
|
|
|
|
|
func PrepareCompareDiff(
|
|
|
|
|
ctx *context.Context,
|
|
|
|
|
headUser *models.User,
|
|
|
|
|
headRepo *models.Repository,
|
|
|
|
|
headGitRepo *git.Repository,
|
|
|
|
|
compareInfo *git.CompareInfo,
|
|
|
|
|
baseBranch, headBranch string) bool {
|
|
|
|
|
|
|
|
|
|
var (
|
|
|
|
|
repo = ctx.Repo.Repository
|
|
|
|
|
err error
|
|
|
|
|
title string
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Get diff information.
|
|
|
|
|
ctx.Data["CommitRepoLink"] = headRepo.Link()
|
|
|
|
|
|
|
|
|
|
headCommitID := headBranch
|
|
|
|
|
if ctx.Data["HeadIsCommit"] == false {
|
|
|
|
|
if ctx.Data["HeadIsTag"] == true {
|
|
|
|
|
headCommitID, err = headGitRepo.GetTagCommitID(headBranch)
|
|
|
|
|
} else {
|
|
|
|
|
headCommitID, err = headGitRepo.GetBranchCommitID(headBranch)
|
|
|
|
|
}
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetRefCommitID", err)
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ctx.Data["AfterCommitID"] = headCommitID
|
|
|
|
|
|
|
|
|
|
if headCommitID == compareInfo.MergeBase {
|
|
|
|
|
ctx.Data["IsNothingToCompare"] = true
|
|
|
|
|
return true
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-05 22:20:09 -04:00
|
|
|
diff, err := gitdiff.GetDiffRange(models.RepoPath(headUser.Name, headRepo.Name),
|
2019-06-07 16:29:29 -04:00
|
|
|
compareInfo.MergeBase, headCommitID, setting.Git.MaxGitDiffLines,
|
|
|
|
|
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetDiffRange", err)
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["Diff"] = diff
|
2020-05-26 01:58:07 -04:00
|
|
|
ctx.Data["DiffNotAvailable"] = diff.NumFiles == 0
|
2019-06-07 16:29:29 -04:00
|
|
|
|
|
|
|
|
headCommit, err := headGitRepo.GetCommit(headCommitID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetCommit", err)
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-16 05:03:22 -04:00
|
|
|
baseGitRepo := ctx.Repo.GitRepo
|
|
|
|
|
baseCommitID := baseBranch
|
|
|
|
|
if ctx.Data["BaseIsCommit"] == false {
|
|
|
|
|
if ctx.Data["BaseIsTag"] == true {
|
|
|
|
|
baseCommitID, err = baseGitRepo.GetTagCommitID(baseBranch)
|
|
|
|
|
} else {
|
|
|
|
|
baseCommitID, err = baseGitRepo.GetBranchCommitID(baseBranch)
|
|
|
|
|
}
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetRefCommitID", err)
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
baseCommit, err := baseGitRepo.GetCommit(baseCommitID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetCommit", err)
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
compareInfo.Commits = models.ValidateCommitsWithEmails(compareInfo.Commits)
|
2020-02-27 14:20:55 -05:00
|
|
|
compareInfo.Commits = models.ParseCommitsWithSignature(compareInfo.Commits, headRepo)
|
2019-06-07 16:29:29 -04:00
|
|
|
compareInfo.Commits = models.ParseCommitsWithStatus(compareInfo.Commits, headRepo)
|
|
|
|
|
ctx.Data["Commits"] = compareInfo.Commits
|
|
|
|
|
ctx.Data["CommitCount"] = compareInfo.Commits.Len()
|
|
|
|
|
|
|
|
|
|
if compareInfo.Commits.Len() == 1 {
|
|
|
|
|
c := compareInfo.Commits.Front().Value.(models.SignCommitWithStatuses)
|
|
|
|
|
title = strings.TrimSpace(c.UserCommit.Summary())
|
|
|
|
|
|
|
|
|
|
body := strings.Split(strings.TrimSpace(c.UserCommit.Message()), "\n")
|
|
|
|
|
if len(body) > 1 {
|
|
|
|
|
ctx.Data["content"] = strings.Join(body[1:], "\n")
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
title = headBranch
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["title"] = title
|
|
|
|
|
ctx.Data["Username"] = headUser.Name
|
|
|
|
|
ctx.Data["Reponame"] = headRepo.Name
|
|
|
|
|
|
2019-10-04 15:58:54 -04:00
|
|
|
setImageCompareContext(ctx, baseCommit, headCommit)
|
2019-06-07 16:29:29 -04:00
|
|
|
headTarget := path.Join(headUser.Name, repo.Name)
|
2019-10-04 15:58:54 -04:00
|
|
|
setPathsCompareContext(ctx, baseCommit, headCommit, headTarget)
|
2019-09-16 05:03:22 -04:00
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
func getBranchesForRepo(user *models.User, repo *models.Repository) (bool, []string, error) {
|
|
|
|
|
perm, err := models.GetUserRepoPermission(repo, user)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return false, nil, err
|
2019-10-30 01:58:18 -04:00
|
|
|
}
|
2020-05-12 01:52:46 -04:00
|
|
|
if !perm.CanRead(models.UnitTypeCode) {
|
|
|
|
|
return false, nil, nil
|
2019-10-30 01:58:18 -04:00
|
|
|
}
|
2020-05-12 01:52:46 -04:00
|
|
|
gitRepo, err := git.OpenRepository(repo.RepoPath())
|
2019-10-30 01:58:18 -04:00
|
|
|
if err != nil {
|
2020-05-12 01:52:46 -04:00
|
|
|
return false, nil, err
|
2019-10-30 01:58:18 -04:00
|
|
|
}
|
2020-05-12 01:52:46 -04:00
|
|
|
defer gitRepo.Close()
|
2019-11-13 02:01:19 -05:00
|
|
|
|
2020-05-12 01:52:46 -04:00
|
|
|
branches, err := gitRepo.GetBranches()
|
2019-10-30 01:58:18 -04:00
|
|
|
if err != nil {
|
2020-05-12 01:52:46 -04:00
|
|
|
return false, nil, err
|
2019-10-30 01:58:18 -04:00
|
|
|
}
|
2020-05-12 01:52:46 -04:00
|
|
|
return true, branches, nil
|
2019-10-30 01:58:18 -04:00
|
|
|
}
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
// CompareDiff show different from one commit to another commit
|
|
|
|
|
func CompareDiff(ctx *context.Context) {
|
|
|
|
|
headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
|
|
|
|
|
if ctx.Written() {
|
|
|
|
|
return
|
|
|
|
|
}
|
2019-11-13 02:01:19 -05:00
|
|
|
defer headGitRepo.Close()
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
nothingToCompare := PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, compareInfo, baseBranch, headBranch)
|
|
|
|
|
if ctx.Written() {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ctx.Data["PageIsComparePull"] == true {
|
2019-08-11 11:23:49 -04:00
|
|
|
headBranches, err := headGitRepo.GetBranches()
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.ServerError("GetBranches", err)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["HeadBranches"] = headBranches
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
pr, err := models.GetUnmergedPullRequest(headRepo.ID, ctx.Repo.Repository.ID, headBranch, baseBranch)
|
|
|
|
|
if err != nil {
|
|
|
|
|
if !models.IsErrPullRequestNotExist(err) {
|
|
|
|
|
ctx.ServerError("GetUnmergedPullRequest", err)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ctx.Data["HasPullRequest"] = true
|
|
|
|
|
ctx.Data["PullRequest"] = pr
|
|
|
|
|
ctx.HTML(200, tplCompareDiff)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !nothingToCompare {
|
|
|
|
|
// Setup information for new form.
|
2020-01-19 01:43:38 -05:00
|
|
|
RetrieveRepoMetas(ctx, ctx.Repo.Repository, true)
|
2019-06-07 16:29:29 -04:00
|
|
|
if ctx.Written() {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
beforeCommitID := ctx.Data["BeforeCommitID"].(string)
|
|
|
|
|
afterCommitID := ctx.Data["AfterCommitID"].(string)
|
|
|
|
|
|
|
|
|
|
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + "..." + base.ShortSha(afterCommitID)
|
|
|
|
|
|
|
|
|
|
ctx.Data["IsRepoToolbarCommits"] = true
|
|
|
|
|
ctx.Data["IsDiffCompare"] = true
|
|
|
|
|
ctx.Data["RequireTribute"] = true
|
2019-12-16 14:57:30 -05:00
|
|
|
ctx.Data["RequireSimpleMDE"] = true
|
2019-06-07 16:29:29 -04:00
|
|
|
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
|
2020-09-11 10:48:39 -04:00
|
|
|
setTemplateIfExists(ctx, pullRequestTemplateKey, nil, pullRequestTemplateCandidates)
|
2019-06-07 16:29:29 -04:00
|
|
|
renderAttachmentSettings(ctx)
|
|
|
|
|
|
2020-04-04 01:39:48 -04:00
|
|
|
ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWrite(models.UnitTypePullRequests)
|
|
|
|
|
|
2019-06-07 16:29:29 -04:00
|
|
|
ctx.HTML(200, tplCompare)
|
|
|
|
|
}
|
2019-11-14 21:52:59 -05:00
|
|
|
|
|
|
|
|
// ExcerptBlob render blob excerpt contents
|
|
|
|
|
func ExcerptBlob(ctx *context.Context) {
|
|
|
|
|
commitID := ctx.Params("sha")
|
|
|
|
|
lastLeft := ctx.QueryInt("last_left")
|
|
|
|
|
lastRight := ctx.QueryInt("last_right")
|
|
|
|
|
idxLeft := ctx.QueryInt("left")
|
|
|
|
|
idxRight := ctx.QueryInt("right")
|
|
|
|
|
leftHunkSize := ctx.QueryInt("left_hunk_size")
|
|
|
|
|
rightHunkSize := ctx.QueryInt("right_hunk_size")
|
|
|
|
|
anchor := ctx.Query("anchor")
|
|
|
|
|
direction := ctx.Query("direction")
|
|
|
|
|
filePath := ctx.Query("path")
|
|
|
|
|
gitRepo := ctx.Repo.GitRepo
|
2020-08-20 10:53:06 -04:00
|
|
|
chunkSize := gitdiff.BlobExcerptChunkSize
|
2019-11-14 21:52:59 -05:00
|
|
|
commit, err := gitRepo.GetCommit(commitID)
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.Error(500, "GetCommit")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
section := &gitdiff.DiffSection{
|
2020-07-12 14:25:05 -04:00
|
|
|
FileName: filePath,
|
|
|
|
|
Name: filePath,
|
2019-11-14 21:52:59 -05:00
|
|
|
}
|
|
|
|
|
if direction == "up" && (idxLeft-lastLeft) > chunkSize {
|
|
|
|
|
idxLeft -= chunkSize
|
|
|
|
|
idxRight -= chunkSize
|
|
|
|
|
leftHunkSize += chunkSize
|
|
|
|
|
rightHunkSize += chunkSize
|
|
|
|
|
section.Lines, err = getExcerptLines(commit, filePath, idxLeft-1, idxRight-1, chunkSize)
|
|
|
|
|
} else if direction == "down" && (idxLeft-lastLeft) > chunkSize {
|
|
|
|
|
section.Lines, err = getExcerptLines(commit, filePath, lastLeft, lastRight, chunkSize)
|
|
|
|
|
lastLeft += chunkSize
|
|
|
|
|
lastRight += chunkSize
|
|
|
|
|
} else {
|
|
|
|
|
section.Lines, err = getExcerptLines(commit, filePath, lastLeft, lastRight, idxRight-lastRight-1)
|
|
|
|
|
leftHunkSize = 0
|
|
|
|
|
rightHunkSize = 0
|
|
|
|
|
idxLeft = lastLeft
|
|
|
|
|
idxRight = lastRight
|
|
|
|
|
}
|
|
|
|
|
if err != nil {
|
|
|
|
|
ctx.Error(500, "getExcerptLines")
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
if idxRight > lastRight {
|
|
|
|
|
lineText := " "
|
|
|
|
|
if rightHunkSize > 0 || leftHunkSize > 0 {
|
|
|
|
|
lineText = fmt.Sprintf("@@ -%d,%d +%d,%d @@\n", idxLeft, leftHunkSize, idxRight, rightHunkSize)
|
|
|
|
|
}
|
|
|
|
|
lineText = html.EscapeString(lineText)
|
|
|
|
|
lineSection := &gitdiff.DiffLine{
|
|
|
|
|
Type: gitdiff.DiffLineSection,
|
|
|
|
|
Content: lineText,
|
|
|
|
|
SectionInfo: &gitdiff.DiffLineSectionInfo{
|
|
|
|
|
Path: filePath,
|
|
|
|
|
LastLeftIdx: lastLeft,
|
|
|
|
|
LastRightIdx: lastRight,
|
|
|
|
|
LeftIdx: idxLeft,
|
|
|
|
|
RightIdx: idxRight,
|
|
|
|
|
LeftHunkSize: leftHunkSize,
|
|
|
|
|
RightHunkSize: rightHunkSize,
|
|
|
|
|
}}
|
|
|
|
|
if direction == "up" {
|
|
|
|
|
section.Lines = append([]*gitdiff.DiffLine{lineSection}, section.Lines...)
|
|
|
|
|
} else if direction == "down" {
|
|
|
|
|
section.Lines = append(section.Lines, lineSection)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ctx.Data["section"] = section
|
|
|
|
|
ctx.Data["fileName"] = filePath
|
|
|
|
|
ctx.Data["AfterCommitID"] = commitID
|
|
|
|
|
ctx.Data["Anchor"] = anchor
|
|
|
|
|
ctx.HTML(200, tplBlobExcerpt)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func getExcerptLines(commit *git.Commit, filePath string, idxLeft int, idxRight int, chunkSize int) ([]*gitdiff.DiffLine, error) {
|
|
|
|
|
blob, err := commit.Tree.GetBlobByPath(filePath)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
reader, err := blob.DataAsync()
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
defer reader.Close()
|
|
|
|
|
scanner := bufio.NewScanner(reader)
|
|
|
|
|
var diffLines []*gitdiff.DiffLine
|
|
|
|
|
for line := 0; line < idxRight+chunkSize; line++ {
|
|
|
|
|
if ok := scanner.Scan(); !ok {
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
if line < idxRight {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
lineText := scanner.Text()
|
|
|
|
|
diffLine := &gitdiff.DiffLine{
|
|
|
|
|
LeftIdx: idxLeft + (line - idxRight) + 1,
|
|
|
|
|
RightIdx: line + 1,
|
|
|
|
|
Type: gitdiff.DiffLinePlain,
|
|
|
|
|
Content: " " + lineText,
|
|
|
|
|
}
|
|
|
|
|
diffLines = append(diffLines, diffLine)
|
|
|
|
|
}
|
|
|
|
|
return diffLines, nil
|
|
|
|
|
}
|
