Add push commits history comment on PR time-line

models/issue_comment.go

@@ -7,6 +7,7 @@
 package models
 
 import (
+	"container/list"
 	"fmt"
 	"strings"
 
@@ -90,6 +91,8 @@ const (
 	CommentTypeReviewRequest
 	// merge pull request
 	CommentTypeMergePull
+	// push to PR head branch
+	CommentTypePullPush
 )
 
 // CommentTag defines comment tag type
@@ -167,6 +170,11 @@ type Comment struct {
 	RefRepo    *Repository `xorm:"-"`
 	RefIssue   *Issue      `xorm:"-"`
 	RefComment *Comment    `xorm:"-"`
+
+	Commits     *list.List `xorm:"-"`
+	OldCommit   string     `xorm:"-"`
+	NewCommit   string     `xorm:"-"`
+	IsForcePush bool
 }
 
 // LoadIssue loads issue from database
@@ -543,6 +551,34 @@ func (c *Comment) CodeCommentURL() string {
 	return fmt.Sprintf("%s/files#%s", c.Issue.HTMLURL(), c.HashTag())
 }
 
+// LoadPushCommits Load push commits
+func (c *Comment) LoadPushCommits() (err error) {
+	if c.Content == "" {
+		return err
+	}
+
+	commitIDs := strings.Split(c.Content, ":")
+	if int64(len(commitIDs)) != c.Line {
+		return fmt.Errorf("LoadPushCommits: len of commitIDs is wrong %d - %d",
+			len(commitIDs),
+			c.Line)
+	}
+	c.Commits, err = getCommitsFromCommitIDs(c.Issue.Repo, commitIDs)
+	if err != nil {
+		return err
+	}
+
+	c.Commits = ValidateCommitsWithEmails(c.Commits)
+	c.Commits = ParseCommitsWithSignature(c.Commits, c.Issue.Repo)
+	c.Commits = ParseCommitsWithStatus(c.Commits, c.Issue.Repo)
+
+	if c.IsForcePush {
+		c.OldCommit = commitIDs[0]
+		c.NewCommit = commitIDs[1]
+	}
+	return err
+}
+
 func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err error) {
 	var LabelID int64
 	if opts.Label != nil {
@@ -576,6 +612,7 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		RefCommentID:     opts.RefCommentID,
 		RefAction:        opts.RefAction,
 		RefIsPull:        opts.RefIsPull,
+		IsForcePush:      opts.IsForcePush,
 	}
 	if _, err = e.Insert(comment); err != nil {
 		return nil, err
@@ -738,6 +775,7 @@ type CreateCommentOptions struct {
 	RefCommentID     int64
 	RefAction        references.XRefAction
 	RefIsPull        bool
+	IsForcePush      bool
 }
 
 // CreateComment creates comment of issue or commit.
@@ -1016,3 +1054,147 @@ func UpdateCommentsMigrationsByType(tp structs.GitServiceType, originalAuthorID
 		})
 	return err
 }
