mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +02:00
fdff2dec79
In go 1.22, loop variables are redeclared with each iteration of the loop, rather than simple updated on each iteration. This means that we no longer need to manually redeclare variables when they're closed over by a function.
611 lines
24 KiB
Go
611 lines
24 KiB
Go
package presentation
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/gookit/color"
|
|
"github.com/jesseduffield/generics/set"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/stefanhaller/git-todo-parser/todo"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/xo/terminfo"
|
|
)
|
|
|
|
func formatExpected(expected string) string {
|
|
return strings.TrimSpace(strings.ReplaceAll(expected, "\t", ""))
|
|
}
|
|
|
|
func TestGetCommitListDisplayStrings(t *testing.T) {
|
|
scenarios := []struct {
|
|
testName string
|
|
commits []*models.Commit
|
|
branches []*models.Branch
|
|
currentBranchName string
|
|
hasUpdateRefConfig bool
|
|
fullDescription bool
|
|
cherryPickedCommitHashSet *set.Set[string]
|
|
markedBaseCommit string
|
|
diffName string
|
|
timeFormat string
|
|
shortTimeFormat string
|
|
now time.Time
|
|
parseEmoji bool
|
|
selectedCommitHash string
|
|
startIdx int
|
|
endIdx int
|
|
showGraph bool
|
|
bisectInfo *git_commands.BisectInfo
|
|
showYouAreHereLabel bool
|
|
expected string
|
|
focus bool
|
|
}{
|
|
{
|
|
testName: "no commits",
|
|
commits: []*models.Commit{},
|
|
startIdx: 0,
|
|
endIdx: 1,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: "",
|
|
},
|
|
{
|
|
testName: "some commits",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1"},
|
|
{Name: "commit2", Hash: "hash2"},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 commit1
|
|
hash2 commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "commit with tags",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Tags: []string{"tag1", "tag2"}},
|
|
{Name: "commit2", Hash: "hash2"},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 tag1 tag2 commit1
|
|
hash2 commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "show local branch head, except the current branch, main branches, or merged branches",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1"},
|
|
{Name: "commit2", Hash: "hash2"},
|
|
{Name: "commit3", Hash: "hash3"},
|
|
{Name: "commit4", Hash: "hash4", Status: models.StatusMerged},
|
|
},
|
|
branches: []*models.Branch{
|
|
{Name: "current-branch", CommitHash: "hash1", Head: true},
|
|
{Name: "other-branch", CommitHash: "hash2", Head: false},
|
|
{Name: "master", CommitHash: "hash3", Head: false},
|
|
{Name: "old-branch", CommitHash: "hash4", Head: false},
|
|
},
|
|
currentBranchName: "current-branch",
|
|
hasUpdateRefConfig: true,
|
|
startIdx: 0,
|
|
endIdx: 4,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 commit1
|
|
hash2 * commit2
|
|
hash3 commit3
|
|
hash4 commit4
|
|
`),
|
|
},
|
|
{
|
|
testName: "show local branch head for head commit if updateRefs is on",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1"},
|
|
{Name: "commit2", Hash: "hash2"},
|
|
},
|
|
branches: []*models.Branch{
|
|
{Name: "current-branch", CommitHash: "hash1", Head: true},
|
|
{Name: "other-branch", CommitHash: "hash1", Head: false},
|
|
},
|
|
currentBranchName: "current-branch",
|
|
hasUpdateRefConfig: true,
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 * commit1
|
|
hash2 commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "don't show local branch head for head commit if updateRefs is off",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1"},
|
|
{Name: "commit2", Hash: "hash2"},
|
|
},
|
|
branches: []*models.Branch{
|
|
{Name: "current-branch", CommitHash: "hash1", Head: true},
|
|
{Name: "other-branch", CommitHash: "hash1", Head: false},
|
|
},
|
|
currentBranchName: "current-branch",
|
|
hasUpdateRefConfig: false,
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 commit1
|
|
hash2 commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "show local branch head and tag if both exist",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1"},
|
|
{Name: "commit2", Hash: "hash2", Tags: []string{"some-tag"}},
|
|
{Name: "commit3", Hash: "hash3"},
|
|
},
|
|
branches: []*models.Branch{
|
|
{Name: "some-branch", CommitHash: "hash2"},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 3,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 commit1
|
|
hash2 * some-tag commit2
|
|
hash3 commit3
|
|
`),
|
|
},
|
|
{
|
|
testName: "showing graph",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 ⏣─╮ commit1
|
|
hash2 ◯ │ commit2
|
|
hash3 ◯─╯ commit3
|
|
hash4 ◯ commit4
|
|
hash5 ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "showing graph, including rebase commits",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}, Action: todo.Pick},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 pick commit1
|
|
hash2 pick commit2
|
|
hash3 ◯ <-- YOU ARE HERE --- commit3
|
|
hash4 ◯ commit4
|
|
hash5 ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "showing graph, including rebase commits, with offset",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}, Action: todo.Pick},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 1,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash2 pick commit2
|
|
hash3 ◯ <-- YOU ARE HERE --- commit3
|
|
hash4 ◯ commit4
|
|
hash5 ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "startIdx is past TODO commits",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}, Action: todo.Pick},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 3,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash4 ◯ commit4
|
|
hash5 ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "only showing TODO commits",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}, Action: todo.Pick},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 pick commit1
|
|
hash2 pick commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "no TODO commits, towards bottom",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 4,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash5 ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "only TODO commits except last",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2", "hash3"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}, Action: todo.Pick},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}, Action: todo.Pick},
|
|
{Name: "commit4", Hash: "hash4", Parents: []string{"hash5"}, Action: todo.Pick},
|
|
{Name: "commit5", Hash: "hash5", Parents: []string{"hash7"}},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: true,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 pick commit1
|
|
hash2 pick commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "don't show YOU ARE HERE label when not asked for (e.g. in branches panel)",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2"}, Action: todo.Pick},
|
|
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}},
|
|
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 3,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 pick commit1
|
|
hash2 ◯ commit2
|
|
hash3 ◯ commit3
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - all commits visible",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 8,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↓ hash1r ◯ commit1
|
|
↓ hash2r ⏣─╮ commit2
|
|
↓ hash3r ◯ │ commit3
|
|
↑ hash1l ◯ commit1
|
|
↑ hash2l ⏣─╮ commit2
|
|
↑ hash3l ◯ │ commit3
|
|
↑ hash4l ◯─╯ commit4
|
|
↑ hash5l ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - not all remote commits visible",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 2,
|
|
endIdx: 8,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↓ hash3r ◯ │ commit3
|
|
↑ hash1l ◯ commit1
|
|
↑ hash2l ⏣─╮ commit2
|
|
↑ hash3l ◯ │ commit3
|
|
↑ hash4l ◯─╯ commit4
|
|
↑ hash5l ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - not all local commits",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↓ hash1r ◯ commit1
|
|
↓ hash2r ⏣─╮ commit2
|
|
↓ hash3r ◯ │ commit3
|
|
↑ hash1l ◯ commit1
|
|
↑ hash2l ⏣─╮ commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - no remote commits visible",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 4,
|
|
endIdx: 8,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↑ hash2l ⏣─╮ commit2
|
|
↑ hash3l ◯ │ commit3
|
|
↑ hash4l ◯─╯ commit4
|
|
↑ hash5l ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - no local commits visible",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↓ hash1r ◯ commit1
|
|
↓ hash2r ⏣─╮ commit2
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - no remote commits present",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1l", Parents: []string{"hash2l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit2", Hash: "hash2l", Parents: []string{"hash3l", "hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit3", Hash: "hash3l", Parents: []string{"hash4l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit4", Hash: "hash4l", Parents: []string{"hash5l"}, Divergence: models.DivergenceLeft},
|
|
{Name: "commit5", Hash: "hash5l", Parents: []string{"hash6l"}, Divergence: models.DivergenceLeft},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 5,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↑ hash1l ◯ commit1
|
|
↑ hash2l ⏣─╮ commit2
|
|
↑ hash3l ◯ │ commit3
|
|
↑ hash4l ◯─╯ commit4
|
|
↑ hash5l ◯ commit5
|
|
`),
|
|
},
|
|
{
|
|
testName: "graph in divergence view - no local commits present",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1r", Parents: []string{"hash2r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit2", Hash: "hash2r", Parents: []string{"hash3r", "hash5r"}, Divergence: models.DivergenceRight},
|
|
{Name: "commit3", Hash: "hash3r", Parents: []string{"hash4r"}, Divergence: models.DivergenceRight},
|
|
},
|
|
startIdx: 0,
|
|
endIdx: 3,
|
|
showGraph: true,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
showYouAreHereLabel: false,
|
|
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
↓ hash1r ◯ commit1
|
|
↓ hash2r ⏣─╮ commit2
|
|
↓ hash3r ◯ │ commit3
|
|
`),
|
|
},
|
|
{
|
|
testName: "custom time format",
|
|
commits: []*models.Commit{
|
|
{Name: "commit1", Hash: "hash1", UnixTimestamp: 1577844184, AuthorName: "Jesse Duffield"},
|
|
{Name: "commit2", Hash: "hash2", UnixTimestamp: 1576844184, AuthorName: "Jesse Duffield"},
|
|
},
|
|
fullDescription: true,
|
|
timeFormat: "2006-01-02",
|
|
shortTimeFormat: "3:04PM",
|
|
startIdx: 0,
|
|
endIdx: 2,
|
|
showGraph: false,
|
|
bisectInfo: git_commands.NewNullBisectInfo(),
|
|
cherryPickedCommitHashSet: set.New[string](),
|
|
now: time.Date(2020, 1, 1, 5, 3, 4, 0, time.UTC),
|
|
expected: formatExpected(`
|
|
hash1 2:03AM Jesse Duffield commit1
|
|
hash2 2019-12-20 Jesse Duffield commit2
|
|
`),
|
|
},
|
|
}
|
|
|
|
oldColorLevel := color.ForceSetColorLevel(terminfo.ColorLevelNone)
|
|
defer color.ForceSetColorLevel(oldColorLevel)
|
|
|
|
os.Setenv("TZ", "UTC")
|
|
|
|
focusing := false
|
|
for _, scenario := range scenarios {
|
|
if scenario.focus {
|
|
focusing = true
|
|
}
|
|
}
|
|
|
|
common := utils.NewDummyCommon()
|
|
|
|
for _, s := range scenarios {
|
|
if !focusing || s.focus {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
result := GetCommitListDisplayStrings(
|
|
common,
|
|
s.commits,
|
|
s.branches,
|
|
s.currentBranchName,
|
|
s.hasUpdateRefConfig,
|
|
s.fullDescription,
|
|
s.cherryPickedCommitHashSet,
|
|
s.diffName,
|
|
s.markedBaseCommit,
|
|
s.timeFormat,
|
|
s.shortTimeFormat,
|
|
s.now,
|
|
s.parseEmoji,
|
|
s.selectedCommitHash,
|
|
s.startIdx,
|
|
s.endIdx,
|
|
s.showGraph,
|
|
s.bisectInfo,
|
|
s.showYouAreHereLabel,
|
|
)
|
|
|
|
renderedLines, _ := utils.RenderDisplayStrings(result, nil)
|
|
renderedResult := strings.Join(renderedLines, "\n")
|
|
t.Logf("\n%s", renderedResult)
|
|
|
|
assert.EqualValues(t, s.expected, renderedResult)
|
|
})
|
|
}
|
|
}
|
|
}
|