Merge 96490ef6d0 into c71ee33057

integrations/editor_test.go

@@ -150,6 +150,19 @@ func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, bra
 	return resp
 }
 
+func testEditFileToNewBranchAndSendPull(t *testing.T, session *TestSession, user, repo, branch, targetBranch, filePath, newContent string) *httptest.ResponseRecorder {
+	testEditFileToNewBranch(t, session, user, repo, branch, targetBranch, filePath, newContent)
+
+	url := path.Join(user, repo, "compare", branch+"..."+targetBranch)
+	req := NewRequestWithValues(t, "POST", url,
+		map[string]string{
+			"_csrf": GetCSRF(t, session, url),
+			"title": "pull request from " + targetBranch,
+		},
+	)
+	return session.MakeRequest(t, req, http.StatusFound)
+}
+
 func TestEditFile(t *testing.T) {
 	prepareTestEnv(t)
 	session := loginUser(t, "user2")

integrations/repo_pull_status_test.go

@@ -0,0 +1,128 @@
+// Copyright 2017 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 integrations
+
+import (
+	"fmt"
+	"net/http"
+	"path"
+	"strings"
+	"testing"
+
+	"code.gitea.io/gitea/models"
+	api "code.gitea.io/sdk/gitea"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	statesIcons = map[models.CommitStatusState]string{
+		models.CommitStatusPending: "circle icon yellow",
+		models.CommitStatusSuccess: "check icon green",
+		models.CommitStatusError:   "warning icon red",
+		models.CommitStatusFailure: "remove icon red",
+		models.CommitStatusWarning: "warning sign icon yellow",
+	}
+)
+
+func TestRepoPullsWithStatus(t *testing.T) {
+	prepareTestEnv(t)
+
+	session := loginUser(t, "user2")
+
+	var size = 5
+	// create some pulls
+	for i := 0; i < size; i++ {
+		testEditFileToNewBranchAndSendPull(t, session, "user2", "repo16", "master", fmt.Sprintf("test%d", i), "readme.md", fmt.Sprintf("test%d", i))
+	}
+
+	// look for repo's pulls page
+	req := NewRequest(t, "GET", "/user2/repo16/pulls")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	doc := NewHTMLParser(t, resp.Body)
+
+	var indexes = make([]string, 0, size)
+	doc.doc.Find("li.item").Each(func(idx int, s *goquery.Selection) {
+		indexes = append(indexes, strings.TrimLeft(s.Find("div").Eq(1).Text(), "#"))
+	})
+
+	indexes = indexes[:5]
+
+	var status = make([]models.CommitStatusState, len(indexes))
+	for i := 0; i < len(indexes); i++ {
+		switch i {
+		case 0:
+			status[i] = models.CommitStatusPending
+		case 1:
+			status[i] = models.CommitStatusSuccess
+		case 2:
+			status[i] = models.CommitStatusError
+		case 3:
+			status[i] = models.CommitStatusFailure
+		case 4:
+			status[i] = models.CommitStatusWarning
+		default:
+			status[i] = models.CommitStatusSuccess
+		}
+	}
+
+	for i, index := range indexes {
+		// Request repository commits page
+		req = NewRequestf(t, "GET", "/user2/repo16/pulls/%s/commits", index)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		doc = NewHTMLParser(t, resp.Body)
+
+		// Get first commit URL
+		commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
+		assert.True(t, exists)
+		assert.NotEmpty(t, commitURL)
+
+		commitID := path.Base(commitURL)
+		// Call API to add status for commit
+		req = NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo16/statuses/"+commitID,
+			api.CreateStatusOption{
+				State:       api.StatusState(status[i]),
+				TargetURL:   "http://test.ci/",
+				Description: "",
+				Context:     "testci",
+			},
+		)
+		session.MakeRequest(t, req, http.StatusCreated)
+
+		req = NewRequestf(t, "GET", "/user2/repo16/pulls/%s/commits", index)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		doc = NewHTMLParser(t, resp.Body)
+
+		commitURL, exists = doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
+		assert.True(t, exists)
+		assert.NotEmpty(t, commitURL)
+		assert.EqualValues(t, commitID, path.Base(commitURL))
+
+		cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
+		assert.True(t, ok)
+		assert.EqualValues(t, "commit-status "+statesIcons[status[i]], cls)
+	}
+
+	req = NewRequest(t, "GET", "/user2/repo16/pulls")
+	resp = session.MakeRequest(t, req, http.StatusOK)
+	doc = NewHTMLParser(t, resp.Body)
+
+	doc.doc.Find("li.item").Each(func(i int, s *goquery.Selection) {
+		cls, ok := s.Find("i.commit-status").Attr("class")
+		assert.True(t, ok)
+		assert.EqualValues(t, "commit-status "+statesIcons[status[i]], cls)
+	})
+
+	req = NewRequest(t, "GET", "/pulls?type=all&repo=16&sort=&state=open")
+	resp = session.MakeRequest(t, req, http.StatusOK)
+	doc = NewHTMLParser(t, resp.Body)
+
+	doc.doc.Find("li.item").Each(func(i int, s *goquery.Selection) {
+		cls, ok := s.Find("i.commit-status").Attr("class")
+		assert.True(t, ok)
+		assert.EqualValues(t, "commit-status "+statesIcons[status[i]], cls)
+	})
+}

