sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Prompt to switch to worktree when branch is checked out by other worktree

Browse Source
This commit is contained in:
Jesse Duffield
2023-07-16 14:14:09 +10:00
parent fe8adf9eb8
commit 077ae99438
5 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/gui/controllers/helpers/worktree_helper.go
View File

@ -18,12 +18,14 @@ type IWorktreeHelper interface {
}
type WorktreeHelper struct {
c *HelperCommon
c *HelperCommon
reposHelper *ReposHelper
}
func NewWorktreeHelper(c *HelperCommon) *WorktreeHelper {
func NewWorktreeHelper(c *HelperCommon, reposHelper *ReposHelper) *WorktreeHelper {
return &WorktreeHelper{
c: c,
c: c,
reposHelper: reposHelper,
}
}
@ -75,3 +77,17 @@ func (self *WorktreeHelper) NewWorktree() error {
},
})
}
func (self *WorktreeHelper) Switch(worktree *models.Worktree) error {
if self.c.Git().Worktree.IsCurrentWorktree(worktree) {
return self.c.ErrorMsg(self.c.Tr.AlreadyInWorktree)
}
self.c.LogAction(self.c.Tr.SwitchToWorktree)
// if we were in a submodule, we want to forget about that stack of repos
// so that hitting escape in the new repo does nothing
self.c.State().GetRepoPathStack().Clear()
return self.reposHelper.DispatchSwitchTo(worktree.Path, true, self.c.Tr.ErrWorktreeMovedOrDeleted)
}