a5b1c1b0b3
- Add a indication to the file history if the file has been renamed, this indication contains a link to browse the history of the file further. - Added unit testing. - Added integration testing. - Resolves https://codeberg.org/forgejo/forgejo/issues/1279 (cherry picked from commit 72c297521b1830360aab4b50e37efcc7e67e0d5d) (cherry picked from commit 283f9648947f8dd2f315ecca19566ccca2b49c18) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/1550 (cherry picked from commit 7c30af7fdee08efd02041c01abca47394a69bb8b) (cherry picked from commit f3be6eb269526a9f4ea7861189f07977f2d4a32f) (cherry picked from commit 78e1755b94c18c043e0c8f8c2849803cc8069feb) (cherry picked from commit 73799479e0fb68534dac10f809ee246dbc809b62) (cherry picked from commit 938359b94120b7ea7bcdfbfda265ada691620da1) (cherry picked from commit b168a9c081f93c10d40319333fc24d68a4f9763c) [GITEA] Detect file rename and show in history (squash) ctx.Locale (cherry picked from commit 40447752ff97aa306295685dcf4ddd3b13f48320) (cherry picked from commit ea23594cdbb12c32dc28638f65bf40e37d344e5f) (cherry picked from commit cdc473850c85abcbe38c799c2d2446966978f2b2) (cherry picked from commit 86e6641c29df213d7db1b85867dafebcafeee1dd) (cherry picked from commit 2757de586b80834513e61033692ac72d25381431) (cherry picked from commit def4ae32ddb4b0b83f6bb9c197e00fdcd784928e) (cherry picked from commit 6dada09329e28840f7ad890bed333ae122838fb2) (cherry picked from commit 5d6d5272513629b126917c30f7bfde421fdcbe27) Conflicts: tests/integration/repo_test.go https://codeberg.org/forgejo/forgejo/pulls/2119 (cherry picked from commit d3c1bce7db31b243a7142b71bf4af36506752e6e) (cherry picked from commit 04bcb22d5c00d1fa8b39e2a3cf2e73f0a8c1204f) (cherry picked from commit e16241fd992c22203d113a4a11e7f57f9ed2ddb3) (cherry picked from commit 8e2beb3ed5da1ac8a58608acdf059f607576ff96)
308 lines
11 KiB
Go
308 lines
11 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestCommitsCount(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
|
|
commitsCount, err := CommitsCount(DefaultContext,
|
|
CommitsCountOptions{
|
|
RepoPath: bareRepo1Path,
|
|
Revision: []string{"8006ff9adbf0cb94da7dad9e537e53817f9fa5c0"},
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(3), commitsCount)
|
|
}
|
|
|
|
func TestCommitsCountWithoutBase(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
|
|
commitsCount, err := CommitsCount(DefaultContext,
|
|
CommitsCountOptions{
|
|
RepoPath: bareRepo1Path,
|
|
Not: "master",
|
|
Revision: []string{"branch1"},
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(2), commitsCount)
|
|
}
|
|
|
|
func TestGetFullCommitID(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
|
|
id, err := GetFullCommitID(DefaultContext, bareRepo1Path, "8006ff9a")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0", id)
|
|
}
|
|
|
|
func TestGetFullCommitIDError(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
|
|
id, err := GetFullCommitID(DefaultContext, bareRepo1Path, "unknown")
|
|
assert.Empty(t, id)
|
|
if assert.Error(t, err) {
|
|
assert.EqualError(t, err, "object does not exist [id: unknown, rel_path: ]")
|
|
}
|
|
}
|
|
|
|
func TestCommitFromReader(t *testing.T) {
|
|
commitString := `feaf4ba6bc635fec442f46ddd4512416ec43c2c2 commit 1074
|
|
tree f1a6cb52b2d16773290cefe49ad0684b50a4f930
|
|
parent 37991dec2c8e592043f47155ce4808d4580f9123
|
|
author silverwind <me@silverwind.io> 1563741793 +0200
|
|
committer silverwind <me@silverwind.io> 1563741793 +0200
|
|
gpgsig -----BEGIN PGP SIGNATURE-----
|
|
` + " " + `
|
|
iQIzBAABCAAdFiEEWPb2jX6FS2mqyJRQLmK0HJOGlEMFAl00zmEACgkQLmK0HJOG
|
|
lEMDFBAAhQKKqLD1VICygJMEB8t1gBmNLgvziOLfpX4KPWdPtBk3v/QJ7OrfMrVK
|
|
xlC4ZZyx6yMm1Q7GzmuWykmZQJ9HMaHJ49KAbh5MMjjV/+OoQw9coIdo8nagRUld
|
|
vX8QHzNZ6Agx77xHuDJZgdHKpQK3TrMDsxzoYYMvlqoLJIDXE1Sp7KYNy12nhdRg
|
|
R6NXNmW8oMZuxglkmUwayMiPS+N4zNYqv0CXYzlEqCOgq9MJUcAMHt+KpiST+sm6
|
|
FWkJ9D+biNPyQ9QKf1AE4BdZia4lHfPYU/C/DEL/a5xQuuop/zMQZoGaIA4p2zGQ
|
|
/maqYxEIM/yRBQpT1jlODKPJrMEgx7SgY2hRU47YZ4fj6350fb6fNBtiiMAfJbjL
|
|
S3Gh85E9fm3hJaNSPKAaJFYL1Ya2svuWfgHj677C56UcmYis7fhiiy1aJuYdHnSm
|
|
sD53z/f0J+We4VZjY+pidvA9BGZPFVdR3wd3xGs8/oH6UWaLJAMGkLG6dDb3qDLm
|
|
1LFZwsX8sdD32i1SiWanYQYSYMyFWr0awi4xdoMtYCL7uKBYtwtPyvq3cj4IrJlb
|
|
mfeFhT57UbE4qukTDIQ0Y0WM40UYRTakRaDY7ubhXgLgx09Cnp9XTVMsHgT6j9/i
|
|
1pxsB104XLWjQHTjr1JtiaBQEwFh9r2OKTcpvaLcbNtYpo7CzOs=
|
|
=FRsO
|
|
-----END PGP SIGNATURE-----
|
|
|
|
empty commit`
|
|
|
|
sha := &Sha1Hash{0xfe, 0xaf, 0x4b, 0xa6, 0xbc, 0x63, 0x5f, 0xec, 0x44, 0x2f, 0x46, 0xdd, 0xd4, 0x51, 0x24, 0x16, 0xec, 0x43, 0xc2, 0xc2}
|
|
gitRepo, err := openRepositoryWithDefaultContext(filepath.Join(testReposDir, "repo1_bare"))
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, gitRepo)
|
|
defer gitRepo.Close()
|
|
|
|
commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
|
|
assert.NoError(t, err)
|
|
if !assert.NotNil(t, commitFromReader) {
|
|
return
|
|
}
|
|
assert.EqualValues(t, sha, commitFromReader.ID)
|
|
assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
|
|
|
|
iQIzBAABCAAdFiEEWPb2jX6FS2mqyJRQLmK0HJOGlEMFAl00zmEACgkQLmK0HJOG
|
|
lEMDFBAAhQKKqLD1VICygJMEB8t1gBmNLgvziOLfpX4KPWdPtBk3v/QJ7OrfMrVK
|
|
xlC4ZZyx6yMm1Q7GzmuWykmZQJ9HMaHJ49KAbh5MMjjV/+OoQw9coIdo8nagRUld
|
|
vX8QHzNZ6Agx77xHuDJZgdHKpQK3TrMDsxzoYYMvlqoLJIDXE1Sp7KYNy12nhdRg
|
|
R6NXNmW8oMZuxglkmUwayMiPS+N4zNYqv0CXYzlEqCOgq9MJUcAMHt+KpiST+sm6
|
|
FWkJ9D+biNPyQ9QKf1AE4BdZia4lHfPYU/C/DEL/a5xQuuop/zMQZoGaIA4p2zGQ
|
|
/maqYxEIM/yRBQpT1jlODKPJrMEgx7SgY2hRU47YZ4fj6350fb6fNBtiiMAfJbjL
|
|
S3Gh85E9fm3hJaNSPKAaJFYL1Ya2svuWfgHj677C56UcmYis7fhiiy1aJuYdHnSm
|
|
sD53z/f0J+We4VZjY+pidvA9BGZPFVdR3wd3xGs8/oH6UWaLJAMGkLG6dDb3qDLm
|
|
1LFZwsX8sdD32i1SiWanYQYSYMyFWr0awi4xdoMtYCL7uKBYtwtPyvq3cj4IrJlb
|
|
mfeFhT57UbE4qukTDIQ0Y0WM40UYRTakRaDY7ubhXgLgx09Cnp9XTVMsHgT6j9/i
|
|
1pxsB104XLWjQHTjr1JtiaBQEwFh9r2OKTcpvaLcbNtYpo7CzOs=
|
|
=FRsO
|
|
-----END PGP SIGNATURE-----
|
|
`, commitFromReader.Signature.Signature)
|
|
assert.EqualValues(t, `tree f1a6cb52b2d16773290cefe49ad0684b50a4f930
|
|
parent 37991dec2c8e592043f47155ce4808d4580f9123
|
|
author silverwind <me@silverwind.io> 1563741793 +0200
|
|
committer silverwind <me@silverwind.io> 1563741793 +0200
|
|
|
|
empty commit`, commitFromReader.Signature.Payload)
|
|
assert.EqualValues(t, "silverwind <me@silverwind.io>", commitFromReader.Author.String())
|
|
|
|
commitFromReader2, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString+"\n\n"))
|
|
assert.NoError(t, err)
|
|
commitFromReader.CommitMessage += "\n\n"
|
|
commitFromReader.Signature.Payload += "\n\n"
|
|
assert.EqualValues(t, commitFromReader, commitFromReader2)
|
|
}
|
|
|
|
func TestHasPreviousCommit(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
|
|
|
|
repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
|
|
assert.NoError(t, err)
|
|
defer repo.Close()
|
|
|
|
commit, err := repo.GetCommit("8006ff9adbf0cb94da7dad9e537e53817f9fa5c0")
|
|
assert.NoError(t, err)
|
|
|
|
parentSHA := MustIDFromString("8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2")
|
|
notParentSHA := MustIDFromString("2839944139e0de9737a044f78b0e4b40d989a9e3")
|
|
|
|
haz, err := commit.HasPreviousCommit(parentSHA)
|
|
assert.NoError(t, err)
|
|
assert.True(t, haz)
|
|
|
|
hazNot, err := commit.HasPreviousCommit(notParentSHA)
|
|
assert.NoError(t, err)
|
|
assert.False(t, hazNot)
|
|
|
|
selfNot, err := commit.HasPreviousCommit(commit.ID)
|
|
assert.NoError(t, err)
|
|
assert.False(t, selfNot)
|
|
}
|
|
|
|
func TestParseCommitFileStatus(t *testing.T) {
|
|
type testcase struct {
|
|
output string
|
|
added []string
|
|
removed []string
|
|
modified []string
|
|
}
|
|
|
|
kases := []testcase{
|
|
{
|
|
// Merge commit
|
|
output: "MM\x00options/locale/locale_en-US.ini\x00",
|
|
modified: []string{
|
|
"options/locale/locale_en-US.ini",
|
|
},
|
|
added: []string{},
|
|
removed: []string{},
|
|
},
|
|
{
|
|
// Spaces commit
|
|
output: "D\x00b\x00D\x00b b/b\x00A\x00b b/b b/b b/b\x00A\x00b b/b b/b b/b b/b\x00",
|
|
removed: []string{
|
|
"b",
|
|
"b b/b",
|
|
},
|
|
modified: []string{},
|
|
added: []string{
|
|
"b b/b b/b b/b",
|
|
"b b/b b/b b/b b/b",
|
|
},
|
|
},
|
|
{
|
|
// larger commit
|
|
output: "M\x00go.mod\x00M\x00go.sum\x00M\x00modules/ssh/ssh.go\x00M\x00vendor/github.com/gliderlabs/ssh/circle.yml\x00M\x00vendor/github.com/gliderlabs/ssh/context.go\x00A\x00vendor/github.com/gliderlabs/ssh/go.mod\x00A\x00vendor/github.com/gliderlabs/ssh/go.sum\x00M\x00vendor/github.com/gliderlabs/ssh/server.go\x00M\x00vendor/github.com/gliderlabs/ssh/session.go\x00M\x00vendor/github.com/gliderlabs/ssh/ssh.go\x00M\x00vendor/golang.org/x/sys/unix/mkerrors.sh\x00M\x00vendor/golang.org/x/sys/unix/syscall_darwin.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go\x00M\x00vendor/golang.org/x/sys/unix/zerrors_linux.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go\x00M\x00vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go\x00M\x00vendor/modules.txt\x00",
|
|
modified: []string{
|
|
"go.mod",
|
|
"go.sum",
|
|
"modules/ssh/ssh.go",
|
|
"vendor/github.com/gliderlabs/ssh/circle.yml",
|
|
"vendor/github.com/gliderlabs/ssh/context.go",
|
|
"vendor/github.com/gliderlabs/ssh/server.go",
|
|
"vendor/github.com/gliderlabs/ssh/session.go",
|
|
"vendor/github.com/gliderlabs/ssh/ssh.go",
|
|
"vendor/golang.org/x/sys/unix/mkerrors.sh",
|
|
"vendor/golang.org/x/sys/unix/syscall_darwin.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go",
|
|
"vendor/golang.org/x/sys/unix/zerrors_linux.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go",
|
|
"vendor/golang.org/x/sys/unix/ztypes_netbsd_arm64.go",
|
|
"vendor/modules.txt",
|
|
},
|
|
added: []string{
|
|
"vendor/github.com/gliderlabs/ssh/go.mod",
|
|
"vendor/github.com/gliderlabs/ssh/go.sum",
|
|
},
|
|
removed: []string{},
|
|
},
|
|
{
|
|
// git 1.7.2 adds an unnecessary \x00 on merge commit
|
|
output: "\x00MM\x00options/locale/locale_en-US.ini\x00",
|
|
modified: []string{
|
|
"options/locale/locale_en-US.ini",
|
|
},
|
|
added: []string{},
|
|
removed: []string{},
|
|
},
|
|
{
|
|
// git 1.7.2 adds an unnecessary \n on normal commit
|
|
output: "\nD\x00b\x00D\x00b b/b\x00A\x00b b/b b/b b/b\x00A\x00b b/b b/b b/b b/b\x00",
|
|
removed: []string{
|
|
"b",
|
|
"b b/b",
|
|
},
|
|
modified: []string{},
|
|
added: []string{
|
|
"b b/b b/b b/b",
|
|
"b b/b b/b b/b b/b",
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, kase := range kases {
|
|
fileStatus := NewCommitFileStatus()
|
|
parseCommitFileStatus(fileStatus, strings.NewReader(kase.output))
|
|
|
|
assert.Equal(t, kase.added, fileStatus.Added)
|
|
assert.Equal(t, kase.removed, fileStatus.Removed)
|
|
assert.Equal(t, kase.modified, fileStatus.Modified)
|
|
}
|
|
}
|
|
|
|
func TestGetCommitFileStatusMerges(t *testing.T) {
|
|
bareRepo1Path := filepath.Join(testReposDir, "repo6_merge")
|
|
|
|
commitFileStatus, err := GetCommitFileStatus(DefaultContext, bareRepo1Path, "022f4ce6214973e018f02bf363bf8a2e3691f699")
|
|
assert.NoError(t, err)
|
|
|
|
expected := CommitFileStatus{
|
|
[]string{
|
|
"add_file.txt",
|
|
},
|
|
[]string{
|
|
"to_remove.txt",
|
|
},
|
|
[]string{
|
|
"to_modify.txt",
|
|
},
|
|
}
|
|
|
|
assert.Equal(t, commitFileStatus.Added, expected.Added)
|
|
assert.Equal(t, commitFileStatus.Removed, expected.Removed)
|
|
assert.Equal(t, commitFileStatus.Modified, expected.Modified)
|
|
}
|
|
|
|
func TestParseCommitRenames(t *testing.T) {
|
|
testcases := []struct {
|
|
output string
|
|
renames [][2]string
|
|
}{
|
|
{
|
|
output: "R090\x00renamed.txt\x00history.txt\x00",
|
|
renames: [][2]string{{"renamed.txt", "history.txt"}},
|
|
},
|
|
{
|
|
output: "R090\x00renamed.txt\x00history.txt\x00R000\x00corruptedstdouthere",
|
|
renames: [][2]string{{"renamed.txt", "history.txt"}},
|
|
},
|
|
{
|
|
output: "R100\x00renamed.txt\x00history.txt\x00R001\x00readme.md\x00README.md\x00",
|
|
renames: [][2]string{{"renamed.txt", "history.txt"}, {"readme.md", "README.md"}},
|
|
},
|
|
}
|
|
|
|
for _, testcase := range testcases {
|
|
renames := [][2]string{}
|
|
parseCommitRenames(&renames, strings.NewReader(testcase.output))
|
|
|
|
assert.Equal(t, testcase.renames, renames)
|
|
}
|
|
}
|