mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-27 02:10:40 +00: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>
81 lines
2.5 KiB
Go
81 lines
2.5 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/unittest"
|
|
"code.gitea.io/gitea/modules/contexttest"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestCleanUploadName(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
|
|
kases := map[string]string{
|
|
".git/refs/master": "",
|
|
"/root/abc": "root/abc",
|
|
"./../../abc": "abc",
|
|
"a/../.git": "",
|
|
"a/../../../abc": "abc",
|
|
"../../../acd": "acd",
|
|
"../../.git/abc": "",
|
|
"..\\..\\.git/abc": "..\\..\\.git/abc",
|
|
"..\\../.git/abc": "",
|
|
"..\\../.git": "",
|
|
"abc/../def": "def",
|
|
".drone.yml": ".drone.yml",
|
|
".abc/def/.drone.yml": ".abc/def/.drone.yml",
|
|
"..drone.yml.": "..drone.yml.",
|
|
"..a.dotty...name...": "..a.dotty...name...",
|
|
"..a.dotty../.folder../.name...": "..a.dotty../.folder../.name...",
|
|
}
|
|
for k, v := range kases {
|
|
assert.EqualValues(t, cleanUploadFileName(k), v)
|
|
}
|
|
}
|
|
|
|
func TestGetUniquePatchBranchName(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := contexttest.MockContext(t, "user2/repo1")
|
|
ctx.SetParams(":id", "1")
|
|
contexttest.LoadRepo(t, ctx, 1)
|
|
contexttest.LoadRepoCommit(t, ctx)
|
|
contexttest.LoadUser(t, ctx, 2)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
defer ctx.Repo.GitRepo.Close()
|
|
|
|
expectedBranchName := "user2-patch-1"
|
|
branchName := GetUniquePatchBranchName(ctx)
|
|
assert.Equal(t, expectedBranchName, branchName)
|
|
}
|
|
|
|
func TestGetClosestParentWithFiles(t *testing.T) {
|
|
unittest.PrepareTestEnv(t)
|
|
ctx, _ := contexttest.MockContext(t, "user2/repo1")
|
|
ctx.SetParams(":id", "1")
|
|
contexttest.LoadRepo(t, ctx, 1)
|
|
contexttest.LoadRepoCommit(t, ctx)
|
|
contexttest.LoadUser(t, ctx, 2)
|
|
contexttest.LoadGitRepo(t, ctx)
|
|
defer ctx.Repo.GitRepo.Close()
|
|
|
|
repo := ctx.Repo.Repository
|
|
branch := repo.DefaultBranch
|
|
gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo)
|
|
defer gitRepo.Close()
|
|
commit, _ := gitRepo.GetBranchCommit(branch)
|
|
var expectedTreePath string // Should return the root dir, empty string, since there are no subdirs in this repo
|
|
for _, deletedFile := range []string{
|
|
"dir1/dir2/dir3/file.txt",
|
|
"file.txt",
|
|
} {
|
|
treePath := GetClosestParentWithFiles(deletedFile, commit)
|
|
assert.Equal(t, expectedTreePath, treePath)
|
|
}
|
|
}
|