Add option to remove worktree and branch at the same time (resolves #5205)

pkg/gui/controllers/helpers/branches_helper.go

@@ -237,13 +237,56 @@ func (self *BranchesHelper) promptWorktreeBranchDelete(selectedBranch *models.Br
 			{
 				Label: self.c.Tr.RemoveWorktree,
 				OnPress: func() error {
-					return self.worktreeHelper.Remove(worktree, false)
+					return self.removeWorktreeAndBranch(selectedBranch, worktree, false)
 				},
 			},
 		},
 	})
 }
 
+func (self *BranchesHelper) removeWorktreeAndBranch(branch *models.Branch, worktree *models.Worktree, force bool) error {
+	title := self.c.Tr.RemoveWorktreeTitle
+	var templateStr string
+	if force {
+		templateStr = self.c.Tr.ForceRemoveWorktreePrompt
+	} else {
+		templateStr = self.c.Tr.RemoveWorktreePrompt
+	}
+	message := utils.ResolvePlaceholderString(
+		templateStr,
+		map[string]string{
+			"worktreeName": worktree.Name,
+			"branchName":   branch.Name,
+		},
+	)
+
+	self.c.Confirm(types.ConfirmOpts{
+		Title:  title,
+		Prompt: message,
+		HandleConfirm: func() error {
+			return self.c.WithWaitingStatus(self.c.Tr.RemovingWorktree, func(gocui.Task) error {
+				self.c.LogAction(self.c.Tr.RemoveWorktree)
+				if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil {
+					if !force && self.worktreeHelper.removeShouldRetryWithForce(err) {
+						return self.removeWorktreeAndBranch(branch, worktree, true)
+					}
+					return err
+				}
+
+				if err := self.c.Git().Branch.LocalDelete([]string{branch.Name}, true); err != nil {
+					return err
+				}
+
+				self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}})
+				return nil
+			})
+		},
+	})
+
+	self.c.Contexts().Branches.CollapseRangeSelectionToTop()
+	return nil
+}
+
 func (self *BranchesHelper) allBranchesMerged(branches []*models.Branch) (bool, error) {
 	allBranchesMerged := true
 	for _, branch := range branches {

pkg/gui/controllers/helpers/worktree_helper.go

@@ -186,17 +186,12 @@ func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error
 			return self.c.WithWaitingStatus(self.c.Tr.RemovingWorktree, func(gocui.Task) error {
 				self.c.LogAction(self.c.Tr.RemoveWorktree)
 				if err := self.c.Git().Worktree.Delete(worktree.Path, force); err != nil {
-					errMessage := err.Error()
-					if !strings.Contains(errMessage, "--force") &&
-						!strings.Contains(errMessage, "fatal: working trees containing submodules cannot be moved or removed") {
-						return err
-					}
-
-					if !force {
+					if !force && self.removeShouldRetryWithForce(err) {
 						return self.Remove(worktree, true)
 					}
 					return err
 				}
+
 				self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.WORKTREES, types.BRANCHES, types.FILES}})
 				return nil
 			})
@@ -206,6 +201,12 @@ func (self *WorktreeHelper) Remove(worktree *models.Worktree, force bool) error
 	return nil
 }
 
+func (self *WorktreeHelper) removeShouldRetryWithForce(err error) bool {
+	errMessage := err.Error()
+	return strings.Contains(errMessage, "--force") ||
+		strings.Contains(errMessage, "fatal: working trees containing submodules cannot be moved or removed")
+}
+
 func (self *WorktreeHelper) Detach(worktree *models.Worktree) error {
 	return self.c.WithWaitingStatus(self.c.Tr.DetachingWorktree, func(gocui.Task) error {
 		self.c.LogAction(self.c.Tr.RemovingWorktree)

pkg/integration/tests/test_list.go

@@ -491,7 +491,7 @@ var tests = []*components.IntegrationTest{
 	worktree.FastForwardWorktreeBranchShouldNotPolluteCurrentWorktree,
 	worktree.ForceRemoveWorktree,
 	worktree.ForceRemoveWorktreeWithSubmodules,
-	worktree.RemoveWorktreeFromBranch,
+	worktree.RemoveWorktreeAndBranch,
 	worktree.ResetWindowTabs,
 	worktree.SymlinkIntoRepoSubdir,
 	worktree.WorktreeInRepo,

pkg/integration/tests/worktree/remove_worktree_from_branch.go → pkg/integration/tests/worktree/remove_worktree_and_branch.go

@@ -5,7 +5,7 @@ import (
 	. "github.com/jesseduffield/lazygit/pkg/integration/components"
 )
 
-var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
+var RemoveWorktreeAndBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	Description:  "Remove a worktree from the branches view",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
@@ -53,7 +53,9 @@ var RemoveWorktreeFromBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			}).
 			Lines(
 				Contains("mybranch"),
-				Contains("newbranch").DoesNotContain("(worktree)").IsSelected(),
+			).
+			Content(
+				DoesNotContain("newbranch"),
 			)
 
 		t.Views().Worktrees().