mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
050225ffe6
When a conflicted submodule is selected, the main view shows the commits each side added relative to their common ancestor as two indented logs, labelled current and incoming, so it's clear which commit each side would resolve to. The logs aren't truncated (the view scrolls). If a side added no commits of its own (e.g. it was rewound to an ancestor of the other), its head commit is shown instead. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
93 lines
3 KiB
Go
93 lines
3 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/go-errors/errors"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSubmoduleGetConflictCommits(t *testing.T) {
|
|
type scenario struct {
|
|
testName string
|
|
output string
|
|
expectedBase string
|
|
expectedOurs string
|
|
expectedTheirs string
|
|
}
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
testName: "all three stages present (both modified)",
|
|
output: "160000 aaaaaaa 1\tmysub\x00160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00",
|
|
expectedBase: "aaaaaaa",
|
|
expectedOurs: "bbbbbbb",
|
|
expectedTheirs: "ccccccc",
|
|
},
|
|
{
|
|
testName: "only our and their stages (added on both sides)",
|
|
output: "160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00",
|
|
expectedBase: "",
|
|
expectedOurs: "bbbbbbb",
|
|
expectedTheirs: "ccccccc",
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, s.output, nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
base, ours, theirs, err := instance.GetConflictCommits("mysub")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, s.expectedBase, base)
|
|
assert.Equal(t, s.expectedOurs, ours)
|
|
assert.Equal(t, s.expectedTheirs, theirs)
|
|
runner.CheckForMissingCalls()
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSubmoduleGetConflictCommitsError(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, "", errors.New("error"))
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
_, _, _, err := instance.GetConflictCommits("mysub")
|
|
assert.Error(t, err)
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleGetCommitSummary(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-c", "log.showsignature=false", "-C", "mysub", "log", "--format=%h %s", "--max-count=1", "bbbbbbb"}, "bbbbbbb the subject\n", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
summary, err := instance.GetCommitSummary("mysub", "bbbbbbb")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "bbbbbbb the subject", summary)
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleCheckoutConflictCommit(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-C", "mysub", "checkout", "bbbbbbb"}, "", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
assert.NoError(t, instance.CheckoutConflictCommit("mysub", "bbbbbbb"))
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleConflictSideLog(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-C", "mysub", "log", "--oneline", "--color=always", "ccccccc..bbbbbbb"}, "bbbbbbb left\n", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
output, err := instance.ConflictSideLog("mysub", "bbbbbbb", "ccccccc")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "bbbbbbb left\n", output)
|
|
runner.CheckForMissingCalls()
|
|
}
|