Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-24 01:24:39 +02:00
Code Issues Activity

Rename CommitStatusSummary to CombinedStatus

Browse Source
This commit is contained in:
Lunny Xiao committed 2025-05-25 00:21:52 -07:00
1 parent 0915b18157
commit e3554b3945
21 files changed
+107 -103
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/convert/status.go
+4 -4
View File
@@ -38,12 +38,12 @@ func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, r
return nil
}
summary := git_model.CalcCommitStatusSummary(statuses)
combinedStatus := git_model.CalcCombinedStatus(statuses)
return &api.CombinedStatus{
State: summary.State,
SHA: summary.SHA,
State: combinedStatus.State,
SHA: combinedStatus.SHA,
TotalCount: len(statuses),
Repository: repo,
URL: summary.TargetURL,
URL: combinedStatus.TargetURL,
}
}
services/git/commit.go
+1 -1
View File
@@ -90,7 +90,7 @@ func ParseCommitsWithStatus(ctx context.Context, oldCommits []*asymkey_model.Sig
}
commit.Statuses = statuses
commit.Status = git_model.CalcCommitStatusSummary(statuses)
commit.Status = git_model.CalcCombinedStatus(statuses)
newCommits = append(newCommits, commit)
}
return newCommits, nil
services/pull/commit_status.go
+5 -5
View File
@@ -19,7 +19,7 @@ import (
)
// MergeRequiredContextsCommitStatus returns a commit status state for given required contexts
func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus, requiredContexts []string) commitstatus.CombinedStatus {
func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus, requiredContexts []string) commitstatus.CombinedStatusState {
if len(requiredContexts) > 0 {
requiredContextsGlob := make(map[string]glob.Glob, len(requiredContexts))
for _, ctx := range requiredContexts {
@@ -40,18 +40,18 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
}
}
if len(requiredCommitStatuses) > 0 {
return git_model.CalcCommitStatus(requiredCommitStatuses)
return git_model.CalcCombinedStatusState(requiredCommitStatuses)
}
}
return git_model.CalcCommitStatus(commitStatuses)
return git_model.CalcCombinedStatusState(commitStatuses)
}
// IsCommitStatusContextSuccess returns true if all required status check contexts succeed.
func IsCommitStatusContextSuccess(commitStatuses []*git_model.CommitStatus, requiredContexts []string) bool {
// If no specific context is required, require that last commit status is a success
if len(requiredContexts) == 0 {
return git_model.CalcCommitStatus(commitStatuses) == commitstatus.CombinedStatusSuccess
return git_model.CalcCombinedStatusState(commitStatuses) == commitstatus.CombinedStatusStateSuccess
}
for _, ctx := range requiredContexts {
@@ -91,7 +91,7 @@ func IsPullCommitStatusPass(ctx context.Context, pr *issues_model.PullRequest) (
}
// GetPullRequestCommitStatusState returns pull request merged commit status state
func GetPullRequestCommitStatusState(ctx context.Context, pr *issues_model.PullRequest) (commitstatus.CombinedStatus, error) {
func GetPullRequestCommitStatusState(ctx context.Context, pr *issues_model.PullRequest) (commitstatus.CombinedStatusState, error) {
// Ensure HeadRepo is loaded
if err := pr.LoadHeadRepo(ctx); err != nil {
return "", errors.Wrap(err, "LoadHeadRepo")
services/pull/commit_status_test.go
+6 -6
View File
@@ -49,12 +49,12 @@ func TestMergeRequiredContextsCommitStatus(t *testing.T) {
{"Build*", "Build *", "Build 2t*", "Build 1*"},
}
testCasesExpected := []commitstatus.CombinedStatus{
commitstatus.CombinedStatusSuccess,
commitstatus.CombinedStatusPending,
commitstatus.CombinedStatusFailure,
commitstatus.CombinedStatusPending,
commitstatus.CombinedStatusSuccess,
testCasesExpected := []commitstatus.CombinedStatusState{
commitstatus.CombinedStatusStateSuccess,
commitstatus.CombinedStatusStatePending,
commitstatus.CombinedStatusStateFailure,
commitstatus.CombinedStatusStatePending,
commitstatus.CombinedStatusStateSuccess,
}
for i, commitStatuses := range testCases {
services/pull/pull.go
+4 -4
View File
@@ -946,13 +946,13 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
}
// GetIssuesLastCommitStatus returns a map of issue ID to the most recent commit's latest status
func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CommitStatusSummary, error) {
func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CombinedStatus, error) {
_, lastStatus, err := GetIssuesAllCommitStatus(ctx, issues)
return lastStatus, err
}
// GetIssuesAllCommitStatus returns a map of issue ID to a list of all statuses for the most recent commit as well as a map of issue ID to only the commit's latest status
func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64][]*git_model.CommitStatus, map[int64]*git_model.CommitStatusSummary, error) {
func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64][]*git_model.CommitStatus, map[int64]*git_model.CombinedStatus, error) {
if err := issues.LoadPullRequests(ctx); err != nil {
return nil, nil, err
}
@@ -963,7 +963,7 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
var (
gitRepos = make(map[int64]*git.Repository)
res = make(map[int64][]*git_model.CommitStatus)
lastRes = make(map[int64]*git_model.CommitStatusSummary)
lastRes = make(map[int64]*git_model.CombinedStatus)
err error
)
defer func() {
@@ -992,7 +992,7 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
continue
}
res[issue.PullRequest.ID] = statuses
lastRes[issue.PullRequest.ID] = git_model.CalcCommitStatusSummary(statuses)
lastRes[issue.PullRequest.ID] = git_model.CalcCombinedStatus(statuses)
}
return res, lastRes, nil
}
services/repository/commitstatus/commitstatus.go
+6 -6
View File
@@ -47,7 +47,7 @@ func getCombinedStatusCache(repoID int64, branchName string) *combinedStatusCach
return nil
}
func updateCombinedStatusCache(repoID int64, branchName string, state commitstatus.CombinedStatus, targetURL string) error {
func updateCombinedStatusCache(repoID int64, branchName string, state commitstatus.CombinedStatusState, targetURL string) error {
c := cache.GetCache()
bs, err := json.Marshal(combinedStatusCacheValue{
State: string(state),
@@ -121,13 +121,13 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato
}
// FindReposLastestCombinedStatuses loading repository default branch latest combinded commit status with cache
func FindReposLastestCombinedStatuses(ctx context.Context, repos []*repo_model.Repository) ([]*git_model.CommitStatusSummary, error) {
results := make([]*git_model.CommitStatusSummary, len(repos))
func FindReposLastestCombinedStatuses(ctx context.Context, repos []*repo_model.Repository) ([]*git_model.CombinedStatus, error) {
results := make([]*git_model.CombinedStatus, len(repos))
allCached := true
for i, repo := range repos {
if cv := getCombinedStatusCache(repo.ID, repo.DefaultBranch); cv != nil {
results[i] = &git_model.CommitStatusSummary{
State: commitstatus.CombinedStatus(cv.State),
results[i] = &git_model.CombinedStatus{
State: commitstatus.CombinedStatusState(cv.State),
TargetURL: cv.TargetURL,
}
} else {
@@ -189,7 +189,7 @@ func FindReposLastestCombinedStatuses(ctx context.Context, repos []*repo_model.R
for i, repo := range repos {
if results[i] == nil {
results[i] = git_model.CalcCommitStatusSummary(repoToItsLatestCommitStatuses[repo.ID])
results[i] = git_model.CalcCombinedStatus(repoToItsLatestCommitStatuses[repo.ID])
if results[i] != nil {
if err := updateCombinedStatusCache(repo.ID, repo.DefaultBranch, results[i].State, results[i].TargetURL); err != nil {
log.Error("updateCommitStatusCache[%d:%s] failed: %v", repo.ID, repo.DefaultBranch, err)
services/repository/gitgraph/graph_models.go
+2 -2
View File
@@ -125,7 +125,7 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_
if err != nil {
log.Error("GetLatestCommitStatus: %v", err)
} else {
c.Status = git_model.CalcCommitStatusSummary(statuses)
c.Status = git_model.CalcCombinedStatus(statuses)
}
}
return nil
@@ -249,7 +249,7 @@ type Commit struct {
Commit *git.Commit
User *user_model.User
Verification *asymkey_model.CommitVerification
Status *git_model.CommitStatusSummary
Status *git_model.CombinedStatus
Flow int64
Row int
Column int
services/repository/repository.go
+3 -3
View File
@@ -34,9 +34,9 @@ import (
// WebSearchRepository represents a repository returned by web search
type WebSearchRepository struct {
Repository *structs.Repository `json:"repository"`
LatestCommitStatus *git.CommitStatusSummary `json:"latest_commit_status"`
LocaleLatestCommitStatus string `json:"locale_latest_commit_status"`
Repository *structs.Repository `json:"repository"`
LatestCombinedStatus *git.CombinedStatus `json:"latest_commit_status"`
LocaleLatestCombinedStatus string `json:"locale_latest_commit_status"`
}
// WebSearchResults results of a successful web search