models/fixtures/repo_unit.yml

@@ -74,3 +74,38 @@
   type: 1
   config: "{}"
   created_unix: 1524304355
+
+-
+  id: 12
+  repo_id: 16
+  type: 1
+  config: "{}"
+  created_unix: 946684810
+
+-
+  id: 13
+  repo_id: 16
+  type: 2
+  config: "{\"EnableTimetracker\":false,\"AllowOnlyContributorsToTrackTime\":false}"
+  created_unix: 946684810
+
+-
+  id: 14
+  repo_id: 16
+  type: 3
+  config: "{}"
+  created_unix: 946684810
+
+-
+  id: 15
+  repo_id: 16
+  type: 4
+  config: "{}"
+  created_unix: 946684810
+
+-
+  id: 16
+  repo_id: 16
+  type: 5
+  config: "{}"
+  created_unix: 946684810

models/pull.go

@@ -60,15 +60,15 @@ type PullRequest struct {
 	Issue   *Issue `xorm:"-"`
 	Index   int64
 
-	HeadRepoID   int64       `xorm:"INDEX"`
+	HeadRepoID     int64       `xorm:"INDEX"`
-	HeadRepo     *Repository `xorm:"-"`
+	HeadRepo       *Repository `xorm:"-"`
-	BaseRepoID   int64       `xorm:"INDEX"`
+	BaseRepoID     int64       `xorm:"INDEX"`
-	BaseRepo     *Repository `xorm:"-"`
+	BaseRepo       *Repository `xorm:"-"`
-	HeadUserName string
+	HeadUserName   string
-	HeadBranch   string
+	HeadBranch     string
-	BaseBranch   string
+	BaseBranch     string
-	MergeBase    string `xorm:"VARCHAR(40)"`
+	MergeBase      string         `xorm:"VARCHAR(40)"`
-
+	LastCommitID   string         `xorm:"-"`
 	HasMerged      bool           `xorm:"INDEX"`
 	MergedCommitID string         `xorm:"VARCHAR(40)"`
 	MergerID       int64          `xorm:"INDEX"`

models/status.go

@@ -15,6 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	api "code.gitea.io/sdk/gitea"
 
+	"github.com/go-xorm/builder"
 	"github.com/go-xorm/xorm"
 )
 
@@ -157,6 +158,77 @@ func GetLatestCommitStatus(repo *Repository, sha string, page int) ([]*CommitSta
 	return statuses, x.In("id", ids).Find(&statuses)
 }
 
+// GetIssuesLatestCommitStatuses returns all statuses with given repoIDs and shas
+func GetIssuesLatestCommitStatuses(issues []*Issue) ([][]*CommitStatus, error) {
+	var cond = builder.NewCond()
+	var repoCache = make(map[int64]*git.Repository)
+	var err error
+	for i := 0; i < len(issues); i++ {
+		var gitRepo *git.Repository
+		var ok bool
+		if gitRepo, ok = repoCache[issues[i].PullRequest.HeadRepoID]; !ok {
+			if err := issues[i].PullRequest.GetHeadRepo(); err != nil {
+				log.Error(4, "GetHeadRepo[%d, %d]: %v", issues[i].PullRequest.ID, issues[i].PullRequest.HeadRepoID, err)
+				continue
+			}
+
+			gitRepo, err = git.OpenRepository(issues[i].PullRequest.HeadRepo.RepoPath())
+			if err != nil {
+				log.Error(4, "OpenRepository[%d, %s]: %v", issues[i].PullRequest.ID, issues[i].PullRequest.HeadRepo.RepoPath(), err)
+				continue
+			}
+			repoCache[issues[i].PullRequest.HeadRepoID] = gitRepo
+		}
+
+		issues[i].PullRequest.LastCommitID, err = gitRepo.GetBranchCommitID(issues[i].PullRequest.HeadBranch)
+		if err != nil {
+			log.Error(4, "GetBranchCommitID[%d, %s]: %v", issues[i].PullRequest.ID, issues[i].PullRequest.HeadBranch, err)
+			continue
+		}
+
+		cond = cond.Or(builder.Eq{
+			"repo_id": issues[i].RepoID,
+			"sha":     issues[i].PullRequest.LastCommitID,
+		})
+	}
+
+	var ids = make([]int64, 0, len(issues))
+	err = x.Table("commit_status").
+		Where(cond).
+		Select("max( id ) as id").
+		GroupBy("repo_id, sha, context").
+		OrderBy("max( id ) desc").
+		Find(&ids)
+	if err != nil {
+		return nil, err
+	}
+
+	var returns = make([][]*CommitStatus, len(issues))
+	if len(ids) == 0 {
+		return returns, nil
+	}
+
+	statuses := make(map[int64]*CommitStatus, len(ids))
+	err = x.In("id", ids).Find(&statuses)
+	if err != nil {
+		return nil, err
+	}
+
+	var repoIDsMap = make(map[string][]int64, len(issues))
+	for _, status := range statuses {
+		key := fmt.Sprintf("%d-%s", status.RepoID, status.SHA)
+		repoIDsMap[key] = append(repoIDsMap[key], status.ID)
+	}
+
+	for i := 0; i < len(issues); i++ {
+		key := fmt.Sprintf("%d-%s", issues[i].RepoID, issues[i].PullRequest.LastCommitID)
+		for _, id := range repoIDsMap[key] {
+			returns[i] = append(returns[i], statuses[id])
+		}
+	}
+	return returns, nil
+}
+
 // GetCommitStatus populates a given status for a given commit.
 // NOTE: If ID or Index isn't given, and only Context, TargetURL and/or Description
 //       is given, the CommitStatus created _last_ will be returned.

