2018-08-19 06:48:39 +02:00
|
|
|
package commands
|
|
|
|
|
|
|
|
import (
|
2018-08-29 22:55:57 +02:00
|
|
|
"fmt"
|
2018-08-19 06:48:39 +02:00
|
|
|
"io/ioutil"
|
2018-08-27 22:41:46 +02:00
|
|
|
"os/exec"
|
2018-08-19 06:48:39 +02:00
|
|
|
"testing"
|
|
|
|
|
2018-08-29 22:55:57 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/i18n"
|
2018-08-19 06:48:39 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/test"
|
2018-08-26 07:46:18 +02:00
|
|
|
"github.com/sirupsen/logrus"
|
2018-08-27 22:40:15 +02:00
|
|
|
"github.com/stretchr/testify/assert"
|
2018-08-29 22:55:57 +02:00
|
|
|
gogit "gopkg.in/src-d/go-git.v4"
|
2018-08-19 06:48:39 +02:00
|
|
|
)
|
|
|
|
|
2018-08-27 10:50:24 +02:00
|
|
|
func newDummyLog() *logrus.Entry {
|
2018-08-19 06:48:39 +02:00
|
|
|
log := logrus.New()
|
|
|
|
log.Out = ioutil.Discard
|
2018-08-26 07:46:18 +02:00
|
|
|
return log.WithField("test", "test")
|
2018-08-19 06:48:39 +02:00
|
|
|
}
|
|
|
|
|
2018-08-22 22:30:02 +02:00
|
|
|
func newDummyGitCommand() *GitCommand {
|
2018-08-19 06:48:39 +02:00
|
|
|
return &GitCommand{
|
2018-08-22 22:30:02 +02:00
|
|
|
Log: newDummyLog(),
|
|
|
|
OSCommand: newDummyOSCommand(),
|
2018-08-29 22:55:57 +02:00
|
|
|
Tr: i18n.NewLocalizer(newDummyLog()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGitCommandSetupGit(t *testing.T) {
|
|
|
|
type scenario struct {
|
|
|
|
command func(string, ...string) *exec.Cmd
|
|
|
|
openGitRepositoryAndWorktree func() (*gogit.Repository, *gogit.Worktree, error)
|
|
|
|
test func(error)
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("exit", "1")
|
|
|
|
},
|
|
|
|
func() (*gogit.Repository, *gogit.Worktree, error) {
|
|
|
|
return nil, nil, nil
|
|
|
|
},
|
|
|
|
func(err error) {
|
|
|
|
assert.Error(t, err)
|
|
|
|
assert.Equal(t, ErrGitRepositoryInvalid, err)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo")
|
|
|
|
},
|
|
|
|
func() (*gogit.Repository, *gogit.Worktree, error) {
|
|
|
|
return nil, nil, fmt.Errorf(`unquoted '\' must be followed by new line`)
|
|
|
|
},
|
|
|
|
func(err error) {
|
|
|
|
assert.Error(t, err)
|
|
|
|
assert.Contains(t, err.Error(), "gitconfig")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo")
|
|
|
|
},
|
|
|
|
func() (*gogit.Repository, *gogit.Worktree, error) {
|
|
|
|
return nil, nil, fmt.Errorf("Error from inside gogit")
|
|
|
|
},
|
|
|
|
func(err error) {
|
|
|
|
assert.Error(t, err)
|
|
|
|
assert.EqualError(t, err, "Error from inside gogit")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo")
|
|
|
|
},
|
|
|
|
func() (*gogit.Repository, *gogit.Worktree, error) {
|
|
|
|
return &gogit.Repository{}, &gogit.Worktree{}, nil
|
|
|
|
},
|
|
|
|
func(err error) {
|
|
|
|
assert.NoError(t, err)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = s.command
|
|
|
|
gitCmd.openGitRepositoryAndWorktree = s.openGitRepositoryAndWorktree
|
|
|
|
|
|
|
|
s.test(gitCmd.SetupGit())
|
2018-08-19 06:48:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-27 22:41:46 +02:00
|
|
|
func TestGitCommandGetStashEntries(t *testing.T) {
|
|
|
|
type scenario struct {
|
|
|
|
command func(string, ...string) *exec.Cmd
|
|
|
|
test func([]StashEntry)
|
2018-08-19 06:48:39 +02:00
|
|
|
}
|
2018-08-27 22:41:46 +02:00
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo")
|
|
|
|
},
|
|
|
|
func(entries []StashEntry) {
|
|
|
|
assert.Len(t, entries, 0)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
func(string, ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo", "WIP on add-pkg-commands-test: 55c6af2 increase parallel build\nWIP on master: bb86a3f update github template")
|
|
|
|
},
|
|
|
|
func(entries []StashEntry) {
|
|
|
|
expected := []StashEntry{
|
|
|
|
{
|
|
|
|
0,
|
|
|
|
"WIP on add-pkg-commands-test: 55c6af2 increase parallel build",
|
|
|
|
"WIP on add-pkg-commands-test: 55c6af2 increase parallel build",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
1,
|
|
|
|
"WIP on master: bb86a3f update github template",
|
|
|
|
"WIP on master: bb86a3f update github template",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, entries, 2)
|
|
|
|
assert.EqualValues(t, expected, entries)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = s.command
|
|
|
|
|
|
|
|
s.test(gitCmd.GetStashEntries())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-27 23:20:27 +02:00
|
|
|
func TestGetStashEntryDiff(t *testing.T) {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
assert.EqualValues(t, "git", cmd)
|
|
|
|
assert.EqualValues(t, []string{"stash", "show", "-p", "--color", "stash@{1}"}, args)
|
|
|
|
|
|
|
|
return exec.Command("echo")
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err := gitCmd.GetStashEntryDiff(1)
|
|
|
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
2018-08-27 23:20:44 +02:00
|
|
|
func TestGetStatusFiles(t *testing.T) {
|
|
|
|
type scenario struct {
|
|
|
|
command func(string, ...string) *exec.Cmd
|
|
|
|
test func([]File)
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
return exec.Command("echo")
|
|
|
|
},
|
|
|
|
func(files []File) {
|
|
|
|
assert.Len(t, files, 0)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
return exec.Command(
|
|
|
|
"echo",
|
|
|
|
"MM file1.txt\nA file3.txt\nAM file2.txt\n?? file4.txt",
|
|
|
|
)
|
|
|
|
},
|
|
|
|
func(files []File) {
|
|
|
|
assert.Len(t, files, 4)
|
|
|
|
|
|
|
|
expected := []File{
|
|
|
|
{
|
|
|
|
Name: "file1.txt",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: true,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "MM file1.txt",
|
2018-08-28 21:17:18 +02:00
|
|
|
Type: "other",
|
2018-08-27 23:20:44 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "file3.txt",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: false,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "A file3.txt",
|
2018-08-28 21:17:18 +02:00
|
|
|
Type: "other",
|
2018-08-27 23:20:44 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "file2.txt",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "AM file2.txt",
|
2018-08-28 21:17:18 +02:00
|
|
|
Type: "other",
|
2018-08-27 23:20:44 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "file4.txt",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "?? file4.txt",
|
2018-08-28 21:17:18 +02:00
|
|
|
Type: "other",
|
2018-08-27 23:20:44 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.EqualValues(t, expected, files)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = s.command
|
|
|
|
|
|
|
|
s.test(gitCmd.GetStatusFiles())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-28 20:18:34 +02:00
|
|
|
func TestGitCommandStashDo(t *testing.T) {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
assert.EqualValues(t, "git", cmd)
|
|
|
|
assert.EqualValues(t, []string{"stash", "drop", "stash@{1}"}, args)
|
|
|
|
|
|
|
|
return exec.Command("echo")
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.NoError(t, gitCmd.StashDo(1, "drop"))
|
|
|
|
}
|
|
|
|
|
2018-08-28 20:24:19 +02:00
|
|
|
func TestGitCommandStashSave(t *testing.T) {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
assert.EqualValues(t, "git", cmd)
|
|
|
|
assert.EqualValues(t, []string{"stash", "save", "A stash message"}, args)
|
|
|
|
|
|
|
|
return exec.Command("echo")
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.NoError(t, gitCmd.StashSave("A stash message"))
|
|
|
|
}
|
|
|
|
|
2018-09-01 12:29:43 +02:00
|
|
|
func TestGitCommandCommitAmend(t *testing.T) {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
gitCmd.OSCommand.command = func(cmd string, args ...string) *exec.Cmd {
|
|
|
|
assert.EqualValues(t, "git", cmd)
|
|
|
|
assert.EqualValues(t, []string{"commit", "--amend", "--allow-empty"}, args)
|
|
|
|
|
|
|
|
return exec.Command("echo")
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err := gitCmd.PrepareCommitAmendSubProcess().CombinedOutput()
|
|
|
|
assert.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
2018-08-28 20:55:14 +02:00
|
|
|
func TestGitCommandMergeStatusFiles(t *testing.T) {
|
|
|
|
type scenario struct {
|
|
|
|
oldFiles []File
|
|
|
|
newFiles []File
|
|
|
|
test func([]File)
|
|
|
|
}
|
|
|
|
|
|
|
|
scenarios := []scenario{
|
|
|
|
{
|
|
|
|
[]File{},
|
|
|
|
[]File{
|
|
|
|
{
|
|
|
|
Name: "new_file.txt",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
func(files []File) {
|
|
|
|
expected := []File{
|
|
|
|
{
|
|
|
|
Name: "new_file.txt",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, files, 1)
|
|
|
|
assert.EqualValues(t, expected, files)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
[]File{
|
|
|
|
{
|
|
|
|
Name: "new_file1.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file2.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file3.txt",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[]File{
|
|
|
|
{
|
|
|
|
Name: "new_file4.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file5.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file1.txt",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
func(files []File) {
|
|
|
|
expected := []File{
|
|
|
|
{
|
|
|
|
Name: "new_file1.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file4.txt",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "new_file5.txt",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
assert.Len(t, files, 3)
|
|
|
|
assert.EqualValues(t, expected, files)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, s := range scenarios {
|
|
|
|
gitCmd := newDummyGitCommand()
|
|
|
|
|
|
|
|
s.test(gitCmd.MergeStatusFiles(s.oldFiles, s.newFiles))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-27 22:40:15 +02:00
|
|
|
func TestGitCommandDiff(t *testing.T) {
|
|
|
|
gitCommand := newDummyGitCommand()
|
|
|
|
assert.NoError(t, test.GenerateRepo("lots_of_diffs.sh"))
|
|
|
|
|
2018-08-19 06:48:39 +02:00
|
|
|
files := []File{
|
|
|
|
{
|
|
|
|
Name: "deleted_staged",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: true,
|
|
|
|
Deleted: true,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: " D deleted_staged",
|
|
|
|
},
|
|
|
|
{
|
2018-08-19 12:13:29 +02:00
|
|
|
Name: "file with space staged",
|
2018-08-19 06:48:39 +02:00
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: false,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "A \"file with space staged\"",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "file with space unstaged",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "?? file with space unstaged",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "modified_unstaged",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: false,
|
|
|
|
Tracked: true,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "M modified_unstaged",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "modified_staged",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: true,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: " M modified_staged",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "renamed_before -> renamed_after",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: false,
|
|
|
|
Tracked: true,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "R renamed_before -> renamed_after",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "untracked_unstaged",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "?? untracked_unstaged",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "untracked_staged",
|
|
|
|
HasStagedChanges: true,
|
|
|
|
HasUnstagedChanges: false,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "A untracked_staged",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Name: "master",
|
|
|
|
HasStagedChanges: false,
|
|
|
|
HasUnstagedChanges: true,
|
|
|
|
Tracked: false,
|
|
|
|
Deleted: false,
|
|
|
|
HasMergeConflicts: false,
|
|
|
|
DisplayString: "?? master",
|
|
|
|
},
|
|
|
|
}
|
2018-08-27 22:40:15 +02:00
|
|
|
|
2018-08-19 06:48:39 +02:00
|
|
|
for _, file := range files {
|
2018-08-27 22:40:15 +02:00
|
|
|
assert.NotContains(t, gitCommand.Diff(file), "error")
|
2018-08-19 06:48:39 +02:00
|
|
|
}
|
|
|
|
}
|