oppi.li / perf-test
loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix misspelling of mergable (#30896)

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

(cherry picked from commit f7d2f695a4c57b245830a526e77fa62e99e00254)

Conflicts:
services/pull/check.go
trivial conflict because
9b2536b78fdcd3cf444a2f54857d9871e153858f Update misspell to 0.5.1 and add `misspellings.csv` (#30573)
was not cherry-picked

authored by

yp05327 and committed by
Earl Warren 6c9b8401 8f0f6bf8

+10 -10
+2 -2
routers/api/v1/repo/pull.go
··· 878 878 } 879 879 880 880 // start with merging by checking 881 - if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil { 881 + if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil { 882 882 if errors.Is(err, pull_service.ErrIsClosed) { 883 883 ctx.NotFound() 884 884 } else if errors.Is(err, pull_service.ErrUserNotAllowedToMerge) { ··· 887 887 ctx.Error(http.StatusMethodNotAllowed, "PR already merged", "") 888 888 } else if errors.Is(err, pull_service.ErrIsWorkInProgress) { 889 889 ctx.Error(http.StatusMethodNotAllowed, "PR is a work in progress", "Work in progress PRs cannot be merged") 890 - } else if errors.Is(err, pull_service.ErrNotMergableState) { 890 + } else if errors.Is(err, pull_service.ErrNotMergeableState) { 891 891 ctx.Error(http.StatusMethodNotAllowed, "PR not in mergeable state", "Please try again later") 892 892 } else if models.IsErrDisallowedToMerge(err) { 893 893 ctx.Error(http.StatusMethodNotAllowed, "PR is not ready to be merged", err)
+2 -2
routers/web/repo/pull.go
··· 1218 1218 } 1219 1219 1220 1220 // start with merging by checking 1221 - if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil { 1221 + if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil { 1222 1222 switch { 1223 1223 case errors.Is(err, pull_service.ErrIsClosed): 1224 1224 if issue.IsPull { ··· 1232 1232 ctx.JSONError(ctx.Tr("repo.pulls.has_merged")) 1233 1233 case errors.Is(err, pull_service.ErrIsWorkInProgress): 1234 1234 ctx.JSONError(ctx.Tr("repo.pulls.no_merge_wip")) 1235 - case errors.Is(err, pull_service.ErrNotMergableState): 1235 + case errors.Is(err, pull_service.ErrNotMergeableState): 1236 1236 ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready")) 1237 1237 case models.IsErrDisallowedToMerge(err): 1238 1238 ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready"))
+2 -2
services/automerge/automerge.go
··· 229 229 return 230 230 } 231 231 232 - if err := pull_service.CheckPullMergable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil { 232 + if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil { 233 233 if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) { 234 234 log.Info("%-v was scheduled to automerge by an unauthorized user", pr) 235 235 return 236 236 } 237 - log.Error("%-v CheckPullMergable: %v", pr, err) 237 + log.Error("%-v CheckPullMergeable: %v", pr, err) 238 238 return 239 239 } 240 240
+4 -4
services/pull/check.go
··· 39 39 ErrHasMerged = errors.New("has already been merged") 40 40 ErrIsWorkInProgress = errors.New("work in progress PRs cannot be merged") 41 41 ErrIsChecking = errors.New("cannot merge while conflict checking is in progress") 42 - ErrNotMergableState = errors.New("not in mergeable state") 42 + ErrNotMergeableState = errors.New("not in mergeable state") 43 43 ErrDependenciesLeft = errors.New("is blocked by an open dependency") 44 44 ) 45 45 ··· 66 66 MergeCheckTypeAuto // Auto Merge (Scheduled Merge) After Checks Succeed 67 67 ) 68 68 69 - // CheckPullMergable check if the pull mergeable based on all conditions (branch protection, merge options, ...) 70 - func CheckPullMergable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error { 69 + // CheckPullMergeable check if the pull mergeable based on all conditions (branch protection, merge options, ...) 70 + func CheckPullMergeable(stdCtx context.Context, doer *user_model.User, perm *access_model.Permission, pr *issues_model.PullRequest, mergeCheckType MergeCheckType, adminSkipProtectionCheck bool) error { 71 71 return db.WithTx(stdCtx, func(ctx context.Context) error { 72 72 if pr.HasMerged { 73 73 return ErrHasMerged ··· 97 97 } 98 98 99 99 if !pr.CanAutoMerge() && !pr.IsEmpty() { 100 - return ErrNotMergableState 100 + return ErrNotMergeableState 101 101 } 102 102 103 103 if pr.IsChecking() {