Skip to content

Add hotkeys to the worktree-conflict menu shown when deleting a branch #5631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MitchellCash wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add hotkeys to the worktree-conflict menu shown when deleting a branch #5631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/gui/controllers/helpers/branches_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,19 +223,22 @@ func (self *BranchesHelper) promptWorktreeBranchDelete(selectedBranch *models.Br
Items: []*types.MenuItem{
{
Label: self.c.Tr.SwitchToWorktree,
Key: gocui.NewKeyRune('s'),
OnPress: func() error {
return self.worktreeHelper.Switch(worktree, context.LOCAL_BRANCHES_CONTEXT_KEY)
},
},
{
Label: self.c.Tr.DetachWorktree,
Tooltip: self.c.Tr.DetachWorktreeTooltip,
Key: gocui.NewKeyRune('d'),
OnPress: func() error {
return self.worktreeHelper.Detach(worktree)
},
},
{
Label: self.c.Tr.RemoveWorktree,
Key: gocui.NewKeyRune('r'),
OnPress: func() error {
return self.worktreeHelper.Remove(worktree, false)
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/integration/tests/worktree/detach_worktree_from_branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var DetachWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Branch newbranch is checked out by worktree linked-worktree")).
Select(Equals("Detach worktree")).
Select(Contains("Detach worktree")).
Confirm()
}).
Lines(
Expand Down
2 changes: 1 addition & 1 deletion pkg/integration/tests/worktree/remove_worktree_from_branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Branch newbranch is checked out by worktree linked-worktree")).
Select(Equals("Remove worktree")).
Select(Contains("Remove worktree")).
Confirm()

t.ExpectPopup().Confirmation().
Expand Down