mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Adds a feature [like GitHub has](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) (step 7). If you create a new PR from a forked repo, you can select (and change later, but only if you are the PR creator/poster) the "Allow edits from maintainers" option. Then users with write access to the base branch get more permissions on this branch: * use the update pull request button * push directly from the command line (`git push`) * edit/delete/upload files via web UI * use related API endpoints You can't merge PRs to this branch with this enabled, you'll need "full" code write permissions. This feature has a pretty big impact on the permission system. I might forgot changing some things or didn't find security vulnerabilities. In this case, please leave a review or comment on this PR. Closes #17728 Co-authored-by: 6543 <6543@obermui.de>
		
			
				
	
	
		
			162 lines
		
	
	
		
			4.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			162 lines
		
	
	
		
			4.4 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 pull
 | 
						|
 | 
						|
import (
 | 
						|
	"context"
 | 
						|
	"fmt"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/models"
 | 
						|
	repo_model "code.gitea.io/gitea/models/repo"
 | 
						|
	"code.gitea.io/gitea/models/unit"
 | 
						|
	user_model "code.gitea.io/gitea/models/user"
 | 
						|
	"code.gitea.io/gitea/modules/git"
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
)
 | 
						|
 | 
						|
// Update updates pull request with base branch.
 | 
						|
func Update(ctx context.Context, pull *models.PullRequest, doer *user_model.User, message string, rebase bool) error {
 | 
						|
	var (
 | 
						|
		pr    *models.PullRequest
 | 
						|
		style repo_model.MergeStyle
 | 
						|
	)
 | 
						|
 | 
						|
	if rebase {
 | 
						|
		pr = pull
 | 
						|
		style = repo_model.MergeStyleRebaseUpdate
 | 
						|
	} else {
 | 
						|
		// use merge functions but switch repo's and branch's
 | 
						|
		pr = &models.PullRequest{
 | 
						|
			HeadRepoID: pull.BaseRepoID,
 | 
						|
			BaseRepoID: pull.HeadRepoID,
 | 
						|
			HeadBranch: pull.BaseBranch,
 | 
						|
			BaseBranch: pull.HeadBranch,
 | 
						|
		}
 | 
						|
		style = repo_model.MergeStyleMerge
 | 
						|
	}
 | 
						|
 | 
						|
	if pull.Flow == models.PullRequestFlowAGit {
 | 
						|
		// TODO: Not support update agit flow pull request's head branch
 | 
						|
		return fmt.Errorf("Not support update agit flow pull request's head branch")
 | 
						|
	}
 | 
						|
 | 
						|
	if err := pr.LoadHeadRepoCtx(ctx); err != nil {
 | 
						|
		log.Error("LoadHeadRepo: %v", err)
 | 
						|
		return fmt.Errorf("LoadHeadRepo: %v", err)
 | 
						|
	} else if err = pr.LoadBaseRepoCtx(ctx); err != nil {
 | 
						|
		log.Error("LoadBaseRepo: %v", err)
 | 
						|
		return fmt.Errorf("LoadBaseRepo: %v", err)
 | 
						|
	}
 | 
						|
 | 
						|
	diffCount, err := GetDiverging(ctx, pull)
 | 
						|
	if err != nil {
 | 
						|
		return err
 | 
						|
	} else if diffCount.Behind == 0 {
 | 
						|
		return fmt.Errorf("HeadBranch of PR %d is up to date", pull.Index)
 | 
						|
	}
 | 
						|
 | 
						|
	_, err = rawMerge(ctx, pr, doer, style, "", message)
 | 
						|
 | 
						|
	defer func() {
 | 
						|
		if rebase {
 | 
						|
			go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
 | 
						|
			return
 | 
						|
		}
 | 
						|
		go AddTestPullRequestTask(doer, pr.HeadRepo.ID, pr.HeadBranch, false, "", "")
 | 
						|
	}()
 | 
						|
 | 
						|
	return err
 | 
						|
}
 | 
						|
 | 
						|
// IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
 | 
						|
