mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	* feature: add agit flow support ref: https://git-repo.info/en/2020/03/agit-flow-and-git-repo/ example: ```Bash git checkout -b test echo "test" >> README.md git commit -m "test" git push origin HEAD:refs/for/master -o topic=test ``` Signed-off-by: a1012112796 <1012112796@qq.com> * fix lint * simplify code add fix some nits * update merge help message * Apply suggestions from code review. Thanks @jiangxin * add forced-update message * fix lint * splite writePktLine * add refs/for/<target-branch>/<topic-branch> support also * Add test code add fix api * fix lint * fix test * skip test if git version < 2.29 * try test with git 2.30.1 * fix permission check bug * fix some nit * logic implify and test code update * fix bug * apply suggestions from code review * prepare for merge Signed-off-by: Andrew Thornton <art27@cantab.net> * fix permission check bug - test code update - apply suggestions from code review @zeripath Signed-off-by: a1012112796 <1012112796@qq.com> * fix bug when target branch isn't exist * prevent some special push and fix some nits * fix lint * try splite * Apply suggestions from code review - fix permission check - handle user rename * fix version negotiation * remane * fix template * handle empty repo * ui: fix branch link under the title * fix nits Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
		
			
				
	
	
		
			185 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			185 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2020 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 convert
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	"code.gitea.io/gitea/modules/git"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	repo_module "code.gitea.io/gitea/modules/repository"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| )
 | |
| 
 | |
| // ToAPIPullRequest assumes following fields have been assigned with valid values:
 | |
| // Required - Issue
 | |
| // Optional - Merger
 | |
| func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
 | |
| 	var (
 | |
| 		baseBranch *git.Branch
 | |
| 		headBranch *git.Branch
 | |
| 		baseCommit *git.Commit
 | |
| 		err        error
 | |
| 	)
 | |
| 
 | |
