mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 00:20:25 +08:00 
			
		
		
		
	* CutDiffAroundLine makes the incorrect assumption that `---` and `+++` always represent part of the header of a diff. This PR adds a flag to its parsing to prevent this problem and adds a streaming parsing technique to CutDiffAroundLine using an io.pipe instead of just sending data to an unbounded buffer. Fix #14711 Signed-off-by: Andrew Thornton <art27@cantab.net> * Handle unquoted comment patch files When making comment patches unfortunately the patch does not always quote the filename This makes the diff --git header ambiguous again. This PR finally adds handling for ambiguity in to parse patch Fix #14812 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add in testing for no error There is no way currently for CutDiffAroundLine in this test to cause an error however, it should still be tested. Signed-off-by: Andrew Thornton <art27@cantab.net>
		
			
				
	
	
		
			321 lines
		
	
	
		
			8.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			321 lines
		
	
	
		
			8.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// 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 pull
 | 
						|
 | 
						|
import (
 | 
						|
	"fmt"
 | 
						|
	"io"
 | 
						|
	"regexp"
 | 
						|
	"strings"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/models"
 | 
						|
	"code.gitea.io/gitea/modules/git"
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	"code.gitea.io/gitea/modules/notification"
 | 
						|
	"code.gitea.io/gitea/modules/setting"
 | 
						|
)
 | 
						|
 | 
						|
// CreateCodeComment creates a comment on the code line
 | 
						|
