mirror of
https://github.com/go-gitea/gitea.git
synced 2026-11-09 17:37:20 -06:00
If the stderr output is not handled, then it needs to use RunWithStderr to make sure the git error message is included in the returned error. Otherwise, when the git command fails, the error log won't show useful information. Ref: * #39795 : no useful information in log messages * https://github.com/go-gitea/gitea/pull/40160#pullrequestreview-5752720866
191 lines
7.0 KiB
Go
191 lines
7.0 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"gitea.dev/modules/git/gitcmd"
|
|
"gitea.dev/modules/setting"
|
|
"gitea.dev/modules/test"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRepository_CommitQueries(t *testing.T) {
|
|
for _, testCase := range []struct {
|
|
name string
|
|
run func(*testing.T, *Repository)
|
|
}{
|
|
{"TestRepository_GetCommitBranches", func(t *testing.T, bareRepo1 *Repository) {
|
|
// these test case are specific to the repo1_bare test repo
|
|
testCases := []struct {
|
|
CommitID string
|
|
ExpectedBranches []string
|
|
}{
|
|
{"2839944139e0de9737a044f78b0e4b40d989a9e3", []string{"branch1"}},
|
|
{"5c80b0245c1c6f8343fa418ec374b13b5d4ee658", []string{"branch2"}},
|
|
{"37991dec2c8e592043f47155ce4808d4580f9123", []string{"master"}},
|
|
{"95bb4d39648ee7e325106df01a621c530863a653", []string{"branch1", "branch2"}},
|
|
{"8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2", []string{"branch2", "master"}},
|
|
{"master", []string{"master"}},
|
|
}
|
|
for _, testCase := range testCases {
|
|
commit, err := bareRepo1.GetCommit(t.Context(), testCase.CommitID)
|
|
assert.NoError(t, err)
|
|
branches, err := bareRepo1.getBranches(t.Context(), nil, commit.ID.String(), 2)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, testCase.ExpectedBranches, branches)
|
|
}
|
|
}},
|
|
{"TestGetTagCommitWithSignature", func(t *testing.T, bareRepo1 *Repository) {
|
|
// both the tag and the commit are signed here, this validates only the commit signature
|
|
commit, err := bareRepo1.GetCommit(t.Context(), "28b55526e7100924d864dd89e35c1ea62e7a5a32")
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, commit)
|
|
assert.NotNil(t, commit.Signature)
|
|
// test that signature is not in message
|
|
assert.Equal(t, "signed-commit\n", commit.CommitMessage.MessageRaw)
|
|
}},
|
|
{"TestGetCommitWithBadCommitID", func(t *testing.T, bareRepo1 *Repository) {
|
|
commit, err := bareRepo1.GetCommit(t.Context(), "bad_branch")
|
|
assert.Nil(t, commit)
|
|
assert.Error(t, err)
|
|
assert.True(t, IsErrNotExist(err))
|
|
}},
|
|
{"TestIsCommitInRepo", func(t *testing.T, bareRepo1 *Repository) {
|
|
exist, err := IsCommitInRepo(t.Context(), bareRepo1, "2839944139e0de9737a044f78b0e4b40d989a9e3")
|
|
assert.NoError(t, err)
|
|
assert.True(t, exist)
|
|
|
|
exist, err = IsCommitInRepo(t.Context(), bareRepo1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
|
|
assert.NoError(t, err)
|
|
assert.False(t, exist)
|
|
}},
|
|
{"TestIsCommitInBranch", func(t *testing.T, bareRepo1 *Repository) {
|
|
result, err := IsCommitInBranch(t.Context(), bareRepo1, "2839944139e0de9737a044f78b0e4b40d989a9e3", "branch1")
|
|
assert.NoError(t, err)
|
|
assert.True(t, result)
|
|
|
|
result, err = IsCommitInBranch(t.Context(), bareRepo1, "2839944139e0de9737a044f78b0e4b40d989a9e3", "branch2")
|
|
assert.NoError(t, err)
|
|
assert.False(t, result)
|
|
|
|
result, err = IsCommitInBranch(t.Context(), bareRepo1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "branch1")
|
|
assert.NoError(t, err)
|
|
assert.False(t, result)
|
|
}},
|
|
{"TestGetRefCommitID", func(t *testing.T, bareRepo1 *Repository) {
|
|
// these test case are specific to the repo1_bare test repo
|
|
testCases := []struct {
|
|
Ref string
|
|
ExpectedCommitID string
|
|
}{
|
|
{RefNameFromBranch("master").String(), "ce064814f4a0d337b333e646ece456cd39fab612"},
|
|
{RefNameFromBranch("branch1").String(), "2839944139e0de9737a044f78b0e4b40d989a9e3"},
|
|
{RefNameFromTag("test").String(), "3ad28a9149a2864384548f3d17ed7f38014c9e8a"},
|
|
{"ce064814f4a0d337b333e646ece456cd39fab612", "ce064814f4a0d337b333e646ece456cd39fab612"},
|
|
}
|
|
|
|
for _, testCase := range testCases {
|
|
commitID, err := bareRepo1.GetRefCommitID(t.Context(), testCase.Ref)
|
|
if assert.NoError(t, err) {
|
|
assert.Equal(t, testCase.ExpectedCommitID, commitID)
|
|
}
|
|
}
|
|
}},
|
|
} {
|
|
t.Run(testCase.name, func(t *testing.T) {
|
|
bareRepo1, err := OpenRepositoryLocal(t.Context(), filepath.Join(testReposDir, "repo1_bare"))
|
|
assert.NoError(t, err)
|
|
defer bareRepo1.Close()
|
|
testCase.run(t, bareRepo1)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRepository_CommitsBetween(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo4_commitsbetween")
|
|
bareRepo1, err := OpenRepositoryLocal(t.Context(), bareRepo1Path)
|
|
assert.NoError(t, err)
|
|
defer bareRepo1.Close()
|
|
|
|
cases := []struct {
|
|
OldID RefName
|
|
NewID RefName
|
|
ExpectedCommits int
|
|
}{
|
|
{"fdc1b615bdcff0f0658b216df0c9209e5ecb7c78", "78a445db1eac62fe15e624e1137965969addf344", 1}, // com1 -> com2
|
|
{"78a445db1eac62fe15e624e1137965969addf344", "fdc1b615bdcff0f0658b216df0c9209e5ecb7c78", 0}, // reset HEAD~, com2 -> com1
|
|
{"78a445db1eac62fe15e624e1137965969addf344", "a78e5638b66ccfe7e1b4689d3d5684e42c97d7ca", 1}, // com2 -> com2_new
|
|
}
|
|
for i, c := range cases {
|
|
commits, err := bareRepo1.CommitsBetween(t.Context(), c.NewID, c.OldID, -1)
|
|
assert.NoError(t, err)
|
|
assert.Len(t, commits, c.ExpectedCommits, "case %d", i)
|
|
}
|
|
}
|
|
|
|
func TestCommitsByFileAndRange(t *testing.T) {
|
|
defer test.MockVariableValue(&setting.Git.CommitsRangeSize, 2)()
|
|
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
bareRepo1, err := OpenRepositoryLocal(t.Context(), bareRepo1Path)
|
|
require.NoError(t, err)
|
|
defer bareRepo1.Close()
|
|
|
|
// "foo" has 3 commits in "master" branch
|
|
commits, hasMore, err := bareRepo1.CommitsByFileAndRange(t.Context(), CommitsByFileAndRangeOptions{Revision: "master", File: "foo", Page: 1})
|
|
require.NoError(t, err)
|
|
assert.True(t, hasMore)
|
|
assert.Len(t, commits, 2)
|
|
|
|
commits, hasMore, err = bareRepo1.CommitsByFileAndRange(t.Context(), CommitsByFileAndRangeOptions{Revision: "master", File: "foo", Page: 2})
|
|
require.NoError(t, err)
|
|
assert.Len(t, commits, 1)
|
|
assert.False(t, hasMore)
|
|
|
|
repoFollowRenameDir := filepath.Join(t.TempDir(), "repo.git")
|
|
require.NoError(t, gitcmd.NewCommand("init").AddDynamicArguments(repoFollowRenameDir).RunWithStderr(t.Context()))
|
|
_, _, runErr := gitcmd.NewCommand("fast-import").WithDir(repoFollowRenameDir).WithStdinBytes([]byte(strings.TrimSpace(`
|
|
blob
|
|
mark :1
|
|
data 0
|
|
|
|
reset refs/heads/master
|
|
commit refs/heads/master
|
|
mark :2
|
|
author Chi-Iroh <user@example.com> 1778660718 +0200
|
|
committer Chi-Iroh <user@example.com> 1778660718 +0200
|
|
data 10
|
|
Add a.txt
|
|
M 100644 :1 a.txt
|
|
|
|
commit refs/heads/master
|
|
mark :3
|
|
author Chi-Iroh <user@example.com> 1778660741 +0200
|
|
committer Chi-Iroh <user@example.com> 1778660741 +0200
|
|
data 22
|
|
Rename a.txt to b.txt
|
|
from :2
|
|
D a.txt
|
|
M 100644 :1 b.txt
|
|
`))).RunStdString(t.Context())
|
|
require.NoError(t, runErr)
|
|
|
|
repoFollowRename, err := OpenRepositoryLocal(t.Context(), repoFollowRenameDir)
|
|
require.NoError(t, err)
|
|
defer repoFollowRename.Close()
|
|
|
|
commits, _, err = repoFollowRename.CommitsByFileAndRange(t.Context(), CommitsByFileAndRangeOptions{Revision: "master", File: "b.txt", Page: 1})
|
|
require.NoError(t, err)
|
|
assert.Len(t, commits, 1)
|
|
commits, _, err = repoFollowRename.CommitsByFileAndRange(t.Context(), CommitsByFileAndRangeOptions{Revision: "master", File: "b.txt", Page: 1, FollowRename: true})
|
|
require.NoError(t, err)
|
|
assert.Len(t, commits, 2)
|
|
}
|