func IsUserAllowedToUpdate(ctx context.Context, pull *models.PullRequest, user *user_model.User) (mergeAllowed, rebaseAllowed bool, err error) {
 | 
						|
	if pull.Flow == models.PullRequestFlowAGit {
 | 
						|
		return false, false, nil
 | 
						|
	}
 | 
						|
 | 
						|
	if user == nil {
 | 
						|
		return false, false, nil
 | 
						|
	}
 | 
						|
	headRepoPerm, err := models.GetUserRepoPermission(ctx, pull.HeadRepo, user)
 | 
						|
	if err != nil {
 | 
						|
		return false, false, err
 | 
						|
	}
 | 
						|
 | 
						|
	pr := &models.PullRequest{
 | 
						|
		HeadRepoID: pull.BaseRepoID,
 | 
						|
		BaseRepoID: pull.HeadRepoID,
 | 
						|
		HeadBranch: pull.BaseBranch,
 | 
						|
		BaseBranch: pull.HeadBranch,
 | 
						|
	}
 | 
						|
 | 
						|
	err = pr.LoadProtectedBranch()
 | 
						|
	if err != nil {
 | 
						|
		return false, false, err
 | 
						|
	}
 | 
						|
 | 
						|
	// can't do rebase on protected branch because need force push
 | 
						|
	if pr.ProtectedBranch == nil {
 | 
						|
		prUnit, err := pr.BaseRepo.GetUnit(unit.TypePullRequests)
 | 
						|
		if err != nil {
 | 
						|
			log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)
 | 
						|
			return false, false, err
 | 
						|
		}
 | 
						|
		rebaseAllowed = prUnit.PullRequestsConfig().AllowRebaseUpdate
 | 
						|
	}
 | 
						|
 | 
						|
	// Update function need push permission
 | 
						|
	if pr.ProtectedBranch != nil && !pr.ProtectedBranch.CanUserPush(user.ID) {
 | 
						|
		return false, false, nil
 | 
						|
	}
 | 
						|
 | 
						|
	baseRepoPerm, err := models.GetUserRepoPermission(ctx, pull.BaseRepo, user)
 | 
						|
	if err != nil {
 | 
						|
		return false, false, err
 | 
						|
	}
 | 
						|
 | 
						|
	mergeAllowed, err = IsUserAllowedToMerge(pr, headRepoPerm, user)
 | 
						|
	if err != nil {
 | 
						|
		return false, false, err
 | 
						|
	}
 | 
						|
 | 
						|
	if pull.AllowMaintainerEdit {
 | 
						|
		mergeAllowedMaintainer, err := IsUserAllowedToMerge(pr, baseRepoPerm, user)
 | 
						|
		if err != nil {
 | 
						|
			return false, false, err
 | 
						|
		}
 | 
						|
 | 
						|
		mergeAllowed = mergeAllowed || mergeAllowedMaintainer
 | 
						|
	}
 | 
						|
 | 
						|
	return mergeAllowed, rebaseAllowed, nil
 | 
						|
}
 | 
						|
 | 
						|
// GetDiverging determines how many commits a PR is ahead or behind the PR base branch
 | 
						|
func GetDiverging(ctx context.Context, pr *models.PullRequest) (*git.DivergeObject, error) {
 | 
						|
	log.Trace("GetDiverging[%d]: compare commits", pr.ID)
 | 
						|
	if err := pr.LoadBaseRepoCtx(ctx); err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
	if err := pr.LoadHeadRepoCtx(ctx); err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	tmpRepo, err := createTemporaryRepo(ctx, pr)
 | 
						|
	if err != nil {
 | 
						|
		if !models.IsErrBranchDoesNotExist(err) {
 | 
						|
			log.Error("CreateTemporaryRepo: %v", err)
 | 
						|
		}
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
	defer func() {
 | 
						|
		if err := models.RemoveTemporaryPath(tmpRepo); err != nil {
 | 
						|
			log.Error("Merge: RemoveTemporaryPath: %s", err)
 | 
						|
		}
 | 
						|
	}()
 | 
						|
 | 
						|
	diff, err := git.GetDivergingCommits(ctx, tmpRepo, "base", "tracking")
 | 
						|
	return &diff, err
 | 
						|
}
 |