mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
6ad56d5852
When a branch is checked out by another worktree, show the worktree name in the label, e.g. "(worktree cosmos2)" instead of just "(worktree)", so you can immediately see which worktree holds it.
89 lines
2.8 KiB
Go
89 lines
2.8 KiB
Go
package worktree
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
// This is important because `git worktree list` will show a worktree being in a detached head state (which is true)
|
|
// when it's in the middle of a bisect, but it won't tell you about the branch it's on.
|
|
// Even so, if you attempt to check out that branch from another worktree git won't let you, so we need to
|
|
// keep track of the association ourselves.
|
|
|
|
// not bothering to test the linked worktree here because it's the same logic as the rebase test
|
|
|
|
var AssociateBranchBisect = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Verify that when you start a bisect in a linked worktree, Lazygit still associates the worktree with the branch",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
shell.NewBranch("mybranch")
|
|
shell.CreateFileAndAdd("README.md", "hello world")
|
|
shell.Commit("initial commit")
|
|
shell.EmptyCommit("commit 2")
|
|
shell.EmptyCommit("commit 3")
|
|
shell.AddWorktree("mybranch", "../linked-worktree", "newbranch")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Focus().
|
|
Lines(
|
|
Contains("mybranch").IsSelected(),
|
|
Contains("newbranch (worktree linked-worktree)"),
|
|
)
|
|
|
|
// start a bisect on the main worktree
|
|
t.Views().Commits().
|
|
Focus().
|
|
SelectedLine(Contains("commit 3")).
|
|
Press(keys.Commits.ViewBisectOptions).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Bisect")).
|
|
Select(MatchesRegexp(`Mark .* as bad`)).
|
|
Confirm()
|
|
|
|
t.Views().Information().Content(Contains("Bisecting"))
|
|
}).
|
|
NavigateToLine(Contains("initial commit")).
|
|
Press(keys.Commits.ViewBisectOptions).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Bisect")).
|
|
Select(MatchesRegexp(`Mark .* as good`)).
|
|
Confirm()
|
|
})
|
|
|
|
t.Views().Branches().
|
|
Focus().
|
|
// switch to linked worktree
|
|
NavigateToLine(Contains("newbranch")).
|
|
Press(keys.Universal.Select).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Switch to worktree")).
|
|
Content(Equals("This branch is checked out by worktree linked-worktree. Do you want to switch to that worktree?")).
|
|
Confirm()
|
|
|
|
t.Views().Information().Content(DoesNotContain("Bisecting"))
|
|
}).
|
|
Lines(
|
|
Contains("newbranch").IsSelected(),
|
|
Contains("mybranch (worktree repo)"),
|
|
)
|
|
|
|
// switch back to main worktree
|
|
t.Views().Branches().
|
|
Focus().
|
|
NavigateToLine(Contains("mybranch")).
|
|
Press(keys.Universal.Select).
|
|
Tap(func() {
|
|
t.ExpectPopup().Confirmation().
|
|
Title(Equals("Switch to worktree")).
|
|
Content(Equals("This branch is checked out by worktree repo. Do you want to switch to that worktree?")).
|
|
Confirm()
|
|
})
|
|
},
|
|
})
|