2019-05-06 19:12:51 -06:00
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
|
|
// Copyright 2018 Jonas Franz. All rights reserved.
|
2022-11-27 11:20:29 -07:00
|
|
|
// SPDX-License-Identifier: MIT
|
2019-05-06 19:12:51 -06:00
|
|
|
|
|
|
|
package migrations
|
|
|
|
|
|
|
|
import (
|
2020-09-02 11:49:25 -06:00
|
|
|
"context"
|
2022-02-25 02:20:50 -07:00
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2022-02-01 11:20:28 -07:00
|
|
|
"strconv"
|
2019-05-06 19:12:51 -06:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2021-09-19 05:49:59 -06:00
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-04-08 03:11:15 -06:00
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
2021-12-09 18:27:50 -07:00
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-12 07:36:47 -07:00
|
|
|
"code.gitea.io/gitea/models/unittest"
|
2021-11-24 02:49:20 -07:00
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2022-02-25 02:20:50 -07:00
|
|
|
"code.gitea.io/gitea/modules/git"
|
Simplify how git repositories are opened (#28937)
## 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>
2024-01-27 13:09:51 -07:00
|
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
2019-12-16 21:16:54 -07:00
|
|
|
"code.gitea.io/gitea/modules/graceful"
|
2022-02-25 02:20:50 -07:00
|
|
|
"code.gitea.io/gitea/modules/log"
|
2021-11-16 08:25:33 -07:00
|
|
|
base "code.gitea.io/gitea/modules/migration"
|
2024-03-02 08:42:31 -07:00
|
|
|
"code.gitea.io/gitea/modules/optional"
|
2019-10-13 07:23:14 -06:00
|
|
|
"code.gitea.io/gitea/modules/structs"
|
2023-04-21 14:32:25 -06:00
|
|
|
"code.gitea.io/gitea/modules/test"
|
2024-10-01 13:25:08 -06:00
|
|
|
repo_service "code.gitea.io/gitea/services/repository"
|
2019-05-06 19:12:51 -06:00
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestGiteaUploadRepo(t *testing.T) {
|
|
|
|
// FIXME: Since no accesskey or user/password will trigger rate limit of github, just skip
|
|
|
|
t.Skip()
|
|
|
|
|
2021-11-12 07:36:47 -07:00
|
|
|
unittest.PrepareTestEnv(t)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2022-08-15 20:22:25 -06:00
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
2019-05-06 19:12:51 -06:00
|
|
|
|
|
|
|
var (
|
2022-05-20 08:08:52 -06:00
|
|
|
ctx = context.Background()
|
|
|
|
downloader = NewGithubDownloaderV3(ctx, "https://github.com", "", "", "", "go-xorm", "builder")
|
2019-05-06 19:12:51 -06:00
|
|
|
repoName = "builder-" + time.Now().Format("2006-01-02-15-04-05")
|
2019-12-16 21:16:54 -07:00
|
|
|
uploader = NewGiteaLocalUploader(graceful.GetManager().HammerContext(), user, user.Name, repoName)
|
2019-05-06 19:12:51 -06:00
|
|
|
)
|
|
|
|
|
2023-09-16 08:39:12 -06:00
|
|
|
err := migrateRepository(db.DefaultContext, user, downloader, uploader, base.MigrateOptions{
|
2019-10-13 07:23:14 -06:00
|
|
|
CloneAddr: "https://github.com/go-xorm/builder",
|
|
|
|
RepoName: repoName,
|
2019-05-06 19:12:51 -06:00
|
|
|
AuthUsername: "",
|
|
|
|
|
2019-07-07 20:14:12 -06:00
|
|
|
Wiki: true,
|
|
|
|
Issues: true,
|
|
|
|
Milestones: true,
|
|
|
|
Labels: true,
|
|
|
|
Releases: true,
|
|
|
|
Comments: true,
|
|
|
|
PullRequests: true,
|
|
|
|
Private: true,
|
|
|
|
Mirror: false,
|
2021-06-16 16:02:24 -06:00
|
|
|
}, nil)
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
2022-08-15 20:22:25 -06:00
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user.ID, Name: repoName})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.True(t, repo.HasWiki())
|
2021-12-09 18:27:50 -07:00
|
|
|
assert.EqualValues(t, repo_model.RepositoryReady, repo.Status)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2023-12-11 01:56:48 -07:00
|
|
|
milestones, err := db.Find[issues_model.Milestone](db.DefaultContext, issues_model.FindMilestoneOptions{
|
|
|
|
RepoID: repo.ID,
|
2024-03-02 08:42:31 -07:00
|
|
|
IsClosed: optional.Some(false),
|
2020-07-28 05:30:40 -06:00
|
|
|
})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Len(t, milestones, 1)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2023-12-11 01:56:48 -07:00
|
|
|
milestones, err = db.Find[issues_model.Milestone](db.DefaultContext, issues_model.FindMilestoneOptions{
|
|
|
|
RepoID: repo.ID,
|
2024-03-02 08:42:31 -07:00
|
|
|
IsClosed: optional.Some(true),
|
2020-07-28 05:30:40 -06:00
|
|
|
})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Empty(t, milestones)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2022-06-13 03:37:59 -06:00
|
|
|
labels, err := issues_model.GetLabelsByRepoID(ctx, repo.ID, "", db.ListOptions{})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
2021-08-17 18:47:18 -06:00
|
|
|
assert.Len(t, labels, 12)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2024-01-14 19:19:25 -07:00
|
|
|
releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
|
2021-09-24 05:32:56 -06:00
|
|
|
ListOptions: db.ListOptions{
|
2020-01-24 12:00:29 -07:00
|
|
|
PageSize: 10,
|
|
|
|
Page: 0,
|
|
|
|
},
|
2019-05-06 19:12:51 -06:00
|
|
|
IncludeTags: true,
|
2024-01-14 19:19:25 -07:00
|
|
|
RepoID: repo.ID,
|
2020-01-24 12:00:29 -07:00
|
|
|
})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Len(t, releases, 8)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2024-01-14 19:19:25 -07:00
|
|
|
releases, err = db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
|
2021-09-24 05:32:56 -06:00
|
|
|
ListOptions: db.ListOptions{
|
2020-01-24 12:00:29 -07:00
|
|
|
PageSize: 10,
|
|
|
|
Page: 0,
|
|
|
|
},
|
2019-05-06 19:12:51 -06:00
|
|
|
IncludeTags: false,
|
2024-01-14 19:19:25 -07:00
|
|
|
RepoID: repo.ID,
|
2020-01-24 12:00:29 -07:00
|
|
|
})
|
2019-05-06 19:12:51 -06:00
|
|
|
assert.NoError(t, err)
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Len(t, releases, 1)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2022-11-19 01:12:33 -07:00
|
|
|
issues, err := issues_model.Issues(db.DefaultContext, &issues_model.IssuesOptions{
|
2023-05-19 08:17:48 -06:00
|
|
|
RepoIDs: []int64{repo.ID},
|
2024-03-02 08:42:31 -07:00
|
|
|
IsPull: optional.Some(false),
|
2019-05-06 19:12:51 -06:00
|
|
|
SortType: "oldest",
|
|
|
|
})
|
|
|
|
assert.NoError(t, err)
|
2021-08-17 18:47:18 -06:00
|
|
|
assert.Len(t, issues, 15)
|
2022-11-19 01:12:33 -07:00
|
|
|
assert.NoError(t, issues[0].LoadDiscussComments(db.DefaultContext))
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Empty(t, issues[0].Comments)
|
2019-05-06 19:12:51 -06:00
|
|
|
|
2023-09-15 00:13:19 -06:00
|
|
|
pulls, _, err := issues_model.PullRequests(db.DefaultContext, repo.ID, &issues_model.PullRequestsOptions{
|
2019-05-06 19:12:51 -06:00
|
|
|
SortType: "oldest",
|
|
|
|
})
|
|
|
|
assert.NoError(t, err)
|
2021-08-17 18:47:18 -06:00
|
|
|
assert.Len(t, pulls, 30)
|
2022-11-19 01:12:33 -07:00
|
|
|
assert.NoError(t, pulls[0].LoadIssue(db.DefaultContext))
|
|
|
|
assert.NoError(t, pulls[0].Issue.LoadDiscussComments(db.DefaultContext))
|
2021-06-06 23:27:09 -06:00
|
|
|
assert.Len(t, pulls[0].Issue.Comments, 2)
|
2019-05-06 19:12:51 -06:00
|
|
|
}
|
2022-02-01 11:20:28 -07:00
|
|
|
|
2022-02-06 02:05:29 -07:00
|
|
|
func TestGiteaUploadRemapLocalUser(t *testing.T) {
|
|
|
|
unittest.PrepareTestEnv(t)
|
2022-08-15 20:22:25 -06:00
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
2022-02-06 02:05:29 -07:00
|
|
|
|
|
|
|
repoName := "migrated"
|
|
|
|
uploader := NewGiteaLocalUploader(context.Background(), doer, doer.Name, repoName)
|
|
|
|
// call remapLocalUser
|
|
|
|
uploader.sameApp = true
|
|
|
|
|
|
|
|
externalID := int64(1234567)
|
|
|
|
externalName := "username"
|
|
|
|
source := base.Release{
|
|
|
|
PublisherID: externalID,
|
|
|
|
PublisherName: externalName,
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// The externalID does not match any existing user, everything
|
|
|
|
// belongs to the doer
|
|
|
|
//
|
2022-08-24 20:31:57 -06:00
|
|
|
target := repo_model.Release{}
|
2022-02-06 02:05:29 -07:00
|
|
|
uploader.userMap = make(map[int64]int64)
|
|
|
|
err := uploader.remapUser(&source, &target)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, doer.ID, target.GetUserID())
|
|
|
|
|
|
|
|
//
|
|
|
|
// The externalID matches a known user but the name does not match,
|
|
|
|
// everything belongs to the doer
|
|
|
|
//
|
|
|
|
source.PublisherID = user.ID
|
2022-08-24 20:31:57 -06:00
|
|
|
target = repo_model.Release{}
|
2022-02-06 02:05:29 -07:00
|
|
|
uploader.userMap = make(map[int64]int64)
|
|
|
|
err = uploader.remapUser(&source, &target)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, doer.ID, target.GetUserID())
|
|
|
|
|
|
|
|
//
|
|
|
|
// The externalID and externalName match an existing user, everything
|
|
|
|
// belongs to the existing user
|
|
|
|
//
|
|
|
|
source.PublisherName = user.Name
|
2022-08-24 20:31:57 -06:00
|
|
|
target = repo_model.Release{}
|
2022-02-06 02:05:29 -07:00
|
|
|
uploader.userMap = make(map[int64]int64)
|
|
|
|
err = uploader.remapUser(&source, &target)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, user.ID, target.GetUserID())
|
|
|
|
}
|
|
|
|
|
2022-02-01 11:20:28 -07:00
|
|
|
func TestGiteaUploadRemapExternalUser(t *testing.T) {
|
|
|
|
unittest.PrepareTestEnv(t)
|
2022-08-15 20:22:25 -06:00
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
2022-02-01 11:20:28 -07:00
|
|
|
|
|
|
|
repoName := "migrated"
|
|
|
|
uploader := NewGiteaLocalUploader(context.Background(), doer, doer.Name, repoName)
|
|
|
|
uploader.gitServiceType = structs.GiteaService
|
2022-02-06 02:05:29 -07:00
|
|
|
// call remapExternalUser
|
|
|
|
uploader.sameApp = false
|
2022-02-01 11:20:28 -07:00
|
|
|
|
|
|
|
externalID := int64(1234567)
|
2022-02-06 02:05:29 -07:00
|
|
|
externalName := "username"
|
2022-02-01 11:20:28 -07:00
|
|
|
source := base.Release{
|
|
|
|
PublisherID: externalID,
|
|
|
|
PublisherName: externalName,
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// When there is no user linked to the external ID, the migrated data is authored
|
|
|
|
// by the doer
|
|
|
|
//
|
2022-02-06 02:05:29 -07:00
|
|
|
uploader.userMap = make(map[int64]int64)
|
2022-08-24 20:31:57 -06:00
|
|
|
target := repo_model.Release{}
|
2022-02-06 02:05:29 -07:00
|
|
|
err := uploader.remapUser(&source, &target)
|
2022-02-01 11:20:28 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, doer.ID, target.GetUserID())
|
|
|
|
|
|
|
|
//
|
|
|
|
// Link the external ID to an existing user
|
|
|
|
//
|
2022-08-15 20:22:25 -06:00
|
|
|
linkedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
2022-02-01 11:20:28 -07:00
|
|
|
externalLoginUser := &user_model.ExternalLoginUser{
|
|
|
|
ExternalID: strconv.FormatInt(externalID, 10),
|
|
|
|
UserID: linkedUser.ID,
|
|
|
|
LoginSourceID: 0,
|
|
|
|
Provider: structs.GiteaService.Name(),
|
|
|
|
}
|
2023-10-14 02:37:24 -06:00
|
|
|
err = user_model.LinkExternalToUser(db.DefaultContext, linkedUser, externalLoginUser)
|
2022-02-01 11:20:28 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
//
|
|
|
|
// When a user is linked to the external ID, it becomes the author of
|
|
|
|
// the migrated data
|
|
|
|
//
|
2022-02-06 02:05:29 -07:00
|
|
|
uploader.userMap = make(map[int64]int64)
|
2022-08-24 20:31:57 -06:00
|
|
|
target = repo_model.Release{}
|
2022-02-06 02:05:29 -07:00
|
|
|
err = uploader.remapUser(&source, &target)
|
2022-02-01 11:20:28 -07:00
|
|
|
assert.NoError(t, err)
|
2022-02-06 02:05:29 -07:00
|
|
|
assert.EqualValues(t, linkedUser.ID, target.GetUserID())
|
2022-02-01 11:20:28 -07:00
|
|
|
}
|
2022-02-25 02:20:50 -07:00
|
|
|
|
|
|
|
func TestGiteaUploadUpdateGitForPullRequest(t *testing.T) {
|
|
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
|
|
|
|
//
|
|
|
|
// fromRepo master
|
|
|
|
//
|
2022-08-15 20:22:25 -06:00
|
|
|
fromRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2022-02-25 02:20:50 -07:00
|
|
|
baseRef := "master"
|
2023-12-17 04:56:08 -07:00
|
|
|
assert.NoError(t, git.InitRepository(git.DefaultContext, fromRepo.RepoPath(), false, fromRepo.ObjectFormatName))
|
2022-10-23 08:44:45 -06:00
|
|
|
err := git.NewCommand(git.DefaultContext, "symbolic-ref").AddDynamicArguments("HEAD", git.BranchPrefix+baseRef).Run(&git.RunOpts{Dir: fromRepo.RepoPath()})
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, os.WriteFile(filepath.Join(fromRepo.RepoPath(), "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", fromRepo.RepoPath())), 0o644))
|
|
|
|
assert.NoError(t, git.AddChanges(fromRepo.RepoPath(), true))
|
|
|
|
signature := git.Signature{
|
|
|
|
Email: "test@example.com",
|
|
|
|
Name: "test",
|
|
|
|
When: time.Now(),
|
|
|
|
}
|
|
|
|
assert.NoError(t, git.CommitChanges(fromRepo.RepoPath(), git.CommitChangesOptions{
|
|
|
|
Committer: &signature,
|
|
|
|
Author: &signature,
|
|
|
|
Message: "Initial Commit",
|
|
|
|
}))
|
Simplify how git repositories are opened (#28937)
## 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>
2024-01-27 13:09:51 -07:00
|
|
|
fromGitRepo, err := gitrepo.OpenRepository(git.DefaultContext, fromRepo)
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
defer fromGitRepo.Close()
|
|
|
|
baseSHA, err := fromGitRepo.GetBranchCommitID(baseRef)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
//
|
|
|
|
// fromRepo branch1
|
|
|
|
//
|
|
|
|
headRef := "branch1"
|
2022-10-23 08:44:45 -06:00
|
|
|
_, _, err = git.NewCommand(git.DefaultContext, "checkout", "-b").AddDynamicArguments(headRef).RunStdString(&git.RunOpts{Dir: fromRepo.RepoPath()})
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, os.WriteFile(filepath.Join(fromRepo.RepoPath(), "README.md"), []byte("SOMETHING"), 0o644))
|
|
|
|
assert.NoError(t, git.AddChanges(fromRepo.RepoPath(), true))
|
|
|
|
signature.When = time.Now()
|
|
|
|
assert.NoError(t, git.CommitChanges(fromRepo.RepoPath(), git.CommitChangesOptions{
|
|
|
|
Committer: &signature,
|
|
|
|
Author: &signature,
|
|
|
|
Message: "Pull request",
|
|
|
|
}))
|
|
|
|
assert.NoError(t, err)
|
|
|
|
headSHA, err := fromGitRepo.GetBranchCommitID(headRef)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
2022-08-15 20:22:25 -06:00
|
|
|
fromRepoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: fromRepo.OwnerID})
|
2022-02-25 02:20:50 -07:00
|
|
|
|
|
|
|
//
|
|
|
|
// forkRepo branch2
|
|
|
|
//
|
|
|
|
forkHeadRef := "branch2"
|
2022-08-15 20:22:25 -06:00
|
|
|
forkRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 8})
|
2022-10-23 08:44:45 -06:00
|
|
|
assert.NoError(t, git.CloneWithArgs(git.DefaultContext, nil, fromRepo.RepoPath(), forkRepo.RepoPath(), git.CloneRepoOptions{
|
2022-02-25 02:20:50 -07:00
|
|
|
Branch: headRef,
|
|
|
|
}))
|
2022-10-23 08:44:45 -06:00
|
|
|
_, _, err = git.NewCommand(git.DefaultContext, "checkout", "-b").AddDynamicArguments(forkHeadRef).RunStdString(&git.RunOpts{Dir: forkRepo.RepoPath()})
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, os.WriteFile(filepath.Join(forkRepo.RepoPath(), "README.md"), []byte(fmt.Sprintf("# branch2 %s", forkRepo.RepoPath())), 0o644))
|
|
|
|
assert.NoError(t, git.AddChanges(forkRepo.RepoPath(), true))
|
|
|
|
assert.NoError(t, git.CommitChanges(forkRepo.RepoPath(), git.CommitChangesOptions{
|
|
|
|
Committer: &signature,
|
|
|
|
Author: &signature,
|
|
|
|
Message: "branch2 commit",
|
|
|
|
}))
|
Simplify how git repositories are opened (#28937)
## 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>
2024-01-27 13:09:51 -07:00
|
|
|
forkGitRepo, err := gitrepo.OpenRepository(git.DefaultContext, forkRepo)
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, err)
|
|
|
|
defer forkGitRepo.Close()
|
|
|
|
forkHeadSHA, err := forkGitRepo.GetBranchCommitID(forkHeadRef)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
toRepoName := "migrated"
|
|
|
|
uploader := NewGiteaLocalUploader(context.Background(), fromRepoOwner, fromRepoOwner.Name, toRepoName)
|
|
|
|
uploader.gitServiceType = structs.GiteaService
|
2024-10-01 13:25:08 -06:00
|
|
|
|
|
|
|
assert.NoError(t, repo_service.Init(context.Background()))
|
2022-02-25 02:20:50 -07:00
|
|
|
assert.NoError(t, uploader.CreateRepo(&base.Repository{
|
|
|
|
Description: "description",
|
|
|
|
OriginalURL: fromRepo.RepoPath(),
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
IsPrivate: false,
|
|
|
|
IsMirror: true,
|
|
|
|
}, base.MigrateOptions{
|
|
|
|
GitServiceType: structs.GiteaService,
|
|
|
|
Private: false,
|
|
|
|
Mirror: true,
|
|
|
|
}))
|
|
|
|
|
|
|
|
for _, testCase := range []struct {
|
2023-04-21 14:32:25 -06:00
|
|
|
name string
|
|
|
|
head string
|
|
|
|
logFilter []string
|
|
|
|
logFiltered []bool
|
|
|
|
pr base.PullRequest
|
2022-02-25 02:20:50 -07:00
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "fork, good Head.SHA",
|
|
|
|
head: fmt.Sprintf("%s/%s", forkRepo.OwnerName, forkHeadRef),
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: forkRepo.RepoPath(),
|
|
|
|
Ref: forkHeadRef,
|
|
|
|
SHA: forkHeadSHA,
|
|
|
|
RepoName: forkRepo.Name,
|
|
|
|
OwnerName: forkRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "fork, invalid Head.Ref",
|
|
|
|
head: "unknown repository",
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: forkRepo.RepoPath(),
|
|
|
|
Ref: "INVALID",
|
|
|
|
SHA: forkHeadSHA,
|
|
|
|
RepoName: forkRepo.Name,
|
|
|
|
OwnerName: forkRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
2023-04-21 14:32:25 -06:00
|
|
|
logFilter: []string{"Fetch branch from"},
|
|
|
|
logFiltered: []bool{true},
|
2022-02-25 02:20:50 -07:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "invalid fork CloneURL",
|
|
|
|
head: "unknown repository",
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: "UNLIKELY",
|
|
|
|
Ref: forkHeadRef,
|
|
|
|
SHA: forkHeadSHA,
|
|
|
|
RepoName: forkRepo.Name,
|
|
|
|
OwnerName: "WRONG",
|
|
|
|
},
|
|
|
|
},
|
2023-04-21 14:32:25 -06:00
|
|
|
logFilter: []string{"AddRemote"},
|
|
|
|
logFiltered: []bool{true},
|
2022-02-25 02:20:50 -07:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no fork, good Head.SHA",
|
|
|
|
head: headRef,
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: headRef,
|
|
|
|
SHA: headSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no fork, empty Head.SHA",
|
|
|
|
head: headRef,
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: headRef,
|
|
|
|
SHA: "",
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
2023-04-21 14:32:25 -06:00
|
|
|
logFilter: []string{"Empty reference", "Cannot remove local head"},
|
|
|
|
logFiltered: []bool{true, false},
|
2022-02-25 02:20:50 -07:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no fork, invalid Head.SHA",
|
|
|
|
head: headRef,
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: headRef,
|
|
|
|
SHA: "brokenSHA",
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
2023-04-21 14:32:25 -06:00
|
|
|
logFilter: []string{"Deprecated local head"},
|
|
|
|
logFiltered: []bool{true},
|
2022-02-25 02:20:50 -07:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no fork, not found Head.SHA",
|
|
|
|
head: headRef,
|
|
|
|
pr: base.PullRequest{
|
|
|
|
PatchURL: "",
|
|
|
|
Number: 1,
|
|
|
|
State: "open",
|
|
|
|
Base: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: baseRef,
|
|
|
|
SHA: baseSHA,
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
Head: base.PullRequestBranch{
|
|
|
|
CloneURL: fromRepo.RepoPath(),
|
|
|
|
Ref: headRef,
|
|
|
|
SHA: "2697b352310fcd01cbd1f3dbd43b894080027f68",
|
|
|
|
RepoName: fromRepo.Name,
|
|
|
|
OwnerName: fromRepo.OwnerName,
|
|
|
|
},
|
|
|
|
},
|
2023-04-21 14:32:25 -06:00
|
|
|
logFilter: []string{"Deprecated local head", "Cannot remove local head"},
|
|
|
|
logFiltered: []bool{true, false},
|
2022-02-25 02:20:50 -07:00
|
|
|
},
|
|
|
|
} {
|
|
|
|
t.Run(testCase.name, func(t *testing.T) {
|
2023-04-21 14:32:25 -06:00
|
|
|
stopMark := fmt.Sprintf(">>>>>>>>>>>>>STOP: %s<<<<<<<<<<<<<<<", testCase.name)
|
|
|
|
|
|
|
|
logChecker, cleanup := test.NewLogChecker(log.DEFAULT)
|
|
|
|
logChecker.Filter(testCase.logFilter...).StopMark(stopMark)
|
|
|
|
defer cleanup()
|
2022-02-25 02:20:50 -07:00
|
|
|
|
2022-09-04 04:47:56 -06:00
|
|
|
testCase.pr.EnsuredSafe = true
|
|
|
|
|
2022-02-25 02:20:50 -07:00
|
|
|
head, err := uploader.updateGitForPullRequest(&testCase.pr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, testCase.head, head)
|
2023-04-21 14:32:25 -06:00
|
|
|
|
|
|
|
log.Info(stopMark)
|
|
|
|
|
|
|
|
logFiltered, logStopped := logChecker.Check(5 * time.Second)
|
|
|
|
assert.True(t, logStopped)
|
|
|
|
if len(testCase.logFilter) > 0 {
|
|
|
|
assert.EqualValues(t, testCase.logFiltered, logFiltered, "for log message filters: %v", testCase.logFilter)
|
2022-02-25 02:20:50 -07:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|