| 	if err = pr.Issue.LoadRepo(); err != nil {
 | |
| 		log.Error("pr.Issue.LoadRepo[%d]: %v", pr.ID, err)
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	apiIssue := ToAPIIssue(pr.Issue)
 | |
| 	if err := pr.LoadBaseRepo(); err != nil {
 | |
| 		log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	if err := pr.LoadHeadRepo(); err != nil {
 | |
| 		log.Error("GetRepositoryById[%d]: %v", pr.ID, err)
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	apiPullRequest := &api.PullRequest{
 | |
| 		ID:        pr.ID,
 | |
| 		URL:       pr.Issue.HTMLURL(),
 | |
| 		Index:     pr.Index,
 | |
| 		Poster:    apiIssue.Poster,
 | |
| 		Title:     apiIssue.Title,
 | |
| 		Body:      apiIssue.Body,
 | |
| 		Labels:    apiIssue.Labels,
 | |
| 		Milestone: apiIssue.Milestone,
 | |
| 		Assignee:  apiIssue.Assignee,
 | |
| 		Assignees: apiIssue.Assignees,
 | |
| 		State:     apiIssue.State,
 | |
| 		IsLocked:  apiIssue.IsLocked,
 | |
| 		Comments:  apiIssue.Comments,
 | |
| 		HTMLURL:   pr.Issue.HTMLURL(),
 | |
| 		DiffURL:   pr.Issue.DiffURL(),
 | |
| 		PatchURL:  pr.Issue.PatchURL(),
 | |
| 		HasMerged: pr.HasMerged,
 | |
| 		MergeBase: pr.MergeBase,
 | |
| 		Deadline:  apiIssue.Deadline,
 | |
| 		Created:   pr.Issue.CreatedUnix.AsTimePtr(),
 | |
| 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
 | |
| 
 | |
| 		Base: &api.PRBranchInfo{
 | |
| 			Name:       pr.BaseBranch,
 | |
| 			Ref:        pr.BaseBranch,
 | |
| 			RepoID:     pr.BaseRepoID,
 | |
| 			Repository: ToRepo(pr.BaseRepo, models.AccessModeNone),
 | |
| 		},
 | |
| 		Head: &api.PRBranchInfo{
 | |
| 			Name:   pr.HeadBranch,
 | |
| 			Ref:    fmt.Sprintf("refs/pull/%d/head", pr.Index),
 | |
| 			RepoID: -1,
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	baseBranch, err = repo_module.GetBranch(pr.BaseRepo, pr.BaseBranch)
 | |
| 	if err != nil && !git.IsErrBranchNotExist(err) {
 | |
| 		log.Error("GetBranch[%s]: %v", pr.BaseBranch, err)
 | |
| 		return nil
 | |
| 	}
 | |
| 
 | |
| 	if err == nil {
 | |
| 		baseCommit, err = baseBranch.GetCommit()
 | |
| 		if err != nil && !git.IsErrNotExist(err) {
 | |
| 			log.Error("GetCommit[%s]: %v", baseBranch.Name, err)
 | |
| 			return nil
 | |
| 		}
 | |
| 
 | |
| 		if err == nil {
 | |
| 			apiPullRequest.Base.Sha = baseCommit.ID.String()
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if pr.Flow == models.PullRequestFlowAGit {
 | |
| 		gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
 | |
| 		if err != nil {
 | |
| 			log.Error("OpenRepository[%s]: %v", pr.GetGitRefName(), err)
 | |
| 			return nil
 | |
| 		}
 | |
| 		defer gitRepo.Close()
 | |
| 
 | |
| 		apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitID(pr.GetGitRefName())
 | |
| 		if err != nil {
 | |
| 			log.Error("GetRefCommitID[%s]: %v", pr.GetGitRefName(), err)
 | |
| 			return nil
 | |
| 		}
 | |
| 		apiPullRequest.Head.RepoID = pr.BaseRepoID
 | |
| 		apiPullRequest.Head.Repository = apiPullRequest.Base.Repository
 | |
| 		apiPullRequest.Head.Name = ""
 | |
| 	}
 | |
| 
 | |
| 	if pr.HeadRepo != nil && pr.Flow == models.PullRequestFlowGithub {
 | |
| 		apiPullRequest.Head.RepoID = pr.HeadRepo.ID
 | |
| 		apiPullRequest.Head.Repository = ToRepo(pr.HeadRepo, models.AccessModeNone)
 | |
| 
 | |
| 		headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
 | |
| 		if err != nil {
 | |
| 			log.Error("OpenRepository[%s]: %v", pr.HeadRepo.RepoPath(), err)
 | |
| 			return nil
 | |
| 		}
 | |
| 		defer headGitRepo.Close()
 | |
| 
 | |
| 		headBranch, err = headGitRepo.GetBranch(pr.HeadBranch)
 | |
| 		if err != nil && !git.IsErrBranchNotExist(err) {
 | |
| 			log.Error("GetBranch[%s]: %v", pr.HeadBranch, err)
 | |
| 			return nil
 | |
| 		}
 | |
| 
 | |
| 		if git.IsErrBranchNotExist(err) {
 | |
| 			headCommitID, err := headGitRepo.GetRefCommitID(apiPullRequest.Head.Ref)
 | |
| 			if err != nil && !git.IsErrNotExist(err) {
 | |
| 				log.Error("GetCommit[%s]: %v", pr.HeadBranch, err)
 | |
| 				return nil
 | |
| 			}
 | |
| 			if err == nil {
 | |
| 				apiPullRequest.Head.Sha = headCommitID
 | |
| 			}
 | |
| 		} else {
 | |
| 			commit, err := headBranch.GetCommit()
 | |
| 			if err != nil && !git.IsErrNotExist(err) {
 | |
| 				log.Error("GetCommit[%s]: %v", headBranch.Name, err)
 | |
| 				return nil
 | |
| 			}
 | |
| 			if err == nil {
 | |
| 				apiPullRequest.Head.Ref = pr.HeadBranch
 | |
| 				apiPullRequest.Head.Sha = commit.ID.String()
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if len(apiPullRequest.Head.Sha) == 0 && len(apiPullRequest.Head.Ref) != 0 {
 | |
| 		baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
 | |
| 		if err != nil {
 | |
| 			log.Error("OpenRepository[%s]: %v", pr.BaseRepo.RepoPath(), err)
 | |
| 			return nil
 | |
| 		}
 | |
| 		defer baseGitRepo.Close()
 | |
| 		refs, err := baseGitRepo.GetRefsFiltered(apiPullRequest.Head.Ref)
 | |
| 		if err != nil {
 | |
| 			log.Error("GetRefsFiltered[%s]: %v", apiPullRequest.Head.Ref, err)
 | |
| 			return nil
 | |
| 		} else if len(refs) == 0 {
 | |
| 			log.Error("unable to resolve PR head ref")
 | |
| 		} else {
 | |
| 			apiPullRequest.Head.Sha = refs[0].Object.String()
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if pr.Status != models.PullRequestStatusChecking {
 | |
| 		mergeable := !(pr.Status == models.PullRequestStatusConflict || pr.Status == models.PullRequestStatusError) && !pr.IsWorkInProgress()
 | |
| 		apiPullRequest.Mergeable = mergeable
 | |
| 	}
 | |
| 	if pr.HasMerged {
 | |
| 		apiPullRequest.Merged = pr.MergedUnix.AsTimePtr()
 | |
| 		apiPullRequest.MergedCommitID = &pr.MergedCommitID
 | |
| 		apiPullRequest.MergedBy = ToUser(pr.Merger, nil)
 | |
| 	}
 | |
| 
 | |
| 	return apiPullRequest
 | |
| }
 |