mirror of
https://github.com/go-gitea/gitea.git
synced 2025-10-26 12:27:06 +00:00
Add go wrapper around git diff-tree --raw -r -M (#33369)
* Implemented calling git diff-tree * Ensures wrapper function is called with valid arguments * Parses output into go struct, using strong typing when possible
This commit is contained in:
Alexander McRae
@@ -46,19 +46,9 @@ func parseLsTreeLine(line []byte) (*LsTreeEntry, error) {
|
||||
entry.Size = optional.Some(size)
|
||||
}
|
||||
|
||||
switch string(entryMode) {
|
||||
case "100644":
|
||||
entry.EntryMode = EntryModeBlob
|
||||
case "100755":
|
||||
entry.EntryMode = EntryModeExec
|
||||
case "120000":
|
||||
entry.EntryMode = EntryModeSymlink
|
||||
case "160000":
|
||||
entry.EntryMode = EntryModeCommit
|
||||
case "040000", "040755": // git uses 040000 for tree object, but some users may get 040755 for unknown reasons
|
||||
entry.EntryMode = EntryModeTree
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown type: %v", string(entryMode))
|
||||
entry.EntryMode, err = ParseEntryMode(string(entryMode))
|
||||
if err != nil || entry.EntryMode == EntryModeNoEntry {
|
||||
return nil, fmt.Errorf("invalid ls-tree output (invalid mode): %q, err: %w", line, err)
|
||||
}
|
||||
|
||||
entry.ID, err = NewIDFromString(string(entryObjectID))
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
|
||||
package git
|
||||
|
||||
import "strconv"
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
// EntryMode the type of the object in the git tree
|
||||
type EntryMode int
|
||||
@@ -11,6 +14,9 @@ type EntryMode int
|
||||
// There are only a few file modes in Git. They look like unix file modes, but they can only be
|
||||
// one of these.
|
||||
const (
|
||||
// EntryModeNoEntry is possible if the file was added or removed in a commit. In the case of
|
||||
// added the base commit will not have the file in its tree so a mode of 0o000000 is used.
|
||||
EntryModeNoEntry EntryMode = 0o000000
|
||||
// EntryModeBlob
|
||||
EntryModeBlob EntryMode = 0o100644
|
||||
// EntryModeExec
|
||||
@@ -33,3 +39,22 @@ func ToEntryMode(value string) EntryMode {
|
||||
v, _ := strconv.ParseInt(value, 8, 32)
|
||||
return EntryMode(v)
|
||||
}
|
||||
|
||||
func ParseEntryMode(mode string) (EntryMode, error) {
|
||||
switch mode {
|
||||
case "000000":
|
||||
return EntryModeNoEntry, nil
|
||||
case "100644":
|
||||
return EntryModeBlob, nil
|
||||
case "100755":
|
||||
return EntryModeExec, nil
|
||||
case "120000":
|
||||
return EntryModeSymlink, nil
|
||||
case "160000":
|
||||
return EntryModeCommit, nil
|
||||
case "040000", "040755": // git uses 040000 for tree object, but some users may get 040755 for unknown reasons
|
||||
return EntryModeTree, nil
|
||||
default:
|
||||
return 0, fmt.Errorf("unparsable entry mode: %s", mode)
|
||||
}
|
||||
}
|
||||
|
||||
249
services/gitdiff/git_diff_tree.go
Normal file
249
services/gitdiff/git_diff_tree.go
Normal file
@@ -0,0 +1,249 @@
|
||||
// Copyright 2025 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package gitdiff
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/gitea/modules/git"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
)
|
||||
|
||||
type DiffTree struct {
|
||||
Files []*DiffTreeRecord
|
||||
}
|
||||
|
||||
type DiffTreeRecord struct {
|
||||
// Status is one of 'added', 'deleted', 'modified', 'renamed', 'copied', 'typechanged', 'unmerged', 'unknown'
|
||||
Status string
|
||||
|
||||
// For renames and copies, the percentage of similarity between the source and target of the move/rename.
|
||||
Score uint8
|
||||
|
||||
HeadPath string
|
||||
BasePath string
|
||||
HeadMode git.EntryMode
|
||||
BaseMode git.EntryMode
|
||||
HeadBlobID string
|
||||
BaseBlobID string
|
||||
}
|
||||
|
||||
// GetDiffTree returns the list of path of the files that have changed between the two commits.
|
||||
// If useMergeBase is true, the diff will be calculated using the merge base of the two commits.
|
||||
// This is the same behavior as using a three-dot diff in git diff.
|
||||
func GetDiffTree(ctx context.Context, gitRepo *git.Repository, useMergeBase bool, baseSha, headSha string) (*DiffTree, error) {
|
||||
gitDiffTreeRecords, err := runGitDiffTree(ctx, gitRepo, useMergeBase, baseSha, headSha)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &DiffTree{
|
||||
Files: gitDiffTreeRecords,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func runGitDiffTree(ctx context.Context, gitRepo *git.Repository, useMergeBase bool, baseSha, headSha string) ([]*DiffTreeRecord, error) {
|
||||
useMergeBase, baseCommitID, headCommitID, err := validateGitDiffTreeArguments(gitRepo, useMergeBase, baseSha, headSha)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
cmd := git.NewCommand(ctx, "diff-tree", "--raw", "-r", "--find-renames", "--root")
|
||||
if useMergeBase {
|
||||
cmd.AddArguments("--merge-base")
|
||||
}
|
||||
cmd.AddDynamicArguments(baseCommitID, headCommitID)
|
||||
stdout, _, runErr := cmd.RunStdString(&git.RunOpts{Dir: gitRepo.Path})
|
||||
if runErr != nil {
|
||||
log.Warn("git diff-tree: %v", runErr)
|
||||
return nil, runErr
|
||||
}
|
||||
|
||||
return parseGitDiffTree(strings.NewReader(stdout))
|
||||
}
|
||||
|
||||
func validateGitDiffTreeArguments(gitRepo *git.Repository, useMergeBase bool, baseSha, headSha string) (shouldUseMergeBase bool, resolvedBaseSha, resolvedHeadSha string, err error) {
|
||||
// if the head is empty its an error
|
||||
if headSha == "" {
|
||||
return false, "", "", fmt.Errorf("headSha is empty")
|
||||
}
|
||||
|
||||
// if the head commit doesn't exist its and error
|
||||
headCommit, err := gitRepo.GetCommit(headSha)
|
||||
if err != nil {
|
||||
return false, "", "", fmt.Errorf("failed to get commit headSha: %v", err)
|
||||
}
|
||||
headCommitID := headCommit.ID.String()
|
||||
|
||||
// if the base is empty we should use the parent of the head commit
|
||||
if baseSha == "" {
|
||||
// if the headCommit has no parent we should use an empty commit
|
||||
// this can happen when we are generating a diff against an orphaned commit
|
||||
if headCommit.ParentCount() == 0 {
|
||||
objectFormat, err := gitRepo.GetObjectFormat()
|
||||
if err != nil {
|
||||
return false, "", "", err
|
||||
}
|
||||
|
||||
// We set use merge base to false because we have no base commit
|
||||
return false, objectFormat.EmptyTree().String(), headCommitID, nil
|
||||
}
|
||||
|
||||
baseCommit, err := headCommit.Parent(0)
|
||||
if err != nil {
|
||||
return false, "", "", fmt.Errorf("baseSha is '', attempted to use parent of commit %s, got error: %v", headCommit.ID.String(), err)
|
||||
}
|
||||
return useMergeBase, baseCommit.ID.String(), headCommitID, nil
|
||||
}
|
||||
|
||||
// try and get the base commit
|
||||
baseCommit, err := gitRepo.GetCommit(baseSha)
|
||||
// propagate the error if we couldn't get the base commit
|
||||
if err != nil {
|
||||
return useMergeBase, "", "", fmt.Errorf("failed to get base commit %s: %v", baseSha, err)
|
||||
}
|
||||
|
||||
return useMergeBase, baseCommit.ID.String(), headCommit.ID.String(), nil
|
||||
}
|
||||
|
||||
func parseGitDiffTree(gitOutput io.Reader) ([]*DiffTreeRecord, error) {
|
||||
/*
|
||||
The output of `git diff-tree --raw -r --find-renames` is of the form:
|
||||
|
||||
:<old_mode> <new_mode> <old_sha> <new_sha> <status>\t<path>
|
||||
|
||||
or for renames:
|
||||
|
||||
:<old_mode> <new_mode> <old_sha> <new_sha> <status>\t<old_path>\t<new_path>
|
||||
|
||||
See: <https://git-scm.com/docs/git-diff-tree#_raw_output_format> for more details
|
||||
*/
|
||||
results := make([]*DiffTreeRecord, 0)
|
||||
|
||||
lines := bufio.NewScanner(gitOutput)
|
||||
for lines.Scan() {
|
||||
line := lines.Text()
|
||||
|
||||
if len(line) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
record, err := parseGitDiffTreeLine(line)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
results = append(results, record)
|
||||
}
|
||||
|
||||
if err := lines.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return results, nil
|
||||
}
|
||||
|
||||
func parseGitDiffTreeLine(line string) (*DiffTreeRecord, error) {
|
||||
line = strings.TrimPrefix(line, ":")
|
||||
splitSections := strings.SplitN(line, "\t", 2)
|
||||
if len(splitSections) < 2 {
|
||||
return nil, fmt.Errorf("unparsable output for diff-tree --raw: `%s`)", line)
|
||||
}
|
||||
|
||||
fields := strings.Fields(splitSections[0])
|
||||
if len(fields) < 5 {
|
||||
return nil, fmt.Errorf("unparsable output for diff-tree --raw: `%s`, expected 5 space delimited values got %d)", line, len(fields))
|
||||
}
|
||||
|
||||
baseMode, err := git.ParseEntryMode(fields[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
headMode, err := git.ParseEntryMode(fields[1])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
baseBlobID := fields[2]
|
||||
headBlobID := fields[3]
|
||||
|
||||
status, score, err := statusFromLetter(fields[4])
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unparsable output for diff-tree --raw: %s, error: %s", line, err)
|
||||
}
|
||||
|
||||
filePaths := strings.Split(splitSections[1], "\t")
|
||||
|
||||
var headPath, basePath string
|
||||
if status == "renamed" {
|
||||
if len(filePaths) != 2 {
|
||||
return nil, fmt.Errorf("unparsable output for diff-tree --raw: `%s`, expected 2 paths found %d", line, len(filePaths))
|
||||
}
|
||||
basePath = filePaths[0]
|
||||
headPath = filePaths[1]
|
||||
} else {
|
||||
basePath = filePaths[0]
|
||||
headPath = filePaths[0]
|
||||
}
|
||||
|
||||
return &DiffTreeRecord{
|
||||
Status: status,
|
||||
Score: score,
|
||||
BaseMode: baseMode,
|
||||
HeadMode: headMode,
|
||||
BaseBlobID: baseBlobID,
|
||||
HeadBlobID: headBlobID,
|
||||
BasePath: basePath,
|
||||
HeadPath: headPath,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func statusFromLetter(rawStatus string) (status string, score uint8, err error) {
|
||||
if len(rawStatus) < 1 {
|
||||
return "", 0, fmt.Errorf("empty status letter")
|
||||
}
|
||||
switch rawStatus[0] {
|
||||
case 'A':
|
||||
return "added", 0, nil
|
||||
case 'D':
|
||||
return "deleted", 0, nil
|
||||
case 'M':
|
||||
return "modified", 0, nil
|
||||
case 'R':
|
||||
score, err = tryParseStatusScore(rawStatus)
|
||||
return "renamed", score, err
|
||||
case 'C':
|
||||
score, err = tryParseStatusScore(rawStatus)
|
||||
return "copied", score, err
|
||||
case 'T':
|
||||
return "typechanged", 0, nil
|
||||
case 'U':
|
||||
return "unmerged", 0, nil
|
||||
case 'X':
|
||||
return "unknown", 0, nil
|
||||
default:
|
||||
return "", 0, fmt.Errorf("unknown status letter: '%s'", rawStatus)
|
||||
}
|
||||
}
|
||||
|
||||
func tryParseStatusScore(rawStatus string) (uint8, error) {
|
||||
if len(rawStatus) < 2 {
|
||||
return 0, fmt.Errorf("status score missing")
|
||||
}
|
||||
|
||||
score, err := strconv.ParseUint(rawStatus[1:], 10, 8)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("failed to parse status score: %w", err)
|
||||
} else if score > 100 {
|
||||
return 0, fmt.Errorf("status score out of range: %d", score)
|
||||
}
|
||||
|
||||
return uint8(score), nil
|
||||
}
|
||||
427
services/gitdiff/git_diff_tree_test.go
Normal file
427
services/gitdiff/git_diff_tree_test.go
Normal file
@@ -0,0 +1,427 @@
|
||||
// Copyright 2025 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package gitdiff
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
"code.gitea.io/gitea/modules/git"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestGitDiffTree(t *testing.T) {
|
||||
test := []struct {
|
||||
Name string
|
||||
RepoPath string
|
||||
BaseSha string
|
||||
HeadSha string
|
||||
useMergeBase bool
|
||||
Expected *DiffTree
|
||||
}{
|
||||
{
|
||||
Name: "happy path",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "72866af952e98d02a73003501836074b286a78f6",
|
||||
HeadSha: "d8e0bbb45f200e67d9a784ce55bd90821af45ebd",
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "LICENSE",
|
||||
BasePath: "LICENSE",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "ee469963e76ae1bb7ee83d7510df2864e6c8c640",
|
||||
BaseBlobID: "c996f4725be8fc8c1d1c776e58c97ddc5d03b336",
|
||||
},
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "README.md",
|
||||
BasePath: "README.md",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "9dfc0a6257d8eff526f0cfaf6a8ea950f55a9dba",
|
||||
BaseBlobID: "074e590b8e64898b02beef03ece83f962c94f54c",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "first commit (no parent)",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
HeadSha: "72866af952e98d02a73003501836074b286a78f6",
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: ".gitignore",
|
||||
BasePath: ".gitignore",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "f1c181ec9c5c921245027c6b452ecfc1d3626364",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "LICENSE",
|
||||
BasePath: "LICENSE",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "c996f4725be8fc8c1d1c776e58c97ddc5d03b336",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "README.md",
|
||||
BasePath: "README.md",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "074e590b8e64898b02beef03ece83f962c94f54c",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "first commit (no parent), merge base = true",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
HeadSha: "72866af952e98d02a73003501836074b286a78f6",
|
||||
useMergeBase: true,
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: ".gitignore",
|
||||
BasePath: ".gitignore",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "f1c181ec9c5c921245027c6b452ecfc1d3626364",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "LICENSE",
|
||||
BasePath: "LICENSE",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "c996f4725be8fc8c1d1c776e58c97ddc5d03b336",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "README.md",
|
||||
BasePath: "README.md",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "074e590b8e64898b02beef03ece83f962c94f54c",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "base and head same",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "ed8f4d2fa5b2420706580d191f5dd50c4e491f3f",
|
||||
HeadSha: "ed8f4d2fa5b2420706580d191f5dd50c4e491f3f",
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "useMergeBase false",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "ed8f4d2fa5b2420706580d191f5dd50c4e491f3f",
|
||||
HeadSha: "111cac04bd7d20301964e27a93698aabb5781b80", // this commit can be found on the update-readme branch
|
||||
useMergeBase: false,
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "LICENSE",
|
||||
BasePath: "LICENSE",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "c996f4725be8fc8c1d1c776e58c97ddc5d03b336",
|
||||
BaseBlobID: "ed5119b3c1f45547b6785bc03eac7f87570fa17f",
|
||||
},
|
||||
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "README.md",
|
||||
BasePath: "README.md",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "fb39771a8865c9a67f2ab9b616c854805664553c",
|
||||
BaseBlobID: "9dfc0a6257d8eff526f0cfaf6a8ea950f55a9dba",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "useMergeBase true",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "ed8f4d2fa5b2420706580d191f5dd50c4e491f3f",
|
||||
HeadSha: "111cac04bd7d20301964e27a93698aabb5781b80", // this commit can be found on the update-readme branch
|
||||
useMergeBase: true,
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "README.md",
|
||||
BasePath: "README.md",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "fb39771a8865c9a67f2ab9b616c854805664553c",
|
||||
BaseBlobID: "9dfc0a6257d8eff526f0cfaf6a8ea950f55a9dba",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "no base set",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
HeadSha: "d8e0bbb45f200e67d9a784ce55bd90821af45ebd", // this commit can be found on the update-readme branch
|
||||
useMergeBase: false,
|
||||
Expected: &DiffTree{
|
||||
Files: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "LICENSE",
|
||||
BasePath: "LICENSE",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "ee469963e76ae1bb7ee83d7510df2864e6c8c640",
|
||||
BaseBlobID: "ed5119b3c1f45547b6785bc03eac7f87570fa17f",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range test {
|
||||
t.Run(tt.Name, func(t *testing.T) {
|
||||
gitRepo, err := git.OpenRepository(git.DefaultContext, tt.RepoPath)
|
||||
assert.NoError(t, err)
|
||||
defer gitRepo.Close()
|
||||
|
||||
diffPaths, err := GetDiffTree(db.DefaultContext, gitRepo, tt.useMergeBase, tt.BaseSha, tt.HeadSha)
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, tt.Expected, diffPaths)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseGitDiffTree(t *testing.T) {
|
||||
test := []struct {
|
||||
Name string
|
||||
GitOutput string
|
||||
Expected []*DiffTreeRecord
|
||||
}{
|
||||
{
|
||||
Name: "file change",
|
||||
GitOutput: ":100644 100644 64e43d23bcd08db12563a0a4d84309cadb437e1a 5dbc7792b5bb228647cfcc8dfe65fc649119dedc M\tResources/views/curriculum/edit.blade.php",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "Resources/views/curriculum/edit.blade.php",
|
||||
BasePath: "Resources/views/curriculum/edit.blade.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "5dbc7792b5bb228647cfcc8dfe65fc649119dedc",
|
||||
BaseBlobID: "64e43d23bcd08db12563a0a4d84309cadb437e1a",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "file added",
|
||||
GitOutput: ":000000 100644 0000000000000000000000000000000000000000 0063162fb403db15ceb0517b34ab782e4e58b619 A\tResources/views/class/index.blade.php",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "Resources/views/class/index.blade.php",
|
||||
BasePath: "Resources/views/class/index.blade.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "0063162fb403db15ceb0517b34ab782e4e58b619",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "file deleted",
|
||||
GitOutput: ":100644 000000 bac4286303c8c0017ea2f0a48c561ddcc0330a14 0000000000000000000000000000000000000000 D\tResources/views/classes/index.blade.php",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "deleted",
|
||||
HeadPath: "Resources/views/classes/index.blade.php",
|
||||
BasePath: "Resources/views/classes/index.blade.php",
|
||||
HeadMode: git.EntryModeNoEntry,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "0000000000000000000000000000000000000000",
|
||||
BaseBlobID: "bac4286303c8c0017ea2f0a48c561ddcc0330a14",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "file renamed",
|
||||
GitOutput: ":100644 100644 c8a055cfb45cd39747292983ad1797ceab40f5b1 97248f79a90aaf81fe7fd74b33c1cb182dd41783 R087\tDatabase/Seeders/AdminDatabaseSeeder.php\tDatabase/Seeders/AcademicDatabaseSeeder.php",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "renamed",
|
||||
Score: 87,
|
||||
HeadPath: "Database/Seeders/AcademicDatabaseSeeder.php",
|
||||
BasePath: "Database/Seeders/AdminDatabaseSeeder.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "97248f79a90aaf81fe7fd74b33c1cb182dd41783",
|
||||
BaseBlobID: "c8a055cfb45cd39747292983ad1797ceab40f5b1",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "no changes",
|
||||
GitOutput: ``,
|
||||
Expected: []*DiffTreeRecord{},
|
||||
},
|
||||
{
|
||||
Name: "multiple changes",
|
||||
GitOutput: ":000000 100644 0000000000000000000000000000000000000000 db736b44533a840981f1f17b7029d0f612b69550 A\tHttp/Controllers/ClassController.php\n" +
|
||||
":100644 000000 9a4d2344d4d0145db7c91b3f3e123c74367d4ef4 0000000000000000000000000000000000000000 D\tHttp/Controllers/ClassesController.php\n" +
|
||||
":100644 100644 f060d6aede65d423f49e7dc248dfa0d8835ef920 b82c8e39a3602dedadb44669956d6eb5b6a7cc86 M\tHttp/Controllers/ProgramDirectorController.php\n",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "Http/Controllers/ClassController.php",
|
||||
BasePath: "Http/Controllers/ClassController.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "db736b44533a840981f1f17b7029d0f612b69550",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "deleted",
|
||||
HeadPath: "Http/Controllers/ClassesController.php",
|
||||
BasePath: "Http/Controllers/ClassesController.php",
|
||||
HeadMode: git.EntryModeNoEntry,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "0000000000000000000000000000000000000000",
|
||||
BaseBlobID: "9a4d2344d4d0145db7c91b3f3e123c74367d4ef4",
|
||||
},
|
||||
{
|
||||
Status: "modified",
|
||||
HeadPath: "Http/Controllers/ProgramDirectorController.php",
|
||||
BasePath: "Http/Controllers/ProgramDirectorController.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "b82c8e39a3602dedadb44669956d6eb5b6a7cc86",
|
||||
BaseBlobID: "f060d6aede65d423f49e7dc248dfa0d8835ef920",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "spaces in file path",
|
||||
GitOutput: ":000000 100644 0000000000000000000000000000000000000000 db736b44533a840981f1f17b7029d0f612b69550 A\tHttp /Controllers/Class Controller.php\n" +
|
||||
":100644 000000 9a4d2344d4d0145db7c91b3f3e123c74367d4ef4 0000000000000000000000000000000000000000 D\tHttp/Cont rollers/Classes Controller.php\n" +
|
||||
":100644 100644 f060d6aede65d423f49e7dc248dfa0d8835ef920 b82c8e39a3602dedadb44669956d6eb5b6a7cc86 R010\tHttp/Controllers/Program Director Controller.php\tHttp/Cont rollers/ProgramDirectorController.php\n",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "added",
|
||||
HeadPath: "Http /Controllers/Class Controller.php",
|
||||
BasePath: "Http /Controllers/Class Controller.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeNoEntry,
|
||||
HeadBlobID: "db736b44533a840981f1f17b7029d0f612b69550",
|
||||
BaseBlobID: "0000000000000000000000000000000000000000",
|
||||
},
|
||||
{
|
||||
Status: "deleted",
|
||||
HeadPath: "Http/Cont rollers/Classes Controller.php",
|
||||
BasePath: "Http/Cont rollers/Classes Controller.php",
|
||||
HeadMode: git.EntryModeNoEntry,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "0000000000000000000000000000000000000000",
|
||||
BaseBlobID: "9a4d2344d4d0145db7c91b3f3e123c74367d4ef4",
|
||||
},
|
||||
{
|
||||
Status: "renamed",
|
||||
Score: 10,
|
||||
HeadPath: "Http/Cont rollers/ProgramDirectorController.php",
|
||||
BasePath: "Http/Controllers/Program Director Controller.php",
|
||||
HeadMode: git.EntryModeBlob,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "b82c8e39a3602dedadb44669956d6eb5b6a7cc86",
|
||||
BaseBlobID: "f060d6aede65d423f49e7dc248dfa0d8835ef920",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "file type changed",
|
||||
GitOutput: ":100644 120000 344e0ca8aa791cc4164fb0ea645f334fd40d00f0 a7c2973de00bfdc6ca51d315f401b5199fe01dc3 T\twebpack.mix.js",
|
||||
Expected: []*DiffTreeRecord{
|
||||
{
|
||||
Status: "typechanged",
|
||||
HeadPath: "webpack.mix.js",
|
||||
BasePath: "webpack.mix.js",
|
||||
HeadMode: git.EntryModeSymlink,
|
||||
BaseMode: git.EntryModeBlob,
|
||||
HeadBlobID: "a7c2973de00bfdc6ca51d315f401b5199fe01dc3",
|
||||
BaseBlobID: "344e0ca8aa791cc4164fb0ea645f334fd40d00f0",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range test {
|
||||
t.Run(tt.Name, func(t *testing.T) {
|
||||
entries, err := parseGitDiffTree(strings.NewReader(tt.GitOutput))
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tt.Expected, entries)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestGitDiffTreeErrors(t *testing.T) {
|
||||
test := []struct {
|
||||
Name string
|
||||
RepoPath string
|
||||
BaseSha string
|
||||
HeadSha string
|
||||
}{
|
||||
{
|
||||
Name: "head doesn't exist",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "f32b0a9dfd09a60f616f29158f772cedd89942d2",
|
||||
HeadSha: "asdfasdfasdf",
|
||||
},
|
||||
{
|
||||
Name: "base doesn't exist",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "asdfasdfasdf",
|
||||
HeadSha: "f32b0a9dfd09a60f616f29158f772cedd89942d2",
|
||||
},
|
||||
{
|
||||
Name: "head not set",
|
||||
RepoPath: "../../modules/git/tests/repos/repo5_pulls",
|
||||
BaseSha: "f32b0a9dfd09a60f616f29158f772cedd89942d2",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range test {
|
||||
t.Run(tt.Name, func(t *testing.T) {
|
||||
gitRepo, err := git.OpenRepository(git.DefaultContext, tt.RepoPath)
|
||||
assert.NoError(t, err)
|
||||
defer gitRepo.Close()
|
||||
|
||||
diffPaths, err := GetDiffTree(db.DefaultContext, gitRepo, true, tt.BaseSha, tt.HeadSha)
|
||||
assert.Error(t, err)
|
||||
assert.Nil(t, diffPaths)
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user