Move git diff codes from models to services/gitdiff (#7889)
* move git diff codes from models to services/gitdiff * fix template * fix test * fix templatetokarchuk/v1.17
Lunny Xiao
5 years ago
committed by
techknowlogick
parent
b660a732ae
commit
c03d75fbd5
@ -0,0 +1,69 @@ |
||||
// 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 comments |
||||
|
||||
import ( |
||||
"bytes" |
||||
"fmt" |
||||
"strings" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/git" |
||||
"code.gitea.io/gitea/modules/setting" |
||||
"code.gitea.io/gitea/services/gitdiff" |
||||
) |
||||
|
||||
// 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 |
||||
pr, err := models.GetPullRequestByIssueID(issue.ID) |
||||
if err != nil { |
||||
return nil, fmt.Errorf("GetPullRequestByIssueID: %v", err) |
||||
} |
||||
if err := pr.GetBaseRepo(); err != nil { |
||||
return nil, fmt.Errorf("GetHeadRepo: %v", err) |
||||
} |
||||
gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath()) |
||||
if err != nil { |
||||
return nil, fmt.Errorf("OpenRepository: %v", err) |
||||
} |
||||
|
||||
// FIXME validate treePath
|
||||
// Get latest commit referencing the commented line
|
||||
// No need for get commit for base branch changes
|
||||
if line > 0 { |
||||
commit, err := gitRepo.LineBlame(pr.GetGitRefName(), 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") { |
||||
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 reviewID != 0 { |
||||
headCommitID, err := gitRepo.GetRefCommitID(pr.GetGitRefName()) |
||||
if err != nil { |
||||
return nil, fmt.Errorf("GetRefCommitID[%s]: %v", pr.GetGitRefName(), err) |
||||
} |
||||
patchBuf := new(bytes.Buffer) |
||||
if err := gitdiff.GetRawDiffForFile(gitRepo.Path, pr.MergeBase, headCommitID, gitdiff.RawDiffNormal, treePath, patchBuf); err != nil { |
||||
return nil, fmt.Errorf("GetRawDiffForLine[%s, %s, %s, %s]: %v", err, gitRepo.Path, pr.MergeBase, headCommitID, treePath) |
||||
} |
||||
patch = gitdiff.CutDiffAroundLine(patchBuf, int64((&models.Comment{Line: line}).UnsignedLine()), line < 0, setting.UI.CodeCommentLines) |
||||
} |
||||
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, |
||||
}) |
||||
} |
||||
@ -0,0 +1,16 @@ |
||||
// 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 gitdiff |
||||
|
||||
import ( |
||||
"path/filepath" |
||||
"testing" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
) |
||||
|
||||
func TestMain(m *testing.M) { |
||||
models.MainTest(m, filepath.Join("..", "..")) |
||||
} |
||||
Loading…
Reference in new issue