mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-04-07 19:17:06 +02: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.
57 lines
1.4 KiB
Go
57 lines
1.4 KiB
Go
package worktree
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var AddFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Add a worktree via the commits view",
|
|
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 two")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit two").IsSelected(),
|
|
Contains("initial commit"),
|
|
).
|
|
NavigateToLine(Contains("initial commit")).
|
|
Press(keys.Worktrees.ViewWorktreeOptions).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Worktree")).
|
|
Select(MatchesRegexp(`Create worktree from .*`).DoesNotContain("detached")).
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Prompt().
|
|
Title(Equals("New worktree path")).
|
|
Type("../linked-worktree").
|
|
Confirm()
|
|
|
|
t.ExpectPopup().Prompt().
|
|
Title(Equals("New branch name")).
|
|
Type("newbranch").
|
|
Confirm()
|
|
}).
|
|
Lines(
|
|
Contains("initial commit"),
|
|
)
|
|
|
|
// Confirm we're now in the branches view
|
|
t.Views().Branches().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("newbranch").IsSelected(),
|
|
Contains("mybranch (worktree repo)"),
|
|
)
|
|
},
|
|
})
|