mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-05 00:59:19 +02:00
Show todos (and conflicting commit) for cherry-pick and revert
This commit is contained in:
@ -0,0 +1,87 @@
|
||||
package commit
|
||||
|
||||
import (
|
||||
"github.com/jesseduffield/lazygit/pkg/config"
|
||||
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
||||
)
|
||||
|
||||
var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Description: "Reverts a range of commits, the first of which conflicts",
|
||||
ExtraCmdArgs: []string{},
|
||||
Skip: false,
|
||||
SetupConfig: func(cfg *config.AppConfig) {
|
||||
// TODO: use our revert UI once we support range-select for reverts
|
||||
cfg.GetUserConfig().CustomCommands = []config.CustomCommand{
|
||||
{
|
||||
Key: "X",
|
||||
Context: "commits",
|
||||
Command: "git -c core.editor=: revert HEAD^ HEAD^^",
|
||||
},
|
||||
}
|
||||
},
|
||||
SetupRepo: func(shell *Shell) {
|
||||
shell.CreateFileAndAdd("myfile", "")
|
||||
shell.Commit("add empty file")
|
||||
shell.CreateFileAndAdd("otherfile", "")
|
||||
shell.Commit("unrelated change")
|
||||
shell.CreateFileAndAdd("myfile", "first line\n")
|
||||
shell.Commit("add first line")
|
||||
shell.UpdateFileAndAdd("myfile", "first line\nsecond line\n")
|
||||
shell.Commit("add second line")
|
||||
},
|
||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||
t.Views().Commits().
|
||||
Focus().
|
||||
Lines(
|
||||
Contains("CI ◯ add second line").IsSelected(),
|
||||
Contains("CI ◯ add first line"),
|
||||
Contains("CI ◯ unrelated change"),
|
||||
Contains("CI ◯ add empty file"),
|
||||
).
|
||||
Press("X").
|
||||
Tap(func() {
|
||||
t.ExpectPopup().Alert().
|
||||
Title(Equals("Error")).
|
||||
// The exact error message is different on different git versions,
|
||||
// but they all contain the word 'conflict' somewhere.
|
||||
Content(Contains("conflict")).
|
||||
Confirm()
|
||||
}).
|
||||
Lines(
|
||||
Contains("revert").Contains("CI unrelated change"),
|
||||
Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
|
||||
Contains("CI ◯ add second line"),
|
||||
Contains("CI ◯ add first line"),
|
||||
Contains("CI ◯ unrelated change"),
|
||||
Contains("CI ◯ add empty file"),
|
||||
)
|
||||
|
||||
t.Views().Options().Content(Contains("View revert options: m"))
|
||||
t.Views().Information().Content(Contains("Reverting (Reset)"))
|
||||
|
||||
t.Views().Files().Focus().
|
||||
Lines(
|
||||
Contains("UU myfile").IsSelected(),
|
||||
).
|
||||
PressEnter()
|
||||
|
||||
t.Views().MergeConflicts().IsFocused().
|
||||
SelectNextItem().
|
||||
PressPrimaryAction()
|
||||
|
||||
t.ExpectPopup().Alert().
|
||||
Title(Equals("Continue")).
|
||||
Content(Contains("All merge conflicts resolved. Continue the revert?")).
|
||||
Confirm()
|
||||
|
||||
t.Views().Commits().
|
||||
Lines(
|
||||
Contains(`CI ◯ Revert "unrelated change"`),
|
||||
Contains(`CI ◯ Revert "add first line"`),
|
||||
Contains("CI ◯ add second line"),
|
||||
Contains("CI ◯ add first line"),
|
||||
Contains("CI ◯ unrelated change"),
|
||||
Contains("CI ◯ add empty file"),
|
||||
)
|
||||
},
|
||||
})
|
Reference in New Issue
Block a user