Add commit statuses reports on pull request view (#6845)
* Add commit statuses reports on pull view * Add some translations * improve the UI * fix fmt * fix tests * add a new test git repo to fix tests * fix bug when headRepo or headBranch missing * fix tests * fix tests * fix consistency * fix tests * fix tests * change the test repo * fix tests * fix tests * fix migration * keep db size consistency * fix translation * change commit hash status table unique index * remove unused table * use char instead varchar * make hashCommitStatusContext private * split merge section with status check on pull view ui * fix tests; fix arc-green theme on pull uitokarchuk/v1.17
Lunny Xiao
6 years ago
committed by
zeripath
parent
1e46eedce7
commit
ff85dd3e12
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@ |
||||
0abcb056019adb8336cf9db3ad9d9cf80cd4b141 |
||||
@ -0,0 +1,66 @@ |
||||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package migrations |
||||
|
||||
import ( |
||||
"crypto/sha1" |
||||
"fmt" |
||||
|
||||
"github.com/go-xorm/xorm" |
||||
) |
||||
|
||||
func hashContext(context string) string { |
||||
return fmt.Sprintf("%x", sha1.Sum([]byte(context))) |
||||
} |
||||
|
||||
func addCommitStatusContext(x *xorm.Engine) error { |
||||
type CommitStatus struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
ContextHash string `xorm:"char(40) index"` |
||||
Context string `xorm:"TEXT"` |
||||
} |
||||
|
||||
if err := x.Sync2(new(CommitStatus)); err != nil { |
||||
return err |
||||
} |
||||
|
||||
sess := x.NewSession() |
||||
defer sess.Close() |
||||
|
||||
var start = 0 |
||||
for { |
||||
var statuses = make([]*CommitStatus, 0, 100) |
||||
err := sess.OrderBy("id").Limit(100, start).Find(&statuses) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
if len(statuses) == 0 { |
||||
break |
||||
} |
||||
|
||||
if err = sess.Begin(); err != nil { |
||||
return err |
||||
} |
||||
|
||||
for _, status := range statuses { |
||||
status.ContextHash = hashContext(status.Context) |
||||
if _, err := sess.ID(status.ID).Cols("context_hash").Update(status); err != nil { |
||||
return err |
||||
} |
||||
} |
||||
|
||||
if err := sess.Commit(); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if len(statuses) < 100 { |
||||
break |
||||
} |
||||
|
||||
start += len(statuses) |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package repofiles |
||||
|
||||
import ( |
||||
"fmt" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/git" |
||||
) |
||||
|
||||
// CreateCommitStatus creates a new CommitStatus given a bunch of parameters
|
||||
// NOTE: All text-values will be trimmed from whitespaces.
|
||||
// Requires: Repo, Creator, SHA
|
||||
func CreateCommitStatus(repo *models.Repository, creator *models.User, sha string, status *models.CommitStatus) error { |
||||
repoPath := repo.RepoPath() |
||||
|
||||
// confirm that commit is exist
|
||||
gitRepo, err := git.OpenRepository(repoPath) |
||||
if err != nil { |
||||
return fmt.Errorf("OpenRepository[%s]: %v", repoPath, err) |
||||
} |
||||
if _, err := gitRepo.GetCommit(sha); err != nil { |
||||
return fmt.Errorf("GetCommit[%s]: %v", sha, err) |
||||
} |
||||
|
||||
if err := models.NewCommitStatus(models.NewCommitStatusOptions{ |
||||
Repo: repo, |
||||
Creator: creator, |
||||
SHA: sha, |
||||
CommitStatus: status, |
||||
}); err != nil { |
||||
return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %v", repo.ID, creator.ID, sha, err) |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
@ -0,0 +1,21 @@ |
||||
{{if $.LatestCommitStatus}} |
||||
<div class="ui top attached header"> |
||||
{{if eq .LatestCommitStatus.State "pending"}} |
||||
{{$.i18n.Tr "repo.pulls.status_checking"}} |
||||
{{else if eq .LatestCommitStatus.State "success"}} |
||||
{{$.i18n.Tr "repo.pulls.status_checks_success"}} |
||||
{{else if eq .LatestCommitStatus.State "error"}} |
||||
{{$.i18n.Tr "repo.pulls.status_checks_error"}} |
||||
{{else}} |
||||
{{$.i18n.Tr "repo.pulls.status_checking"}} |
||||
{{end}} |
||||
</div> |
||||
|
||||
{{range $.LatestCommitStatuses}} |
||||
<div class="ui attached segment"> |
||||
<span>{{template "repo/commit_status" .}}</span> |
||||
<span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span> |
||||
<div class="ui right">{{if .TargetURL}}<a href="{{.TargetURL}}">Details</a>{{end}}</div> |
||||
</div> |
||||
{{end}} |
||||
{{end}} |
||||
Loading…
Reference in new issue