sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

Style missing worktree as red and display better error when trying to switch to them

Browse Source 
Use a broken link icon for missing worktrees
This commit is contained in:
Joel Baranick
2022-09-02 09:35:08 -07:00
committed by Jesse Duffield
parent 9a79154d05
commit c679fd1924
10 changed files with 103 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/gui/controllers/worktrees_controller.go
View File

@ -2,7 +2,6 @@ package controllers
import (
"fmt"
"os"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/context"
@ -56,7 +55,11 @@ func (self *WorktreesController) GetOnRenderToMain() func() error {
if worktree == nil {
task = types.NewRenderStringTask("No worktrees")
} else {
task = types.NewRenderStringTask(fmt.Sprintf("%s\nPath: %s", style.FgGreen.Sprint(worktree.Name), worktree.Path))
missing := ""
if worktree.Missing() {
missing = style.FgRed.Sprint(" (missing)")
}
task = types.NewRenderStringTask(fmt.Sprintf("%s\nPath: %s%s", style.FgGreen.Sprint(worktree.Name()), worktree.Path, missing))
}
return self.c.RenderToMainViews(types.RefreshMainOpts{
@ -86,11 +89,11 @@ func (self *WorktreesController) GetOnRenderToMain() func() error {
//}
func (self *WorktreesController) delete(worktree *models.Worktree) error {
if worktree.Main {
if worktree.Main() {
return self.c.ErrorMsg(self.c.Tr.CantDeleteMainWorktree)
}
if worktree.Current {
if worktree.Current() {
return self.c.ErrorMsg(self.c.Tr.CantDeleteCurrentWorktree)
}
@ -108,7 +111,7 @@ func (self *WorktreesController) deleteWithForce(worktree *models.Worktree, forc
message := utils.ResolvePlaceholderString(
templateStr,
map[string]string{
"worktreeName": worktree.Name,
"worktreeName": worktree.Name(),
},
)
@ -170,14 +173,11 @@ func (self *WorktreesController) GetOnClick() func() error {
}
func (self *WorktreesController) enter(worktree *models.Worktree) error {
wd, err := os.Getwd()
if err != nil {
return err
}
// 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()
self.c.State().GetRepoPathStack().Push(wd)
return self.c.Helpers().Repos.DispatchSwitchToRepo(worktree.Path, true)
return self.c.Helpers().Repos.DispatchSwitchTo(worktree.Path, true, self.c.Tr.ErrWorktreeMovedOrDeleted)
}
func (self *WorktreesController) checkSelected(callback func(worktree *models.Worktree) error) func() error {