go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

rename

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-15 16:38:16 +10:00
parent d9fa02c53b
commit 0822a9296c
22 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/gui/branches_panel.go
View File

@ -141,7 +141,7 @@ func (gui *Gui) handleForceCheckout(g *gocui.Gui, v *gocui.View) error {
message := gui.Tr.SLocalize("SureForceCheckout")
title := gui.Tr.SLocalize("ForceCheckoutBranch")
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: title,
@ -186,7 +186,7 @@ func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions)
if strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch") {
// offer to autostash changes
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getBranchesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("AutoStashTitle"),
@ -222,11 +222,11 @@ func (gui *Gui) handleCheckoutRef(ref string, options handleCheckoutRefOptions)
}
func (gui *Gui) handleCheckoutByName(g *gocui.Gui, v *gocui.View) error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("BranchName")+":", "", func(response string) error {
return gui.prompt(v, gui.Tr.SLocalize("BranchName")+":", "", func(response string) error {
return gui.handleCheckoutRef(response, handleCheckoutRefOptions{
onRefNotFound: func(ref string) error {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("BranchNotFoundTitle"),
@ -259,7 +259,7 @@ func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error {
"branchName": branch.Name,
},
)
return gui.createPromptPanel(v, message, "", func(response string) error {
return gui.prompt(v, message, "", func(response string) error {
return gui.createNewBranchWithName(response)
})
}
@ -308,7 +308,7 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
},
)
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: title,
@ -346,7 +346,7 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
},
)
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getBranchesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("MergingTitle"),
@ -389,7 +389,7 @@ func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
},
)
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getBranchesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("RebasingTitle"),
@ -537,7 +537,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
// way to get it to show up in the reflog)
promptForNewName := func() error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("NewBranchNamePrompt")+" "+branch.Name+":", "", func(newBranchName string) error {
return gui.prompt(v, gui.Tr.SLocalize("NewBranchNamePrompt")+" "+branch.Name+":", "", func(newBranchName string) error {
if err := gui.GitCommand.RenameBranch(branch.Name, newBranchName); err != nil {
return gui.surfaceError(err)
}
@ -559,7 +559,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error {
return promptForNewName()
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("renameBranch"),

6
pkg/gui/commit_files_panel.go
View File

@ -77,7 +77,7 @@ func (gui *Gui) handleDiscardOldFileChange(g *gocui.Gui, v *gocui.View) error {
fileName := gui.State.CommitFiles[gui.State.Panels.CommitFiles.SelectedLine].Name
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("DiscardFileChangesTitle"),
@ -167,7 +167,7 @@ func (gui *Gui) handleToggleFileForPatch(g *gocui.Gui, v *gocui.View) error {
}
if gui.GitCommand.PatchManager.CommitSelected() && gui.GitCommand.PatchManager.CommitSha != commitFile.Sha {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("DiscardPatch"),
@ -231,7 +231,7 @@ func (gui *Gui) enterCommitFile(selectedLineIdx int) error {
}
if gui.GitCommand.PatchManager.CommitSelected() && gui.GitCommand.PatchManager.CommitSha != commitFile.Sha {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getCommitFilesView(),
returnFocusOnClose: false,
title: gui.Tr.SLocalize("DiscardPatch"),

20
pkg/gui/commits_panel.go
View File

@ -155,7 +155,7 @@ func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("Squash"),
@ -186,7 +186,7 @@ func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("Fixup"),
@ -216,7 +216,7 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
if gui.State.Panels.Commits.SelectedLine != 0 {
return gui.createErrorPanel(gui.Tr.SLocalize("OnlyRenameTopCommit"))
}
return gui.createPromptPanel(v, gui.Tr.SLocalize("renameCommit"), "", func(response string) error {
return gui.prompt(v, gui.Tr.SLocalize("renameCommit"), "", func(response string) error {
if err := gui.GitCommand.RenameCommit(response); err != nil {
return gui.surfaceError(err)
}
@ -288,7 +288,7 @@ func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("DeleteCommitTitle"),
@ -380,7 +380,7 @@ func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
return err
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("AmendCommitTitle"),
@ -498,7 +498,7 @@ func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
return err
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("CherryPick"),
@ -543,7 +543,7 @@ func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("CreateFixupCommit"),
@ -573,7 +573,7 @@ func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) er
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("SquashAboveCommits"),
@ -605,7 +605,7 @@ func (gui *Gui) handleTagCommit(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCreateLightweightTag(commitSha string) error {
return gui.createPromptPanel(gui.getCommitsView(), gui.Tr.SLocalize("TagNameTitle"), "", func(response string) error {
return gui.prompt(gui.getCommitsView(), gui.Tr.SLocalize("TagNameTitle"), "", func(response string) error {
if err := gui.GitCommand.CreateLightweightTag(response, commitSha); err != nil {
return gui.surfaceError(err)
}
@ -619,7 +619,7 @@ func (gui *Gui) handleCheckoutCommit(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getCommitsView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("checkoutCommit"),

8
pkg/gui/confirmation_panel.go
View File

@ -27,7 +27,7 @@ type createPopupPanelOpts struct {
handleClose func() error
}
type createConfirmationPanelOpts struct {
type askOpts struct {
returnToView *gocui.View
returnFocusOnClose bool
title string
@ -45,7 +45,7 @@ func (gui *Gui) createLoaderPanel(currentView *gocui.View, prompt string) error
})
}
func (gui *Gui) createConfirmationPanel(opts createConfirmationPanelOpts) error {
func (gui *Gui) ask(opts askOpts) error {
return gui.createPopupPanel(createPopupPanelOpts{
returnToView: opts.returnToView,
title: opts.title,
@ -56,7 +56,7 @@ func (gui *Gui) createConfirmationPanel(opts createConfirmationPanelOpts) error
})
}
func (gui *Gui) createPromptPanel(currentView *gocui.View, title string, initialContent string, handleConfirm func(string) error) error {
func (gui *Gui) prompt(currentView *gocui.View, title string, initialContent string, handleConfirm func(string) error) error {
return gui.createPopupPanel(createPopupPanelOpts{
returnToView: currentView,
title: title,
@ -236,7 +236,7 @@ func (gui *Gui) createErrorPanel(message string) error {
return err
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.g.CurrentView(),
title: gui.Tr.SLocalize("Error"),
prompt: coloredMessage,

2
pkg/gui/diffing.go
View File

@ -150,7 +150,7 @@ func (gui *Gui) handleCreateDiffingMenuPanel(g *gocui.Gui, v *gocui.View) error
{
displayString: gui.Tr.SLocalize("enterRefToDiff"),
onPress: func() error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("enteRefName"), "", func(response string) error {
return gui.prompt(v, gui.Tr.SLocalize("enteRefName"), "", func(response string) error {
gui.State.Diff.Ref = strings.TrimSpace(response)
return gui.refreshSidePanels(refreshOptions{mode: ASYNC})
})

16
pkg/gui/files_panel.go
View File

@ -249,7 +249,7 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
}
if file.Tracked {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.g.CurrentView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("IgnoreTracked"),
@ -325,7 +325,7 @@ func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error {
}
func (gui *Gui) promptToStageAllAndRetry(retry func() error) error {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getFilesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("NoFilesStagedTitle"),
@ -354,7 +354,7 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro
return gui.createErrorPanel(gui.Tr.SLocalize("NoCommitToAmend"))
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: filesView,
returnFocusOnClose: true,
title: strings.Title(gui.Tr.SLocalize("AmendLastCommit")),
@ -461,7 +461,7 @@ func (gui *Gui) handlePullFiles(g *gocui.Gui, v *gocui.View) error {
}
}
return gui.createPromptPanel(v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranch.Name, func(upstream string) error {
return gui.prompt(v, gui.Tr.SLocalize("EnterUpstream"), "origin/"+currentBranch.Name, func(upstream string) error {
if err := gui.GitCommand.SetUpstreamBranch(upstream); err != nil {
errorMessage := err.Error()
if strings.Contains(errorMessage, "does not exist") {
@ -529,7 +529,7 @@ func (gui *Gui) pushWithForceFlag(g *gocui.Gui, v *gocui.View, force bool, upstr
branchName := gui.getCheckedOutBranch().Name
err := gui.GitCommand.Push(branchName, force, upstream, args, gui.promptUserForCredential)
if err != nil && !force && strings.Contains(err.Error(), "Updates were rejected") {
gui.createConfirmationPanel(createConfirmationPanelOpts{
gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("ForcePush"),
@ -566,7 +566,7 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
if gui.GitCommand.PushToCurrent {
return gui.pushWithForceFlag(g, v, false, "", "--set-upstream")
} else {
return gui.createPromptPanel(v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranch.Name, func(response string) error {
return gui.prompt(v, gui.Tr.SLocalize("EnterUpstream"), "origin "+currentBranch.Name, func(response string) error {
return gui.pushWithForceFlag(g, v, false, response, "")
})
}
@ -574,7 +574,7 @@ func (gui *Gui) pushFiles(g *gocui.Gui, v *gocui.View) error {
return gui.pushWithForceFlag(g, v, false, "", "")
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("ForcePush"),
@ -620,7 +620,7 @@ func (gui *Gui) anyFilesWithMergeConflicts() bool {
}
func (gui *Gui) handleCustomCommand(g *gocui.Gui, v *gocui.View) error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("CustomCommand"), "", func(command string) error {
return gui.prompt(v, gui.Tr.SLocalize("CustomCommand"), "", func(command string) error {
gui.SubProcess = gui.OSCommand.RunCustomCommand(command)
return gui.Errors.ErrSubProcess
})

2
pkg/gui/filtering.go
View File

@ -6,7 +6,7 @@ func (gui *Gui) inFilterMode() bool {
func (gui *Gui) validateNotInFilterMode() (bool, error) {
if gui.inFilterMode() {
err := gui.createConfirmationPanel(createConfirmationPanelOpts{
err := gui.ask(askOpts{
returnToView: gui.g.CurrentView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("MustExitFilterModeTitle"),

2
pkg/gui/filtering_menu_panel.go
View File

@ -41,7 +41,7 @@ func (gui *Gui) handleCreateFilteringMenuPanel(g *gocui.Gui, v *gocui.View) erro
menuItems = append(menuItems, &menuItem{
displayString: gui.Tr.SLocalize("filterPathOption"),
onPress: func() error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("enterFileName"), "", func(response string) error {
return gui.prompt(v, gui.Tr.SLocalize("enterFileName"), "", func(response string) error {
gui.State.FilterPath = strings.TrimSpace(response)
return gui.Errors.ErrRestart
})

2
pkg/gui/git_flow.go
View File

@ -51,7 +51,7 @@ func (gui *Gui) handleCreateGitFlowMenu(g *gocui.Gui, v *gocui.View) error {
startHandler := func(branchType string) func() error {
return func() error {
title := gui.Tr.TemplateLocalize("NewBranchNamePrompt", map[string]interface{}{"branchType": branchType})
return gui.createPromptPanel(gui.getMenuView(), title, "", func(name string) error {
return gui.prompt(gui.getMenuView(), title, "", func(name string) error {
subProcess := gui.OSCommand.PrepareSubProcess("git", "flow", branchType, "start", name)
gui.SubProcess = subProcess
return gui.Errors.ErrSubProcess

6
pkg/gui/gui.go
View File

@ -468,7 +468,7 @@ func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error {
return gui.Config.WriteToUserConfig("startupPopupVersion", StartupPopupVersion)
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: nil,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("ShamelessSelfPromotionTitle"),
@ -479,7 +479,7 @@ func (gui *Gui) showShamelessSelfPromotionMessage(done chan struct{}) error {
}
func (gui *Gui) promptAnonymousReporting(done chan struct{}) error {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: nil,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("AnonymousReportingTitle"),
@ -518,7 +518,7 @@ func (gui *Gui) startBackgroundFetch() {
}
err := gui.fetch(false)
if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew {
_ = gui.createConfirmationPanel(createConfirmationPanelOpts{
_ = gui.ask(askOpts{
returnToView: gui.g.CurrentView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("NoAutomaticGitFetchTitle"),

2
pkg/gui/merge_panel.go
View File

@ -336,7 +336,7 @@ func (gui *Gui) handleCompleteMerge() error {
func (gui *Gui) promptToContinue() error {
gui.takeOverScrolling()
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getFilesView(),
returnFocusOnClose: true,
title: "continue",

2
pkg/gui/patch_options_panel.go
View File

@ -133,7 +133,7 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error {
}
if len(gui.trackedFiles()) > 0 {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.g.CurrentView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("MustStashTitle"),

2
pkg/gui/quitting.go
View File

@ -55,7 +55,7 @@ func (gui *Gui) quit(v *gocui.View) error {
}
if gui.Config.GetUserConfig().GetBool("confirmOnQuit") {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: "",

2
pkg/gui/rebase_options_panel.go
View File

@ -78,7 +78,7 @@ func (gui *Gui) handleGenericMergeCommandResult(result error) error {
// assume in this case that we're already done
return nil
} else if strings.Contains(result.Error(), "When you have resolved this problem") || strings.Contains(result.Error(), "fix conflicts") || strings.Contains(result.Error(), "Resolve all conflicts manually") {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getFilesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("FoundConflictsTitle"),

2
pkg/gui/reflog_panel.go
View File

@ -121,7 +121,7 @@ func (gui *Gui) handleCheckoutReflogCommit(g *gocui.Gui, v *gocui.View) error {
return nil
}
err := gui.createConfirmationPanel(createConfirmationPanelOpts{
err := gui.ask(askOpts{
returnToView: gui.getCommitsView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("checkoutCommit"),

6
pkg/gui/remote_branches_panel.go
View File

@ -95,7 +95,7 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error {
}
message := fmt.Sprintf("%s '%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.FullName())
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("DeleteRemoteBranch"),
@ -129,7 +129,7 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error {
},
)
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("SetUpstreamTitle"),
@ -164,7 +164,7 @@ func (gui *Gui) handleNewBranchOffRemote(g *gocui.Gui, v *gocui.View) error {
"branchName": branch.FullName(),
},
)
return gui.createPromptPanel(v, message, branch.FullName(), func(response string) error {
return gui.prompt(v, message, branch.FullName(), func(response string) error {
if err := gui.GitCommand.NewBranch(response, branch.FullName()); err != nil {
return gui.surfaceError(err)
}

10
pkg/gui/remotes_panel.go
View File

@ -116,8 +116,8 @@ func (gui *Gui) handleRemoteEnter(g *gocui.Gui, v *gocui.View) error {
func (gui *Gui) handleAddRemote(g *gocui.Gui, v *gocui.View) error {
branchesView := gui.getBranchesView()
return gui.createPromptPanel(branchesView, gui.Tr.SLocalize("newRemoteName"), "", func(remoteName string) error {
return gui.createPromptPanel(branchesView, gui.Tr.SLocalize("newRemoteUrl"), "", func(remoteUrl string) error {
return gui.prompt(branchesView, gui.Tr.SLocalize("newRemoteName"), "", func(remoteName string) error {
return gui.prompt(branchesView, gui.Tr.SLocalize("newRemoteUrl"), "", func(remoteUrl string) error {
if err := gui.GitCommand.AddRemote(remoteName, remoteUrl); err != nil {
return err
}
@ -132,7 +132,7 @@ func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error {
return nil
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("removeRemote"),
@ -161,7 +161,7 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
},
)
return gui.createPromptPanel(branchesView, editNameMessage, "", func(updatedRemoteName string) error {
return gui.prompt(branchesView, editNameMessage, "", func(updatedRemoteName string) error {
if updatedRemoteName != remote.Name {
if err := gui.GitCommand.RenameRemote(remote.Name, updatedRemoteName); err != nil {
return gui.surfaceError(err)
@ -175,7 +175,7 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error {
},
)
return gui.createPromptPanel(branchesView, editUrlMessage, "", func(updatedRemoteUrl string) error {
return gui.prompt(branchesView, editUrlMessage, "", func(updatedRemoteUrl string) error {
if err := gui.GitCommand.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil {
return gui.surfaceError(err)
}

2
pkg/gui/staging_panel.go
View File

@ -114,7 +114,7 @@ func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error {
}
if !gui.Config.GetUserConfig().GetBool("gui.skipUnstageLineWarning") {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getMainView(),
returnFocusOnClose: false,
title: gui.Tr.SLocalize("UnstageLinesTitle"),

8
pkg/gui/stash_panel.go
View File

@ -76,7 +76,7 @@ func (gui *Gui) handleStashApply(g *gocui.Gui, v *gocui.View) error {
return apply()
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("StashApply"),
@ -98,7 +98,7 @@ func (gui *Gui) handleStashPop(g *gocui.Gui, v *gocui.View) error {
return pop()
}
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("StashPop"),
@ -110,7 +110,7 @@ func (gui *Gui) handleStashPop(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleStashDrop(g *gocui.Gui, v *gocui.View) error {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("StashDrop"),
@ -142,7 +142,7 @@ func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
if len(gui.trackedFiles()) == 0 && len(gui.stagedFiles()) == 0 {
return gui.createErrorPanel(gui.Tr.SLocalize("NoTrackedStagedFilesStash"))
}
return gui.createPromptPanel(gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(stashComment string) error {
return gui.prompt(gui.getFilesView(), gui.Tr.SLocalize("StashChanges"), "", func(stashComment string) error {
if err := stashFunc(stashComment); err != nil {
return gui.surfaceError(err)
}

6
pkg/gui/tags_panel.go
View File

@ -104,7 +104,7 @@ func (gui *Gui) handleDeleteTag(g *gocui.Gui, v *gocui.View) error {
},
)
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: gui.Tr.SLocalize("DeleteTagTitle"),
@ -131,7 +131,7 @@ func (gui *Gui) handlePushTag(g *gocui.Gui, v *gocui.View) error {
},
)
return gui.createPromptPanel(v, title, "origin", func(response string) error {
return gui.prompt(v, title, "origin", func(response string) error {
if err := gui.GitCommand.PushTag(response, tag.Name); err != nil {
return gui.surfaceError(err)
}
@ -140,7 +140,7 @@ func (gui *Gui) handlePushTag(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCreateTag(g *gocui.Gui, v *gocui.View) error {
return gui.createPromptPanel(v, gui.Tr.SLocalize("CreateTagTitle"), "", func(tagName string) error {
return gui.prompt(v, gui.Tr.SLocalize("CreateTagTitle"), "", func(tagName string) error {
// leaving commit SHA blank so that we're just creating the tag for the current commit
if err := gui.GitCommand.CreateLightweightTag(tagName, ""); err != nil {
return gui.surfaceError(err)

2
pkg/gui/undoing.go
View File

@ -166,7 +166,7 @@ func (gui *Gui) handleHardResetWithAutoStash(commitSha string, options handleHar
dirtyWorkingTree := len(gui.trackedFiles()) > 0
if dirtyWorkingTree {
// offer to autostash changes
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: gui.getBranchesView(),
returnFocusOnClose: true,
title: gui.Tr.SLocalize("AutoStashTitle"),

4
pkg/gui/updates.go
View File

@ -5,7 +5,7 @@ import "github.com/jesseduffield/gocui"
func (gui *Gui) showUpdatePrompt(newVersion string) error {
currentView := gui.g.CurrentView()
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: currentView,
returnFocusOnClose: true,
title: "New version available!",
@ -60,7 +60,7 @@ func (gui *Gui) onUpdateFinish(err error) error {
}
func (gui *Gui) createUpdateQuitConfirmation(g *gocui.Gui, v *gocui.View) error {
return gui.createConfirmationPanel(createConfirmationPanelOpts{
return gui.ask(askOpts{
returnToView: v,
returnFocusOnClose: true,
title: "Currently Updating",