Fix misspelling of mergable (#30896) (#30905)

Backport #30896 by @yp05327

https://github.com/go-gitea/gitea/pull/25812#issuecomment-2099833692
Follow #30573

Co-authored-by: yp05327 <576951401@qq.com>

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 8bd4ddf64b65dbc24ac19c7f7ff560f1f5ae3127..38a32a73c78e7595a46e9648b0143529b8688c4b 100644 (file)
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -881,7 +881,7 @@ func MergePullRequest(ctx *context.APIContext) {
        }
 
        // start with merging by checking
-       if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
+       if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
                if errors.Is(err, pull_service.ErrIsClosed) {
                        ctx.NotFound()
                } else if errors.Is(err, pull_service.ErrUserNotAllowedToMerge) {
@@ -890,7 +890,7 @@ func MergePullRequest(ctx *context.APIContext) {
                        ctx.Error(http.StatusMethodNotAllowed, "PR already merged", "")
                } else if errors.Is(err, pull_service.ErrIsWorkInProgress) {
                        ctx.Error(http.StatusMethodNotAllowed, "PR is a work in progress", "Work in progress PRs cannot be merged")
-               } else if errors.Is(err, pull_service.ErrNotMergableState) {
+               } else if errors.Is(err, pull_service.ErrNotMergeableState) {
                        ctx.Error(http.StatusMethodNotAllowed, "PR not in mergeable state", "Please try again later")
                } else if models.IsErrDisallowedToMerge(err) {
                        ctx.Error(http.StatusMethodNotAllowed, "PR is not ready to be merged", err)

diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 7041175d9ae16e8e24f9251bc5ba44768d7197cf..bbdc6ca631aedc6f03999f5937648e17efe6fb99 100644 (file)
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1007,7 +1007,7 @@ func MergePullRequest(ctx *context.Context) {
        }
 
        // start with merging by checking
-       if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
+       if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
                switch {
                case errors.Is(err, pull_service.ErrIsClosed):
                        if issue.IsPull {
@@ -1021,7 +1021,7 @@ func MergePullRequest(ctx *context.Context) {
                        ctx.JSONError(ctx.Tr("repo.pulls.has_merged"))
                case errors.Is(err, pull_service.ErrIsWorkInProgress):
                        ctx.JSONError(ctx.Tr("repo.pulls.no_merge_wip"))
-               case errors.Is(err, pull_service.ErrNotMergableState):
+               case errors.Is(err, pull_service.ErrNotMergeableState):
                        ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready"))
                case models.IsErrDisallowedToMerge(err):
                        ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready"))

diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
index bd427bef9f7314351c558889c085ae535a2304d7..bd1317c7f48b7f389d7821394d16e9936706b97d 100644 (file)
--- a/services/automerge/automerge.go
+++ b/services/automerge/automerge.go
@@ -229,12 +229,12 @@ func handlePull(pullID int64, sha string) {
                return
        }
 
-       if err := pull_service.CheckPullMergable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
+       if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
                if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) {
                        log.Info("%-v was scheduled to automerge by an unauthorized user", pr)
                        return
                }
-               log.Error("%-v CheckPullMergable: %v", pr, err)
+               log.Error("%-v CheckPullMergeable: %v", pr, err)
                return
        }
 

diff --git a/services/pull/check.go b/services/pull/check.go
index 9495e8ad5f3f52d6e57c5706cea6570d01b97a8e..7d93ff7a8a4b2f2ee6297abc51f343724a9ee092 100644 (file)
--- a/services/pull/check.go
+++ b/services/pull/check.go
@@ -39,7 +39,7 @@ var (
        ErrHasMerged             = errors.New("has already been merged")
        ErrIsWorkInProgress      = errors.New("work in progress PRs cannot be merged")
        ErrIsChecking            = errors.New("cannot merge while conflict checking is in progress")
-       ErrNotMergableState      = errors.New("not in mergeable state")
+       ErrNotMergeableState     = errors.New("not in mergeable state")
        ErrDependenciesLeft      = errors.New("is blocked by an open dependency")
 )
 
@@ -66,8 +66,8 @@ const (
        MergeCheckTypeAuto                           // Auto Merge (Scheduled Merge) After Checks Succeed
 )
 
-// CheckPullMergable check if the pull mergeable based on all conditions (branch protection, merge options, ...)
-func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error {
+// CheckPullMergeable check if the pull mergeable based on all conditions (branch protection, merge options, ...)
+func CheckPullMergeable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error {
        return db.WithTx(stdCtx, func(ctx context.Context) error {
                if pr.HasMerged {
                        return ErrHasMerged
@@ -97,7 +97,7 @@ func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *acce
                }
 
                if !pr.CanAutoMerge() && !pr.IsEmpty() {
-                       return ErrNotMergableState
+                       return ErrNotMergeableState
                }
 
                if pr.IsChecking() {