* Move access and repo permission to models/perm/access * fix test * Move some git related files into sub package models/git * Fix build * fix git test * move lfs to sub package * move more git related functions to models/git * Move functions sequence * Some improvements per @KN4CK3R and @delvh
Showing the changes to services/pull/commit_status.go (1 of 67 files). Show all
Unified · Split
| @@ -10,6 +10,7 @@ import ( · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | "code.gitea.io/gitea/models" |
| 12 | 12 | "code.gitea.io/gitea/models/db" |
| 13 | + git_model "code.gitea.io/gitea/models/git" | |
| 13 | 14 | "code.gitea.io/gitea/modules/git" |
| 14 | 15 | "code.gitea.io/gitea/modules/structs" |
| 15 | 16 | |
| @@ -17,9 +18,9 @@ import ( · 1 unmodified line | ||
| 17 | 18 | ) |
| 18 | 19 | |
| 19 | 20 | // MergeRequiredContextsCommitStatus returns a commit status state for given required contexts |
| 20 | −func MergeRequiredContextsCommitStatus(commitStatuses []*models.CommitStatus, requiredContexts []string) structs.CommitStatusState { | |
| 21 | +func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus, requiredContexts []string) structs.CommitStatusState { | |
| 21 | 22 | if len(requiredContexts) == 0 { |
| 22 | − status := models.CalcCommitStatus(commitStatuses) | |
| 23 | + status := git_model.CalcCommitStatus(commitStatuses) | |
| 23 | 24 | if status != nil { |
| 24 | 25 | return status.State |
| 25 | 26 | } |
| @@ -38,7 +39,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*models.CommitStatus, re · 12 unmodified lines | ||
| 38 | 39 | |
| 39 | 40 | if targetStatus == "" { |
| 40 | 41 | targetStatus = structs.CommitStatusPending |
| 41 | − commitStatuses = append(commitStatuses, &models.CommitStatus{ | |
| 42 | + commitStatuses = append(commitStatuses, &git_model.CommitStatus{ | |
| 42 | 43 | State: targetStatus, |
| 43 | 44 | Context: ctx, |
| 44 | 45 | Description: "Pending", |
| @@ -52,10 +53,10 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*models.CommitStatus, re · 7 unmodified lines | ||
| 52 | 53 | } |
| 53 | 54 | |
| 54 | 55 | // IsCommitStatusContextSuccess returns true if all required status check contexts succeed. |
| 55 | −func IsCommitStatusContextSuccess(commitStatuses []*models.CommitStatus, requiredContexts []string) bool { | |
| 56 | +func IsCommitStatusContextSuccess(commitStatuses []*git_model.CommitStatus, requiredContexts []string) bool { | |
| 56 | 57 | // If no specific context is required, require that last commit status is a success |
| 57 | 58 | if len(requiredContexts) == 0 { |
| 58 | − status := models.CalcCommitStatus(commitStatuses) | |
| 59 | + status := git_model.CalcCommitStatus(commitStatuses) | |
| 59 | 60 | if status == nil || status.State != structs.CommitStatusSuccess { |
| 60 | 61 | return false |
| 61 | 62 | } |
| @@ -132,7 +133,7 @@ func GetPullRequestCommitStatusState(ctx context.Context, pr *models.PullRequest · 70 unmodified lines | ||
| 132 | 133 | return "", errors.Wrap(err, "LoadBaseRepo") |
| 133 | 134 | } |
| 134 | 135 | |
| 135 | − commitStatuses, _, err := models.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptions{}) | |
| 136 | + commitStatuses, _, err := git_model.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptions{}) | |
| 136 | 137 | if err != nil { |
| 137 | 138 | return "", errors.Wrap(err, "GetLatestCommitStatus") |
| 138 | 139 | } |