mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-19 22:33:16 +02:00
ff465e2581
It is useful to see if the conflicted commit was a "pick" or an "edit". What's more, we're about to add support for showing cherry-picks and reverts, and seeing that a conflicted commit was a revert is important because its diff is backwards compared to the diff of the conflicting files in the Files panel.
45 lines
1.4 KiB
Go
45 lines
1.4 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Swap two commits, causing a conflict; then try to interact with the 'confl' commit, which results in an error.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.CreateFileAndAdd("myfile", "one")
|
|
shell.Commit("commit one")
|
|
shell.UpdateFileAndAdd("myfile", "two")
|
|
shell.Commit("commit two")
|
|
shell.UpdateFileAndAdd("myfile", "three")
|
|
shell.Commit("commit three")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit three").IsSelected(),
|
|
Contains("commit two"),
|
|
Contains("commit one"),
|
|
).
|
|
Press(keys.Commits.MoveDownCommit).
|
|
Tap(func() {
|
|
t.Common().AcknowledgeConflicts()
|
|
}).
|
|
Focus().
|
|
Lines(
|
|
Contains("pick").Contains("commit two"),
|
|
Contains("pick").Contains("<-- CONFLICT --- commit three"),
|
|
Contains("commit one"),
|
|
).
|
|
NavigateToLine(Contains("<-- CONFLICT --- commit three")).
|
|
Press(keys.Commits.RenameCommit)
|
|
|
|
t.ExpectToast(Contains("Disabled: Rewording commits while interactively rebasing is not currently supported"))
|
|
},
|
|
})
|