+
+// CreatePushPullComment create push code to pull base commend
+func CreatePushPullComment(pusher *User, pr *PullRequest, oldCommitID, newCommitID string) (comment *Comment, err error) {
+	if pr.HasMerged || oldCommitID == "" || newCommitID == "" {
+		return nil, nil
+	}
+
+	ops := &CreateCommentOptions{
+		Type: CommentTypePullPush,
+		Doer: pusher,
+		Repo: pr.BaseRepo,
+	}
+
+	var commitIDs []string
+	messages := ""
+
+	var isForcePush bool
+	commitIDs, messages, isForcePush, err = getCommitIDsFromRepo(pr.BaseRepo, oldCommitID, newCommitID, pr.BaseBranch)
+	if err != nil {
+		return nil, err
+	}
+
+	ops.LineNum = int64(len(commitIDs))
+	ops.Issue = pr.Issue
+	ops.IsForcePush = isForcePush
+
+	commitIDlist := ""
+
+	for _, commitID := range commitIDs {
+		commitIDlist = commitID + ":" + commitIDlist
+	}
+
+	ops.Content = commitIDlist[0 : len(commitIDlist)-1]
+
+	comment, err = CreateComment(ops)
+	if err != nil {
+		return
+	}
+
+	// Prepare the contents for notify
+	prmessages := "@" + ops.Doer.Name
+	if ops.IsForcePush {
+		prmessages += " force-pushed the " + pr.HeadBranch + " branch from " + oldCommitID + " to " + newCommitID
+	} else {
+		if ops.LineNum == 1 {
+			prmessages += fmt.Sprintf(" pushed 1 commit to %s:  \n ", pr.HeadBranch)
+		} else {
+			prmessages += fmt.Sprintf(" pushed %d commits to %s:  \n ", ops.LineNum, pr.HeadBranch)
+		}
+		prmessages += messages
+	}
+
+	comment.Content = prmessages
+
+	return
+}
+
+// getCommitsFromRepo get commit IDs from repo in betwern oldCommitID and newCommitID
+// isForcePush will be true if oldCommit isn't on the branch
+// Commit on baseBranch will skip
+func getCommitIDsFromRepo(repo *Repository, oldCommitID, newCommitID, baseBranch string) (commitIDs []string, messages string, isForcePush bool, err error) {
+	repoPath := repo.RepoPath()
+	gitRepo, err := git.OpenRepository(repoPath)
+	if err != nil {
+		return nil, "", false, err
+	}
+	defer gitRepo.Close()
+
+	oldCommit, err := gitRepo.GetCommit(oldCommitID)
+	if err != nil {
+		return nil, "", false, err
+	}
+
+	oldCommitBranch, err := oldCommit.GetBranchName()
+	if err != nil {
+		return nil, "", false, err
+	}
+
+	if oldCommitBranch == "undefined" {
+		commitIDs = make([]string, 2)
+		commitIDs[1] = oldCommitID
+		commitIDs[0] = newCommitID
+
+		return commitIDs, "", true, err
+	}
+
+	newCommit, err := gitRepo.GetCommit(newCommitID)
+	if err != nil {
+		return nil, "", false, err
+	}
+
+	var commits *list.List
+	commits, err = newCommit.CommitsBeforeUntil(oldCommitID)
+	if err != nil {
+		return nil, "", false, err
+	}
+
+	commitIDs = make([]string, 0, commits.Len())
+	messages = ""
+
+	for e := commits.Front(); e != nil; e = e.Next() {
+		commit := e.Value.(*git.Commit)
+		commitBranch, err := commit.GetBranchName()
+		if err != nil {
+			return nil, "", false, err
+		}
+
+		if commitBranch != baseBranch {
+			commitID := commit.ID.String()
+			commitMsg := commit.Message()
+			commitMsg = strings.Split(commitMsg, "\n")[0]
+			messages = "* " + commitID[0:10] + " - " + commitMsg + "  \n" + messages
+			commitIDs = append(commitIDs, commitID)
+		}
+	}
+
+	return
+}
+
+// getCommitsFromCommitIDs get commits from commitIDs
+func getCommitsFromCommitIDs(repo *Repository, commitIDs []string) (commits *list.List, err error) {
+	if commitIDs == nil {
+		return nil, nil
+	}
+
+	repoPath := repo.RepoPath()
+	gitRepo, err := git.OpenRepository(repoPath)
+	if err != nil {
+		return nil, err
+	}
+	defer gitRepo.Close()
+
+	commits = list.New()
+
+	for _, commitID := range commitIDs {
+		commit, err := gitRepo.GetCommit(commitID)
+		if err != nil {
+			return nil, err
+		}
+		commits.PushBack(commit)
+	}
+
+	return commits, nil
+}

models/migrations/migrations.go

@@ -210,6 +210,8 @@ var migrations = []Migration{
 	NewMigration("Add Branch Protection Block Outdated Branch", addBlockOnOutdatedBranch),
 	// v138 -> v139
 	NewMigration("Add ResolveDoerID to Comment table", addResolveDoerIDCommentColumn),
+	// v139 -> v140
+	NewMigration("Add IsForcePush to Comment table", addIsForcePushCommentColumn),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v139.go

@@ -0,0 +1,22 @@
+// Copyright 2020 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 (
+	"fmt"
+
+	"xorm.io/xorm"
+)
+
+func addIsForcePushCommentColumn(x *xorm.Engine) error {
+	type Comment struct {
+		IsForcePush bool
+	}
+
+	if err := x.Sync2(new(Comment)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+	return nil
+}

modules/git/commit.go

@@ -474,7 +474,7 @@ func (c *Commit) GetBranchName() (string, error) {
 	}
 
 	// name-rev commitID output will be "COMMIT_ID master" or "COMMIT_ID master~12"
-	return strings.Split(strings.Split(string(data), " ")[1], "~")[0], nil
+	return strings.Split(strings.Split(strings.Split(string(data), " ")[1], "~")[0], "\n")[0], nil
 }
 
 // CommitFileStatus represents status of files in a commit.

modules/notification/action/action.go

