go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-15 11:56:37 +02:00
Code Issues Releases Activity

Show base ref suggestions when creating worktree

Browse Source
This commit is contained in:
Jesse Duffield 2023-07-16 20:38:22 +10:00
parent 71422a8549
commit 2e68967e02
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/controllers.go
View File

@ -21,10 +21,10 @@ func (gui *Gui) resetHelpersAndControllers() {
recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon) recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon)
reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onNewRepo) reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onNewRepo)
refsHelper := helpers.NewRefsHelper(helperCommon) refsHelper := helpers.NewRefsHelper(helperCommon)
worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper) suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon)
worktreeHelper := helpers.NewWorktreeHelper(helperCommon, reposHelper, refsHelper, suggestionsHelper)
rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, refsHelper) rebaseHelper := helpers.NewMergeAndRebaseHelper(helperCommon, refsHelper)
suggestionsHelper := helpers.NewSuggestionsHelper(helperCommon)
setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage }) setCommitSummary := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage })
setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription }) setCommitDescription := gui.getCommitMessageSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitDescription })

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

@ -22,16 +22,18 @@ type IWorktreeHelper interface {
} }
type WorktreeHelper struct { type WorktreeHelper struct {
c *HelperCommon c *HelperCommon
reposHelper *ReposHelper reposHelper *ReposHelper
refsHelper *RefsHelper refsHelper *RefsHelper
suggestionsHelper *SuggestionsHelper
} }
func NewWorktreeHelper(c *HelperCommon, reposHelper *ReposHelper, refsHelper *RefsHelper) *WorktreeHelper { func NewWorktreeHelper(c *HelperCommon, reposHelper *ReposHelper, refsHelper *RefsHelper, suggestionsHelper *SuggestionsHelper) *WorktreeHelper {
return &WorktreeHelper{ return &WorktreeHelper{
c: c, c: c,
reposHelper: reposHelper, reposHelper: reposHelper,
refsHelper: refsHelper, refsHelper: refsHelper,
suggestionsHelper: suggestionsHelper,
} }
} }
@ -65,15 +67,14 @@ func (self *WorktreeHelper) IsWorktreePathMissing(w *models.Worktree) bool {
} }
func (self *WorktreeHelper) NewWorktree() error { func (self *WorktreeHelper) NewWorktree() error {
// what is the current branch?
branch := self.refsHelper.GetCheckedOutRef() branch := self.refsHelper.GetCheckedOutRef()
currentBranchName := branch.RefName() currentBranchName := branch.RefName()
f := func(detached bool) error { f := func(detached bool) error {
return self.c.Prompt(types.PromptOpts{ return self.c.Prompt(types.PromptOpts{
Title: self.c.Tr.NewWorktreeBranch, Title: self.c.Tr.NewWorktreeBranch,
InitialContent: currentBranchName, InitialContent: currentBranchName,
// TODO: suggestions FindSuggestionsFunc: self.suggestionsHelper.GetRefsSuggestionsFunc(),
HandleConfirm: func(base string) error { HandleConfirm: func(base string) error {
canCheckoutBase := base != currentBranchName canCheckoutBase := base != currentBranchName
return self.NewWorktreeCheckout(base, canCheckoutBase, detached) return self.NewWorktreeCheckout(base, canCheckoutBase, detached)
@ -129,7 +130,6 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
// prompt for the new branch name where a blank means we just check out the branch // prompt for the new branch name where a blank means we just check out the branch
return self.c.Prompt(types.PromptOpts{ return self.c.Prompt(types.PromptOpts{
Title: fmt.Sprintf("New branch name (leave blank to checkout %s)", base), Title: fmt.Sprintf("New branch name (leave blank to checkout %s)", base),
// TODO: suggestions
HandleConfirm: func(branchName string) error { HandleConfirm: func(branchName string) error {
opts.Branch = branchName opts.Branch = branchName
@ -140,7 +140,6 @@ func (self *WorktreeHelper) NewWorktreeCheckout(base string, canCheckoutBase boo
// prompt for the new branch name where a blank means we just check out the branch // prompt for the new branch name where a blank means we just check out the branch
return self.c.Prompt(types.PromptOpts{ return self.c.Prompt(types.PromptOpts{
Title: "New branch name", Title: "New branch name",
// TODO: suggestions
HandleConfirm: func(branchName string) error { HandleConfirm: func(branchName string) error {
if branchName == "" { if branchName == "" {
return self.c.ErrorMsg("Branch name cannot be blank") return self.c.ErrorMsg("Branch name cannot be blank")