routers/repo/issue.go

@@ -210,7 +210,7 @@ func Issues(ctx *context.Context) {
 	}
 
 	// Get posters.
-	for i := range issues {
+	for i := 0; i < len(issues); i++ {
 		// Check read status
 		if !ctx.IsSigned {
 			issues[i].IsRead = true
@@ -219,6 +219,22 @@ func Issues(ctx *context.Context) {
 			return
 		}
 	}
+
+	if isPullList && len(issues) > 0 {
+		commitStatuses, err := models.GetIssuesLatestCommitStatuses(issues)
+		if err != nil {
+			ctx.ServerError("GetIssuesLatestCommitStatuses", err)
+			return
+		}
+
+		var issuesStates = make(map[int64]*models.CommitStatus, len(issues))
+		for i, statuses := range commitStatuses {
+			issuesStates[issues[i].PullRequest.ID] = models.CalcCommitStatus(statuses)
+		}
+
+		ctx.Data["IssuesStates"] = issuesStates
+	}
+
 	ctx.Data["Issues"] = issues
 
 	// Get milestones.

routers/user/home.go

@@ -298,6 +298,20 @@ func Issues(ctx *context.Context) {
 	for _, issue := range issues {
 		issue.Repo = showReposMap[issue.RepoID]
 	}
+	if isPullList && len(issues) > 0 {
+		commitStatuses, err := models.GetIssuesLatestCommitStatuses(issues)
+		if err != nil {
+			ctx.ServerError("GetIssuesLatestCommitStatuses", err)
+			return
+		}
+
+		var issuesStates = make(map[int64]*models.CommitStatus, len(issues))
+		for i, statuses := range commitStatuses {
+			issuesStates[issues[i].PullRequest.ID] = models.CalcCommitStatus(statuses)
+		}
+
+		ctx.Data["IssuesStates"] = issuesStates
+	}
 
 	issueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{
 		UserID:      ctxUser.ID,

templates/repo/commit_status.tmpl

@@ -1,15 +1,17 @@
-{{if eq .State "pending"}}
+{{if .}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status circle icon yellow"></i></a>
+	{{if eq .State "pending"}}
-{{end}}
+		<a href="{{.TargetURL}}" target=_blank><i class="commit-status circle icon yellow"></i></a>
-{{if eq .State "success"}}
+	{{end}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status check icon green"></i></a>
+	{{if eq .State "success"}}
-{{end}}
+		<a href="{{.TargetURL}}" target=_blank><i class="commit-status check icon green"></i></a>
-{{if eq .State "error"}}
+	{{end}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning icon red"></i></a>
+	{{if eq .State "error"}}
-{{end}}
+		<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning icon red"></i></a>
-{{if eq .State "failure"}}
+	{{end}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status remove icon red"></i></a>
+	{{if eq .State "failure"}}
-{{end}}
+		<a href="{{.TargetURL}}" target=_blank><i class="commit-status remove icon red"></i></a>
-{{if eq .State "warning"}}
+	{{end}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning sign icon yellow"></i></a>
+	{{if eq .State "warning"}}
+		<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning sign icon yellow"></i></a>
+	{{end}}
 {{end}}

templates/repo/issue/list.tmpl

@@ -186,7 +186,9 @@
 					</div>
 					<div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div>
 					<a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a>
-
+					{{if .IsPull}}
+						{{template "repo/commit_status" (index $.IssuesStates .ID)}}
+					{{end}}
 					{{if .Ref}}
 						<a class="ui label" href="{{$.RepoLink}}/src/branch/{{.Ref}}">{{.Ref}}</a>
 					{{end}}

templates/user/dashboard/issues.tmpl

@@ -63,7 +63,9 @@
 						<li class="item">
 							<div class="ui label">{{if not $.RepoID}}{{.Repo.FullName}}{{end}}#{{.Index}}</div>
 							<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a>
-
+							{{if .IsPull}}
+								{{template "repo/commit_status" (index $.IssuesStates .ID)}}
+							{{end}}
 							{{with .Labels}}
 								{{/* If we have any labels, we should show them
 								with a 2.5 line height, this way they don't look