sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

more efficient context diff size changing

Browse Source
This commit is contained in:
Jesse Duffield
2021-11-21 12:48:49 +11:00
parent de0e885c65
commit 1996eddd91
25 changed files with 255 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/commits_test.go
View File

@ -120,6 +120,8 @@ func TestGitCommandShowCmdStr(t *testing.T) {
expected string
}
gitCmd := NewDummyGitCommand()
scenarios := []scenario{
{
testName: "Default case without filter path",
@ -131,7 +133,7 @@ func TestGitCommandShowCmdStr(t *testing.T) {
testName: "Default case with filter path",
filterPath: "file.txt",
contextSize: 3,
expected: "git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890 -- \"file.txt\"",
expected: "git show --submodule --color=always --unified=3 --no-renames --stat -p 1234567890 -- " + gitCmd.OSCommand.Quote("file.txt"),
},
{
testName: "Show diff with custom context size",
@ -143,7 +145,6 @@ func TestGitCommandShowCmdStr(t *testing.T) {
for _, s := range scenarios {
t.Run(s.testName, func(t *testing.T) {
gitCmd := NewDummyGitCommand()
gitCmd.Config.GetUserConfig().Git.DiffContextSize = s.contextSize
cmdStr := gitCmd.ShowCmdStr("1234567890", s.filterPath)
assert.Equal(t, s.expected, cmdStr)

16
pkg/commands/files_test.go
View File

@ -444,13 +444,13 @@ func TestGitCommandDiff(t *testing.T) {
// TestGitCommandShowFileDiff is a function.
func TestGitCommandShowFileDiff(t *testing.T) {
type scenario struct {
testName string
command func(string, ...string) *exec.Cmd
from string
to string
reverse bool
plain bool
contextSize int
testName string
command func(string, ...string) *exec.Cmd
from string
to string
reverse bool
plain bool
contextSize int
}
scenarios := []scenario{
@ -489,7 +489,7 @@ func TestGitCommandShowFileDiff(t *testing.T) {
gitCmd := NewDummyGitCommand()
gitCmd.OSCommand.Command = s.command
gitCmd.Config.GetUserConfig().Git.DiffContextSize = s.contextSize
gitCmd.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain)
_, _ = gitCmd.ShowFileDiff(s.from, s.to, s.reverse, "test.txt", s.plain)
})
}
}