2017-10-26 06:19:16 +05:30
|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
2022-11-27 23:50:29 +05:30
|
|
|
// SPDX-License-Identifier: MIT
|
2017-10-26 06:19:16 +05:30
|
|
|
|
2022-06-12 21:21:54 +05:30
|
|
|
package git_test
|
2017-10-26 06:19:16 +05:30
|
|
|
|
|
|
|
import (
|
2024-01-13 03:20:38 +05:30
|
|
|
"context"
|
2017-10-26 06:19:16 +05:30
|
|
|
"testing"
|
|
|
|
|
2022-04-28 17:18:48 +05:30
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-06-12 21:21:54 +05:30
|
|
|
git_model "code.gitea.io/gitea/models/git"
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
2021-12-10 06:57:50 +05:30
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-12 20:06:47 +05:30
|
|
|
"code.gitea.io/gitea/models/unittest"
|
2023-06-30 14:33:05 +05:30
|
|
|
"code.gitea.io/gitea/modules/git"
|
2024-02-23 07:48:33 +05:30
|
|
|
"code.gitea.io/gitea/modules/optional"
|
2021-11-17 18:04:35 +05:30
|
|
|
|
2017-10-26 06:19:16 +05:30
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestAddDeletedBranch(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2023-12-17 17:26:08 +05:30
|
|
|
assert.EqualValues(t, git.Sha1ObjectFormat.Name(), repo.ObjectFormatName)
|
2023-06-29 15:33:20 +05:30
|
|
|
firstBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 1})
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
assert.True(t, firstBranch.IsDeleted)
|
|
|
|
assert.NoError(t, git_model.AddDeletedBranch(db.DefaultContext, repo.ID, firstBranch.Name, firstBranch.DeletedByID))
|
|
|
|
assert.NoError(t, git_model.AddDeletedBranch(db.DefaultContext, repo.ID, "branch2", int64(1)))
|
|
|
|
|
|
|
|
secondBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo.ID, Name: "branch2"})
|
|
|
|
assert.True(t, secondBranch.IsDeleted)
|
|
|
|
|
2023-06-30 14:33:05 +05:30
|
|
|
commit := &git.Commit{
|
2023-12-19 12:50:47 +05:30
|
|
|
ID: git.MustIDFromString(secondBranch.CommitID),
|
2023-06-30 14:33:05 +05:30
|
|
|
CommitMessage: secondBranch.CommitMessage,
|
|
|
|
Committer: &git.Signature{
|
|
|
|
When: secondBranch.CommitTime.AsLocalTime(),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
Also sync DB branches on push if necessary (#28361)
Fix #28056
This PR will check whether the repo has zero branch when pushing a
branch. If that, it means this repository hasn't been synced.
The reason caused that is after user upgrade from v1.20 -> v1.21, he
just push branches without visit the repository user interface. Because
all repositories routers will check whether a branches sync is necessary
but push has not such check.
For every repository, it has two states, synced or not synced. If there
is zero branch for a repository, then it will be assumed as non-sync
state. Otherwise, it's synced state. So if we think it's synced, we just
need to update branch/insert new branch. Otherwise do a full sync. So
that, for every push, there will be almost no extra load added. It's
high performance than yours.
For the implementation, we in fact will try to update the branch first,
if updated success with affect records > 0, then all are done. Because
that means the branch has been in the database. If no record is
affected, that means the branch does not exist in database. So there are
two possibilities. One is this is a new branch, then we just need to
insert the record. Another is the branches haven't been synced, then we
need to sync all the branches into database.
2023-12-09 19:00:56 +05:30
|
|
|
_, err := git_model.UpdateBranch(db.DefaultContext, repo.ID, secondBranch.PusherID, secondBranch.Name, commit)
|
2023-06-29 15:33:20 +05:30
|
|
|
assert.NoError(t, err)
|
2017-10-26 06:19:16 +05:30
|
|
|
}
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2017-10-26 06:19:16 +05:30
|
|
|
func TestGetDeletedBranches(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2017-10-26 06:19:16 +05:30
|
|
|
|
2023-12-11 14:26:48 +05:30
|
|
|
branches, err := db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{
|
|
|
|
ListOptions: db.ListOptionsAll,
|
2023-06-29 15:33:20 +05:30
|
|
|
RepoID: repo.ID,
|
2024-02-23 07:48:33 +05:30
|
|
|
IsDeletedBranch: optional.Some(true),
|
2023-06-29 15:33:20 +05:30
|
|
|
})
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, branches, 2)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGetDeletedBranch(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2023-06-29 15:33:20 +05:30
|
|
|
firstBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 1})
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NotNil(t, getDeletedBranch(t, firstBranch))
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestDeletedBranchLoadUser(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
firstBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 1})
|
|
|
|
secondBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 2})
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2017-10-26 06:19:16 +05:30
|
|
|
branch := getDeletedBranch(t, firstBranch)
|
|
|
|
assert.Nil(t, branch.DeletedBy)
|
2023-06-29 15:33:20 +05:30
|
|
|
branch.LoadDeletedBy(db.DefaultContext)
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NotNil(t, branch.DeletedBy)
|
|
|
|
assert.Equal(t, "user1", branch.DeletedBy.Name)
|
|
|
|
|
|
|
|
branch = getDeletedBranch(t, secondBranch)
|
|
|
|
assert.Nil(t, branch.DeletedBy)
|
2023-06-29 15:33:20 +05:30
|
|
|
branch.LoadDeletedBy(db.DefaultContext)
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NotNil(t, branch.DeletedBy)
|
|
|
|
assert.Equal(t, "Ghost", branch.DeletedBy.Name)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRemoveDeletedBranch(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2017-10-26 06:19:16 +05:30
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
firstBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 1})
|
2017-11-04 19:01:59 +05:30
|
|
|
|
2023-01-09 09:20:54 +05:30
|
|
|
err := git_model.RemoveDeletedBranchByID(db.DefaultContext, repo.ID, 1)
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NoError(t, err)
|
2021-11-16 14:23:21 +05:30
|
|
|
unittest.AssertNotExistsBean(t, firstBranch)
|
2023-06-29 15:33:20 +05:30
|
|
|
unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 2})
|
2017-10-26 06:19:16 +05:30
|
|
|
}
|
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
func getDeletedBranch(t *testing.T, branch *git_model.Branch) *git_model.Branch {
|
2022-08-16 07:52:25 +05:30
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2017-10-26 06:19:16 +05:30
|
|
|
|
2023-01-09 09:20:54 +05:30
|
|
|
deletedBranch, err := git_model.GetDeletedBranchByID(db.DefaultContext, repo.ID, branch.ID)
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, branch.ID, deletedBranch.ID)
|
|
|
|
assert.Equal(t, branch.Name, deletedBranch.Name)
|
2023-06-29 15:33:20 +05:30
|
|
|
assert.Equal(t, branch.CommitID, deletedBranch.CommitID)
|
2017-10-26 06:19:16 +05:30
|
|
|
assert.Equal(t, branch.DeletedByID, deletedBranch.DeletedByID)
|
|
|
|
|
|
|
|
return deletedBranch
|
|
|
|
}
|
2021-10-08 22:33:04 +05:30
|
|
|
|
|
|
|
func TestFindRenamedBranch(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2023-01-09 09:20:54 +05:30
|
|
|
branch, exist, err := git_model.FindRenamedBranch(db.DefaultContext, 1, "dev")
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.NoError(t, err)
|
2023-04-23 03:26:27 +05:30
|
|
|
assert.True(t, exist)
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.Equal(t, "master", branch.To)
|
|
|
|
|
2023-01-09 09:20:54 +05:30
|
|
|
_, exist, err = git_model.FindRenamedBranch(db.DefaultContext, 1, "unknow")
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.NoError(t, err)
|
2023-04-23 03:26:27 +05:30
|
|
|
assert.False(t, exist)
|
2021-10-08 22:33:04 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
func TestRenameBranch(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2021-10-08 22:33:04 +05:30
|
|
|
_isDefault := false
|
|
|
|
|
2022-11-13 01:48:50 +05:30
|
|
|
ctx, committer, err := db.TxContext(db.DefaultContext)
|
2022-04-28 17:18:48 +05:30
|
|
|
defer committer.Close()
|
|
|
|
assert.NoError(t, err)
|
2022-06-12 21:21:54 +05:30
|
|
|
assert.NoError(t, git_model.UpdateProtectBranch(ctx, repo1, &git_model.ProtectedBranch{
|
2023-01-16 13:30:22 +05:30
|
|
|
RepoID: repo1.ID,
|
|
|
|
RuleName: "master",
|
2022-06-12 21:21:54 +05:30
|
|
|
}, git_model.WhitelistOptions{}))
|
2022-04-28 17:18:48 +05:30
|
|
|
assert.NoError(t, committer.Commit())
|
2021-10-08 22:33:04 +05:30
|
|
|
|
2024-01-13 03:20:38 +05:30
|
|
|
assert.NoError(t, git_model.RenameBranch(db.DefaultContext, repo1, "master", "main", func(ctx context.Context, isDefault bool) error {
|
2021-10-08 22:33:04 +05:30
|
|
|
_isDefault = isDefault
|
|
|
|
return nil
|
|
|
|
}))
|
|
|
|
|
2023-04-23 03:26:27 +05:30
|
|
|
assert.True(t, _isDefault)
|
2022-08-16 07:52:25 +05:30
|
|
|
repo1 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.Equal(t, "main", repo1.DefaultBranch)
|
|
|
|
|
2022-08-16 07:52:25 +05:30
|
|
|
pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1}) // merged
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.Equal(t, "master", pull.BaseBranch)
|
|
|
|
|
2022-08-16 07:52:25 +05:30
|
|
|
pull = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2}) // open
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.Equal(t, "main", pull.BaseBranch)
|
|
|
|
|
2022-08-16 07:52:25 +05:30
|
|
|
renamedBranch := unittest.AssertExistsAndLoadBean(t, &git_model.RenamedBranch{ID: 2})
|
2021-10-08 22:33:04 +05:30
|
|
|
assert.Equal(t, "master", renamedBranch.From)
|
|
|
|
assert.Equal(t, "main", renamedBranch.To)
|
|
|
|
assert.Equal(t, int64(1), renamedBranch.RepoID)
|
|
|
|
|
2022-06-12 21:21:54 +05:30
|
|
|
unittest.AssertExistsAndLoadBean(t, &git_model.ProtectedBranch{
|
2023-01-16 13:30:22 +05:30
|
|
|
RepoID: repo1.ID,
|
|
|
|
RuleName: "main",
|
2021-10-08 22:33:04 +05:30
|
|
|
})
|
|
|
|
}
|
2021-11-08 21:15:37 +05:30
|
|
|
|
|
|
|
func TestOnlyGetDeletedBranchOnCorrectRepo(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2021-11-08 21:15:37 +05:30
|
|
|
|
|
|
|
// Get deletedBranch with ID of 1 on repo with ID 2.
|
|
|
|
// This should return a nil branch as this deleted branch
|
|
|
|
// is actually on repo with ID 1.
|
2022-08-16 07:52:25 +05:30
|
|
|
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
2021-11-08 21:15:37 +05:30
|
|
|
|
2023-01-09 09:20:54 +05:30
|
|
|
deletedBranch, err := git_model.GetDeletedBranchByID(db.DefaultContext, repo2.ID, 1)
|
2021-11-08 21:15:37 +05:30
|
|
|
|
2023-06-29 15:33:20 +05:30
|
|
|
// Expect error, and the returned branch is nil.
|
|
|
|
assert.Error(t, err)
|
2021-11-08 21:15:37 +05:30
|
|
|
assert.Nil(t, deletedBranch)
|
|
|
|
|
|
|
|
// Now get the deletedBranch with ID of 1 on repo with ID 1.
|
|
|
|
// This should return the deletedBranch.
|
2022-08-16 07:52:25 +05:30
|
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
2021-11-08 21:15:37 +05:30
|
|
|
|
2023-01-09 09:20:54 +05:30
|
|
|
deletedBranch, err = git_model.GetDeletedBranchByID(db.DefaultContext, repo1.ID, 1)
|
2021-11-08 21:15:37 +05:30
|
|
|
|
|
|
|
// Expect no error, and the returned branch to be not nil.
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NotNil(t, deletedBranch)
|
|
|
|
}
|
Fix git_model.FindBranchesByRepoAndBranchName
When a logged in user with no repositories visits their dashboard, it will
display a search box that lists their own repositories.
This is served by the `repo.SearchRepos` handler, which in turn calls
`commitstatus_service.FindReposLastestCommitStatuses()` with an empty
repo list.
That, in turn, will call `git_model.FindBranchesByRepoAndBranchName()`,
with an empty map. With no map, `FindBranchesByRepoAndBranchName()` ends
up querying the entire `branch` table, because no conditions were set
up.
Armed with a gazillion repo & commit shas, we return to
`FindReposLastestCommitStatuses`, and promptly call
`git_model.GetLatestCommitStatusForPairs`, which constructs a monstrous
query with so many placeholders that the database tells us to go
somewhere else, and flips us off. At least on instances the size of
Codeberg. On smaller instances, it will eventually return, and throw
away all the data, and return an empty set, having performed all this
for naught.
We fix this by short-circuiting `FindBranchesByRepoAndBranchName`, and
returning fast if our inputs are empty.
A test case is included.
Fixes #3521.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-05-01 00:23:47 +05:30
|
|
|
|
|
|
|
func TestFindBranchesByRepoAndBranchName(t *testing.T) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
|
|
|
|
// With no repos or branches given, we find no branches.
|
|
|
|
branches, err := git_model.FindBranchesByRepoAndBranchName(db.DefaultContext, map[int64]string{})
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, branches, 0)
|
|
|
|
}
|