mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-21 21:47:32 +02:00
49da7b482d
When we use the one panel for the entire commit message, its tricky to have a keybinding both for adding a newline and submitting. By having two panels: one for the summary line and one for the description, we allow for 'enter' to submit the message when done from the summary panel, and 'enter' to add a newline when done from the description panel. Alt-enter, for those who can use that key combo, also works for submitting the message from the description panel. For those who can't use that key combo, and don't want to remap the keybinding, they can hit tab to go back to the summary panel and then 'enter' to submit the message. We have some awkwardness in that both contexts (i.e. panels) need to appear and disappear in tandem and we don't have a great way of handling that concept, so we just push both contexts one after the other, and likewise remove both contexts when we escape.
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package interactive_rebase
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
// Rewording the first commit is tricky because you can't rebase from its parent commit,
|
|
// hence having a specific test for this
|
|
|
|
var RewordFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Rewords the first commit, just to show that it's possible",
|
|
ExtraCmdArgs: "",
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.
|
|
CreateNCommits(2)
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit 02"),
|
|
Contains("commit 01"),
|
|
).
|
|
NavigateToLine(Contains("commit 01")).
|
|
Press(keys.Commits.RenameCommit).
|
|
Tap(func() {
|
|
t.ExpectPopup().CommitMessagePanel().
|
|
Title(Equals("Reword commit")).
|
|
InitialText(Equals("commit 01")).
|
|
Clear().
|
|
Type("renamed 01").
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("commit 02"),
|
|
Contains("renamed 01"),
|
|
)
|
|
},
|
|
})
|