@@ -89,6 +89,9 @@ func (a *actionNotifier) NotifyIssueChangeStatus(doer *models.User, issue *model
 // NotifyCreateIssueComment notifies comment on an issue to notifiers
 func (a *actionNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
 	issue *models.Issue, comment *models.Comment) {
+	if comment.Type == models.CommentTypePullPush {
+		return
+	}
 	act := &models.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,

modules/notification/indexer/indexer.go

@@ -31,6 +31,10 @@ func NewNotifier() base.Notifier {
 
 func (r *indexerNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
 	issue *models.Issue, comment *models.Comment) {
+	if comment.Type == models.CommentTypePullPush {
+		return
+	}
+
 	if comment.Type == models.CommentTypeComment {
 		if issue.Comments == nil {
 			if err := issue.LoadDiscussComments(); err != nil {

modules/notification/mail/mail.go

@@ -37,6 +37,8 @@ func (m *mailNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.
 		act = models.ActionCommentIssue
 	} else if comment.Type == models.CommentTypeCode {
 		act = models.ActionCommentIssue
+	} else if comment.Type == models.CommentTypePullPush {
+		act = models.ActionCommentIssue
 	}
 
 	if err := mailer.MailParticipantsComment(comment, act, issue); err != nil {

modules/notification/webhook/webhook.go

@@ -392,6 +392,10 @@ func (m *webhookNotifier) NotifyUpdateComment(doer *models.User, c *models.Comme
 
 func (m *webhookNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
 	issue *models.Issue, comment *models.Comment) {
+	if comment.Type == models.CommentTypePullPush {
+		return
+	}
+
 	mode, _ := models.AccessLevel(doer, repo)
 
 	var err error

options/locale/locale_en-US.ini

@@ -1013,6 +1013,9 @@ issues.due_date = Due Date
 issues.invalid_due_date_format = "Due date format must be 'yyyy-mm-dd'."
 issues.error_modifying_due_date = "Failed to modify the due date."
 issues.error_removing_due_date = "Failed to remove the due date."
+issues.push_commit_1 = "add %d commit %s"
+issues.push_commits_n = "add %d commits %s"
+issues.force_push_codes =  `force-pushed the %[1]s branch from <a href="%[3]s">%[2]s</a> to <a href="%[5]s">%[4]s</a>.  %[6]s`
 issues.due_date_form = "yyyy-mm-dd"
 issues.due_date_form_add = "Add due date"
 issues.due_date_form_edit = "Edit"

routers/repo/issue.go

@@ -989,6 +989,12 @@ func ViewIssue(ctx *context.Context) {
 				ctx.ServerError("LoadResolveDoer", err)
 				return
 			}
+		} else if comment.Type == models.CommentTypePullPush {
+			participants = addParticipant(comment.Poster, participants)
+			if err = comment.LoadPushCommits(); err != nil {
+				ctx.ServerError("LoadPushCommits", err)
+				return
+			}
 		}
 	}
 

services/pull/pull.go

@@ -57,6 +57,41 @@ func NewPullRequest(repo *models.Repository, pull *models.Issue, labelIDs []int6
 
 	notification.NotifyNewPullRequest(pr)
 
+	// add first push codes command
+	baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
+	if err != nil {
+		return err
+	}
+	defer baseGitRepo.Close()
+
+	compareInfo, err := baseGitRepo.GetCompareInfo(pr.BaseRepo.RepoPath(),
+		pr.BaseBranch, pr.GetGitRefName())
+	if err != nil {
+		return err
+	}
+
+	if compareInfo.Commits.Len() > 0 {
+		comitIDs := ""
+		for e := compareInfo.Commits.Front(); e != nil; e = e.Next() {
+			commitID := e.Value.(*git.Commit).ID.String()
+			comitIDs = commitID + ":" + comitIDs
+		}
+
+		comitIDs = comitIDs[0 : len(comitIDs)-1]
+
+		ops := &models.CreateCommentOptions{
+			Type:        models.CommentTypePullPush,
+			Doer:        pull.Poster,
+			Repo:        repo,
+			LineNum:     int64(compareInfo.Commits.Len()),
+			Issue:       pr.Issue,
+			IsForcePush: false,
+			Content:     comitIDs,
+		}
+
+		_, _ = models.CreateComment(ops)
+	}
+
 	return nil
 }
 
@@ -237,6 +272,12 @@ func AddTestPullRequestTask(doer *models.User, repoID int64, branch string, isSy
 		}
 
 		addHeadRepoTasks(prs)
+		for _, pr := range prs {
+			comment, err := models.CreatePushPullComment(doer, pr, oldCommitID, newCommitID)
+			if err == nil && comment != nil {
+				notification.NotifyCreateIssueComment(doer, pr.BaseRepo, pr.Issue, comment)
+			}
+		}
 
 		log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
 		prs, err = models.GetUnmergedPullRequestsByBaseInfo(repoID, branch)