mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
3928d0ebda
When stopping in a rebase because of a conflict, it is nice to see the commit that git is trying to apply. Create a fake todo entry labelled "conflict" for this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead of for the real current head.
92 lines
2.5 KiB
Go
92 lines
2.5 KiB
Go
package branch
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
|
|
)
|
|
|
|
var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Rebase onto another branch, deal with the conflicts. Also mark a commit to be dropped before continuing.",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shared.MergeConflictsSetup(shell)
|
|
// addin a couple additional commits so that we can drop one
|
|
shell.EmptyCommit("to remove")
|
|
shell.EmptyCommit("to keep")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
TopLines(
|
|
Contains("to keep"),
|
|
Contains("to remove"),
|
|
Contains("first change"),
|
|
Contains("original"),
|
|
)
|
|
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("first-change-branch").IsSelected(),
|
|
Contains("second-change-branch"),
|
|
Contains("original-branch"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Branches.RebaseBranch)
|
|
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
|
Select(Contains("Simple rebase")).
|
|
Confirm()
|
|
|
|
t.Views().Information().Content(Contains("Rebasing"))
|
|
|
|
t.Common().AcknowledgeConflicts()
|
|
|
|
t.Views().Files().IsFocused().
|
|
SelectedLine(MatchesRegexp("UU.*file"))
|
|
|
|
t.Views().Commits().
|
|
Focus().
|
|
TopLines(
|
|
MatchesRegexp(`pick.*to keep`).IsSelected(),
|
|
MatchesRegexp(`pick.*to remove`),
|
|
MatchesRegexp(`conflict.*YOU ARE HERE.*first change`),
|
|
MatchesRegexp("second-change-branch unrelated change"),
|
|
MatchesRegexp("second change"),
|
|
MatchesRegexp("original"),
|
|
).
|
|
SelectNextItem().
|
|
Press(keys.Universal.Remove).
|
|
TopLines(
|
|
MatchesRegexp(`pick.*to keep`),
|
|
MatchesRegexp(`drop.*to remove`).IsSelected(),
|
|
MatchesRegexp(`conflict.*YOU ARE HERE.*first change`),
|
|
MatchesRegexp("second-change-branch unrelated change"),
|
|
MatchesRegexp("second change"),
|
|
MatchesRegexp("original"),
|
|
)
|
|
|
|
t.Views().Files().
|
|
Focus().
|
|
PressEnter()
|
|
|
|
t.Views().MergeConflicts().
|
|
IsFocused().
|
|
PressPrimaryAction()
|
|
|
|
t.Common().ContinueOnConflictsResolved()
|
|
|
|
t.Views().Information().Content(DoesNotContain("Rebasing"))
|
|
|
|
t.Views().Commits().TopLines(
|
|
Contains("to keep"),
|
|
Contains("second-change-branch unrelated change").IsSelected(),
|
|
Contains("second change"),
|
|
Contains("original"),
|
|
)
|
|
},
|
|
})
|