rename returned variables of IsUserAllowedToUpdate

Author: lunny

services/pull/update.go

@@ -102,7 +102,7 @@ func Update(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.
 
 // IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
 // update PR means send new commits to PR head branch from base branch
-func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest, user *user_model.User) (mergeAllowed, rebaseAllowed bool, err error) {
+func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest, user *user_model.User) (updateByMergeAllowed, updateByRebaseAllowed bool, err error) {
 	if pull.Flow == issues_model.PullRequestFlowAGit {
 		return false, false, nil
 	}
@@ -129,7 +129,7 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 		log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)
 		return false, false, err
 	}
-	rebaseAllowed = prUnit.PullRequestsConfig().AllowRebaseUpdate
+	updateByRebaseAllowed = prUnit.PullRequestsConfig().AllowRebaseUpdate
 
 	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.HeadRepoID, pull.HeadBranch)
 	if err != nil {
@@ -138,10 +138,10 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 	// If branch protected, disable rebase unless user is whitelisted to force push (which extends regular push)
 	if pb != nil {
 		pb.Repo = pull.HeadRepo
-		rebaseAllowed = rebaseAllowed && pb.CanUserForcePush(ctx, user)
-		mergeAllowed = git_model.IsUserMergeWhitelisted(ctx, pb, user.ID, headRepoPerm)
+		updateByRebaseAllowed = updateByRebaseAllowed && pb.CanUserForcePush(ctx, user)
+		updateByMergeAllowed = git_model.IsUserMergeWhitelisted(ctx, pb, user.ID, headRepoPerm)
 	} else {
-		mergeAllowed = headRepoPerm.CanWrite(unit.TypeCode)
+		updateByMergeAllowed = headRepoPerm.CanWrite(unit.TypeCode)
 	}
 
 	baseRepoPerm, err := access_model.GetUserRepoPermission(ctx, pull.BaseRepo, user)
@@ -150,12 +150,12 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 	}
 
 	if pull.AllowMaintainerEdit {
-		mergeAllowed = mergeAllowed || baseRepoPerm.CanWrite(unit.TypeCode)
+		updateByMergeAllowed = updateByMergeAllowed || baseRepoPerm.CanWrite(unit.TypeCode)
 	}
 	// if merge is not allowed, rebase is also not allowed
-	rebaseAllowed = rebaseAllowed && mergeAllowed
+	updateByRebaseAllowed = updateByRebaseAllowed && updateByMergeAllowed
 
-	return mergeAllowed, rebaseAllowed, nil
+	return updateByMergeAllowed, updateByRebaseAllowed, nil
 }
 
 func syncCommitDivergence(ctx context.Context, pr *issues_model.PullRequest) error {