func CreateCodeComment(doer *models.User, gitRepo *git.Repository, issue *models.Issue, line int64, content string, treePath string, isReview bool, replyReviewID int64, latestCommitID string) (*models.Comment, error) {
 | 
						|
 | 
						|
	var (
 | 
						|
		existsReview bool
 | 
						|
		err          error
 | 
						|
	)
 | 
						|
 | 
						|
	// CreateCodeComment() is used for:
 | 
						|
	// - Single comments
 | 
						|
	// - Comments that are part of a review
 | 
						|
	// - Comments that reply to an existing review
 | 
						|
 | 
						|
	if !isReview && replyReviewID != 0 {
 | 
						|
		// It's not part of a review; maybe a reply to a review comment or a single comment.
 | 
						|
		// Check if there are reviews for that line already; if there are, this is a reply
 | 
						|
		if existsReview, err = models.ReviewExists(issue, treePath, line); err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	// Comments that are replies don't require a review header to show up in the issue view
 | 
						|
	if !isReview && existsReview {
 | 
						|
		if err = issue.LoadRepo(); err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
 | 
						|
		comment, err := createCodeComment(
 | 
						|
			doer,
 | 
						|
			issue.Repo,
 | 
						|
			issue,
 | 
						|
			content,
 | 
						|
			treePath,
 | 
						|
			line,
 | 
						|
			replyReviewID,
 | 
						|
		)
 | 
						|
		if err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
 | 
						|
		mentions, err := issue.FindAndUpdateIssueMentions(models.DefaultDBContext(), doer, comment.Content)
 | 
						|
		if err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
 | 
						|
		notification.NotifyCreateIssueComment(doer, issue.Repo, issue, comment, mentions)
 | 
						|
 | 
						|
		return comment, nil
 | 
						|
	}
 | 
						|
 | 
						|
	review, err := models.GetCurrentReview(doer, issue)
 | 
						|
	if err != nil {
 | 
						|
		if !models.IsErrReviewNotExist(err) {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
 | 
						|
		if review, err = models.CreateReview(models.CreateReviewOptions{
 | 
						|
			Type:     models.ReviewTypePending,
 | 
						|
			Reviewer: doer,
 | 
						|
			Issue:    issue,
 | 
						|
			Official: false,
 | 
						|
			CommitID: latestCommitID,
 | 
						|
		}); err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	comment, err := createCodeComment(
 | 
						|
		doer,
 | 
						|
		issue.Repo,
 | 
						|
		issue,
 | 
						|
		content,
 | 
						|
		treePath,
 | 
						|
		line,
 | 
						|
		review.ID,
 | 
						|
	)
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	if !isReview && !existsReview {
 | 
						|
		// Submit the review we've just created so the comment shows up in the issue view
 | 
						|
		if _, _, err = SubmitReview(doer, gitRepo, issue, models.ReviewTypeComment, "", latestCommitID); err != nil {
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	// NOTICE: if it's a pending review the notifications will not be fired until user submit review.
 | 
						|
 | 
						|
	return comment, nil
 | 
						|
}
 | 
						|
 | 
						|
var notEnoughLines = regexp.MustCompile(`exit status 128 - fatal: file .* has only \d+ lines?`)
 | 
						|
 | 
						|
// createCodeComment creates a plain code comment at the specified line / path
 | 
						|
func createCodeComment(doer *models.User, repo *models.Repository, issue *models.Issue, content, treePath string, line, reviewID int64) (*models.Comment, error) {
 | 
						|
	var commitID, patch string
 | 
						|
	if err := issue.LoadPullRequest(); err != nil {
 | 
						|
		return nil, fmt.Errorf("GetPullRequestByIssueID: %v", err)
 | 
						|
	}
 | 
						|
	pr := issue.PullRequest
 | 
						|
	if err := pr.LoadBaseRepo(); err != nil {
 | 
						|
		return nil, fmt.Errorf("LoadHeadRepo: %v", err)
 | 
						|
	}
 | 
						|
	gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
 | 
						|
	if err != nil {
 | 
						|
		return nil, fmt.Errorf("OpenRepository: %v", err)
 | 
						|
	}
 | 
						|
	defer gitRepo.Close()
 | 
						|
 | 
						|
	invalidated := false
 | 
						|
	head := pr.GetGitRefName()
 | 
						|
	if line > 0 {
 | 
						|
		if reviewID != 0 {
 | 
						|
			first, err := models.FindComments(models.FindCommentsOptions{
 | 
						|
				ReviewID: reviewID,
 | 
						|
				Line:     line,
 | 
						|
				TreePath: treePath,
 | 
						|
				Type:     models.CommentTypeCode,
 | 
						|
				ListOptions: models.ListOptions{
 | 
						|
					PageSize: 1,
 | 
						|
					Page:     1,
 | 
						|
				},
 | 
						|
			})
 | 
						|
			if err == nil && len(first) > 0 {
 | 
						|
				commitID = first[0].CommitSHA
 | 
						|
				invalidated = first[0].Invalidated
 | 
						|
				patch = first[0].Patch
 | 
						|
			} else if err != nil && !models.IsErrCommentNotExist(err) {
 | 
						|
				return nil, fmt.Errorf("Find first comment for %d line %d path %s. Error: %v", reviewID, line, treePath, err)
 | 
						|
			} else {
 | 
						|
				review, err := models.GetReviewByID(reviewID)
 | 
						|
				if err == nil && len(review.CommitID) > 0 {
 | 
						|
					head = review.CommitID
 | 
						|
				} else if err != nil && !models.IsErrReviewNotExist(err) {
 | 
						|
					return nil, fmt.Errorf("GetReviewByID %d. Error: %v", reviewID, err)
 | 
						|
				}
 | 
						|
			}
 | 
						|
		}
 | 
						|
 | 
						|
		if len(commitID) == 0 {
 | 
						|
			// FIXME validate treePath
 | 
						|
			// Get latest commit referencing the commented line
 | 
						|
			// No need for get commit for base branch changes
 | 
						|
			commit, err := gitRepo.LineBlame(head, gitRepo.Path, treePath, uint(line))
 | 
						|
			if err == nil {
 | 
						|
				commitID = commit.ID.String()
 | 
						|
			} else if !(strings.Contains(err.Error(), "exit status 128 - fatal: no such path") || notEnoughLines.MatchString(err.Error())) {
 | 
						|
				return nil, fmt.Errorf("LineBlame[%s, %s, %s, %d]: %v", pr.GetGitRefName(), gitRepo.Path, treePath, line, err)
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	// Only fetch diff if comment is review comment
 | 
						|
	if len(patch) == 0 && reviewID != 0 {
 | 
						|
		headCommitID, err := gitRepo.GetRefCommitID(pr.GetGitRefName())
 | 
						|
		if err != nil {
 | 
						|
			return nil, fmt.Errorf("GetRefCommitID[%s]: %v", pr.GetGitRefName(), err)
 | 
						|
		}
 | 
						|
		if len(commitID) == 0 {
 | 
						|
			commitID = headCommitID
 | 
						|
		}
 | 
						|
		reader, writer := io.Pipe()
 | 
						|
		defer func() {
 | 
						|
			_ = reader.Close()
 | 
						|
			_ = writer.Close()
 | 
						|
		}()
 | 
						|
		go func() {
 | 
						|
			if err := git.GetRepoRawDiffForFile(gitRepo, pr.MergeBase, headCommitID, git.RawDiffNormal, treePath, writer); err != nil {
 | 
						|
				_ = writer.CloseWithError(fmt.Errorf("GetRawDiffForLine[%s, %s, %s, %s]: %v", gitRepo.Path, pr.MergeBase, headCommitID, treePath, err))
 | 
						|
				return
 | 
						|
			}
 | 
						|
			_ = writer.Close()
 | 
						|
		}()
 | 
						|
 | 
						|
		patch, err = git.CutDiffAroundLine(reader, int64((&models.Comment{Line: line}).UnsignedLine()), line < 0, setting.UI.CodeCommentLines)
 | 
						|
		if err != nil {
 | 
						|
			log.Error("Error whilst generating patch: %v", err)
 | 
						|
			return nil, err
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return models.CreateComment(&models.CreateCommentOptions{
 | 
						|
		Type:        models.CommentTypeCode,
 | 
						|
		Doer:        doer,
 | 
						|
		Repo:        repo,
 | 
						|
		Issue:       issue,
 | 
						|
		Content:     content,
 | 
						|
		LineNum:     line,
 | 
						|
		TreePath:    treePath,
 | 
						|
		CommitSHA:   commitID,
 | 
						|
		ReviewID:    reviewID,
 | 
						|
		Patch:       patch,
 | 
						|
		Invalidated: invalidated,
 | 
						|
	})
 | 
						|
}
 | 
						|
 | 
						|
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
 | 
						|
func SubmitReview(doer *models.User, gitRepo *git.Repository, issue *models.Issue, reviewType models.ReviewType, content, commitID string) (*models.Review, *models.Comment, error) {
 | 
						|
	pr, err := issue.GetPullRequest()
 | 
						|
	if err != nil {
 | 
						|
		return nil, nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	var stale bool
 | 
						|
	if reviewType != models.ReviewTypeApprove && reviewType != models.ReviewTypeReject {
 | 
						|
		stale = false
 | 
						|
	} else {
 | 
						|
		headCommitID, err := gitRepo.GetRefCommitID(pr.GetGitRefName())
 | 
						|
		if err != nil {
 | 
						|
			return nil, nil, err
 | 
						|
		}
 | 
						|
 | 
						|
		if headCommitID == commitID {
 | 
						|
			stale = false
 | 
						|
		} else {
 | 
						|
			stale, err = checkIfPRContentChanged(pr, commitID, headCommitID)
 | 
						|
			if err != nil {
 | 
						|
				return nil, nil, err
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	review, comm, err := models.SubmitReview(doer, issue, reviewType, content, commitID, stale)
 | 
						|
	if err != nil {
 | 
						|
		return nil, nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	ctx := models.DefaultDBContext()
 | 
						|
	mentions, err := issue.FindAndUpdateIssueMentions(ctx, doer, comm.Content)
 | 
						|
	if err != nil {
 | 
						|
		return nil, nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	notification.NotifyPullRequestReview(pr, review, comm, mentions)
 | 
						|
 | 
						|
	for _, lines := range review.CodeComments {
 | 
						|
		for _, comments := range lines {
 | 
						|
			for _, codeComment := range comments {
 | 
						|
				mentions, err := issue.FindAndUpdateIssueMentions(ctx, doer, codeComment.Content)
 | 
						|
				if err != nil {
 | 
						|
					return nil, nil, err
 | 
						|
				}
 | 
						|
				notification.NotifyPullRequestCodeComment(pr, codeComment, mentions)
 | 
						|
			}
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	return review, comm, nil
 | 
						|
}
 | 
						|
 | 
						|
// DismissReview dismissing stale review by repo admin
 | 
						|
func DismissReview(reviewID int64, message string, doer *models.User, isDismiss bool) (comment *models.Comment, err error) {
 | 
						|
	review, err := models.GetReviewByID(reviewID)
 | 
						|
	if err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
 | 
						|
	if review.Type != models.ReviewTypeApprove && review.Type != models.ReviewTypeReject {
 | 
						|
		return nil, fmt.Errorf("not need to dismiss this review because it's type is not Approve or change request")
 | 
						|
	}
 | 
						|
 | 
						|
	if err = models.DismissReview(review, isDismiss); err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
 | 
						|
	if !isDismiss {
 | 
						|
		return nil, nil
 | 
						|
	}
 | 
						|
 | 
						|
	// load data for notify
 | 
						|
	if err = review.LoadAttributes(); err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
	if err = review.Issue.LoadPullRequest(); err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
	if err = review.Issue.LoadAttributes(); err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
 | 
						|
	comment, err = models.CreateComment(&models.CreateCommentOptions{
 | 
						|
		Doer:     doer,
 | 
						|
		Content:  message,
 | 
						|
		Type:     models.CommentTypeDismissReview,
 | 
						|
		ReviewID: review.ID,
 | 
						|
		Issue:    review.Issue,
 | 
						|
		Repo:     review.Issue.Repo,
 | 
						|
	})
 | 
						|
	if err != nil {
 | 
						|
		return
 | 
						|
	}
 | 
						|
 | 
						|
	comment.Review = review
 | 
						|
	comment.Poster = doer
 | 
						|
	comment.Issue = review.Issue
 | 
						|
 | 
						|
	notification.NotifyPullRevieweDismiss(doer, review, comment)
 | 
						|
 | 
						|
	return
 | 
						|
}
 |