mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-24 10:46:10 +01:00
6151e69d95
I noticed that `issue_service.CreateComment` adds transaction operations on `issues_model.CreateComment`, we can merge the two functions and we can avoid calling each other's methods in the `services` layer. Co-authored-by: Giteabot <teabot@gitea.io>
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package pull
|
|
|
|
import (
|
|
"context"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/json"
|
|
)
|
|
|
|
// getCommitIDsFromRepo get commit IDs from repo in between oldCommitID and newCommitID
|
|
// isForcePush will be true if oldCommit isn't on the branch
|
|
// Commit on baseBranch will skip
|
|
func getCommitIDsFromRepo(ctx context.Context, repo *repo_model.Repository, oldCommitID, newCommitID, baseBranch string) (commitIDs []string, isForcePush bool, err error) {
|
|
repoPath := repo.RepoPath()
|
|
gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repoPath)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
defer closer.Close()
|
|
|
|
oldCommit, err := gitRepo.GetCommit(oldCommitID)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
newCommit, err := gitRepo.GetCommit(newCommitID)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
isForcePush, err = newCommit.IsForcePush(oldCommitID)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
if isForcePush {
|
|
commitIDs = make([]string, 2)
|
|
commitIDs[0] = oldCommitID
|
|
commitIDs[1] = newCommitID
|
|
|
|
return commitIDs, isForcePush, err
|
|
}
|
|
|
|
// Find commits between new and old commit exclusing base branch commits
|
|
commits, err := gitRepo.CommitsBetweenNotBase(newCommit, oldCommit, baseBranch)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
commitIDs = make([]string, 0, len(commits))
|
|
for i := len(commits) - 1; i >= 0; i-- {
|
|
commitIDs = append(commitIDs, commits[i].ID.String())
|
|
}
|
|
|
|
return commitIDs, isForcePush, err
|
|
}
|
|
|
|
// CreatePushPullComment create push code to pull base comment
|
|
func CreatePushPullComment(ctx context.Context, pusher *user_model.User, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (comment *issues_model.Comment, err error) {
|
|
if pr.HasMerged || oldCommitID == "" || newCommitID == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
ops := &issues_model.CreateCommentOptions{
|
|
Type: issues_model.CommentTypePullRequestPush,
|
|
Doer: pusher,
|
|
Repo: pr.BaseRepo,
|
|
}
|
|
|
|
var data issues_model.PushActionContent
|
|
|
|
data.CommitIDs, data.IsForcePush, err = getCommitIDsFromRepo(ctx, pr.BaseRepo, oldCommitID, newCommitID, pr.BaseBranch)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ops.Issue = pr.Issue
|
|
|
|
dataJSON, err := json.Marshal(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ops.Content = string(dataJSON)
|
|
|
|
comment, err = issues_model.CreateComment(ctx, ops)
|
|
|
|
return comment, err
|
|
}
|