mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-10 11:25:56 -05:00
5f82ead13c
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
94 lines
2.5 KiB
Go
94 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/gitrepo"
|
|
"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) {
|
|
gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, repo)
|
|
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
|
|
}
|