mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
40232440b7
It starts a rebase on the bottom-most commit of the range, and sets all the selected commits to "edit" (skipping merge commits, because they can't be edited).
185 lines
6.4 KiB
Go
185 lines
6.4 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Do various things with range selection in the commits view when mid-rebase",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(10)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
TopLines(
|
|
Contains("commit 10").IsSelected(),
|
|
).
|
|
NavigateToLine(Contains("commit 05")).
|
|
// Start a rebase
|
|
Press(keys.Universal.Edit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("pick").Contains("commit 07"),
|
|
Contains("pick").Contains("commit 06"),
|
|
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
|
|
Contains("commit 04"),
|
|
).
|
|
SelectPreviousItem().
|
|
// perform various actions on a range of commits
|
|
Press(keys.Universal.RangeSelectUp).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("pick").Contains("commit 07").IsSelected(),
|
|
Contains("pick").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MarkCommitAsFixup).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("fixup").Contains("commit 07").IsSelected(),
|
|
Contains("fixup").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.PickCommit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("pick").Contains("commit 07").IsSelected(),
|
|
Contains("pick").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Universal.Edit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("edit").Contains("commit 07").IsSelected(),
|
|
Contains("edit").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.SquashDown).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MoveDownCommit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: Cannot move any further"))
|
|
}).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
TopLines(
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MoveUpCommit).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: Cannot move any further"))
|
|
}).
|
|
TopLines(
|
|
Contains("squash").Contains("commit 07").IsSelected(),
|
|
Contains("squash").Contains("commit 06").IsSelected(),
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08"),
|
|
Contains("<-- YOU ARE HERE --- commit 05"),
|
|
Contains("commit 04"),
|
|
).
|
|
// Verify we can't perform an action on a range that includes both
|
|
// TODO and non-TODO commits
|
|
NavigateToLine(Contains("commit 08")).
|
|
Press(keys.Universal.RangeSelectDown).
|
|
TopLines(
|
|
Contains("squash").Contains("commit 07"),
|
|
Contains("squash").Contains("commit 06"),
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
|
|
Contains("commit 04"),
|
|
).
|
|
Press(keys.Commits.MarkCommitAsFixup).
|
|
Tap(func() {
|
|
t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits."))
|
|
}).
|
|
TopLines(
|
|
Contains("squash").Contains("commit 07"),
|
|
Contains("squash").Contains("commit 06"),
|
|
Contains("pick").Contains("commit 10"),
|
|
Contains("pick").Contains("commit 09"),
|
|
Contains("pick").Contains("commit 08").IsSelected(),
|
|
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
|
|
Contains("commit 04"),
|
|
).
|
|
// continue the rebase
|
|
Tap(func() {
|
|
t.Common().ContinueRebase()
|
|
}).
|
|
TopLines(
|
|
Contains("commit 10"),
|
|
Contains("commit 09"),
|
|
Contains("commit 08"),
|
|
Contains("commit 05"),
|
|
// selected indexes are retained, though we may want to clear it
|
|
// in future (not sure what the best behaviour is right now)
|
|
Contains("commit 04").IsSelected(),
|
|
Contains("commit 03").IsSelected(),
|
|
)
|
|
},
|
|
})
|