2022-01-16 05:46:53 +02:00
|
|
|
package controllers
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"regexp"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/jesseduffield/gocui"
|
2022-02-06 06:54:26 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
2022-01-16 05:46:53 +02:00
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/filetree"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
|
|
)
|
|
|
|
|
|
|
|
type FilesController struct {
|
2022-02-06 06:54:26 +02:00
|
|
|
baseController
|
|
|
|
*controllerCommon
|
|
|
|
|
2022-02-22 12:16:00 +02:00
|
|
|
enterSubmodule func(submodule *models.SubmoduleConfig) error
|
|
|
|
setCommitMessage func(message string)
|
|
|
|
getSavedCommitMessage func() string
|
|
|
|
switchToMergeFn func(path string) error
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
var _ types.IController = &FilesController{}
|
|
|
|
|
|
|
|
func NewFilesController(
|
2022-02-06 06:54:26 +02:00
|
|
|
common *controllerCommon,
|
2022-01-16 05:46:53 +02:00
|
|
|
enterSubmodule func(submodule *models.SubmoduleConfig) error,
|
|
|
|
setCommitMessage func(message string),
|
2022-02-22 12:16:00 +02:00
|
|
|
getSavedCommitMessage func() string,
|
2022-01-16 05:46:53 +02:00
|
|
|
switchToMergeFn func(path string) error,
|
|
|
|
) *FilesController {
|
|
|
|
return &FilesController{
|
2022-02-22 12:16:00 +02:00
|
|
|
controllerCommon: common,
|
|
|
|
enterSubmodule: enterSubmodule,
|
|
|
|
setCommitMessage: setCommitMessage,
|
|
|
|
getSavedCommitMessage: getSavedCommitMessage,
|
|
|
|
switchToMergeFn: switchToMergeFn,
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-05 01:31:07 +02:00
|
|
|
func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
|
|
|
return []*types.Binding{
|
2022-01-16 05:46:53 +02:00
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.checkSelectedFileNode(self.press),
|
|
|
|
Description: self.c.Tr.LcToggleStaged,
|
|
|
|
},
|
|
|
|
{
|
2022-02-27 07:22:04 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.OpenStatusFilter),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.handleStatusFilterPressed,
|
|
|
|
Description: self.c.Tr.LcFileFilter,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.CommitChanges),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.HandleCommitPress,
|
|
|
|
Description: self.c.Tr.CommitChanges,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.HandleWIPCommitPress,
|
|
|
|
Description: self.c.Tr.LcCommitChangesWithoutHook,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.AmendLastCommit),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.handleAmendCommitPress,
|
|
|
|
Description: self.c.Tr.AmendLastCommit,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.HandleCommitEditorPress,
|
|
|
|
Description: self.c.Tr.CommitChangesWithEditor,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
2022-01-23 05:40:28 +02:00
|
|
|
Handler: self.checkSelectedFileNode(self.edit),
|
2022-01-16 05:46:53 +02:00
|
|
|
Description: self.c.Tr.LcEditFile,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.Open,
|
|
|
|
Description: self.c.Tr.LcOpenFile,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.IgnoreFile),
|
2022-01-23 05:40:28 +02:00
|
|
|
Handler: self.checkSelectedFileNode(self.ignore),
|
2022-01-16 05:46:53 +02:00
|
|
|
Description: self.c.Tr.LcIgnoreFile,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.RefreshFiles),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.refresh,
|
|
|
|
Description: self.c.Tr.LcRefreshFiles,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.StashAllChanges),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.stash,
|
|
|
|
Description: self.c.Tr.LcStashAllChanges,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.ViewStashOptions),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.createStashMenu,
|
|
|
|
Description: self.c.Tr.LcViewStashOptions,
|
|
|
|
OpensMenu: true,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.ToggleStagedAll),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.stageAll,
|
|
|
|
Description: self.c.Tr.LcToggleStagedAll,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.enter,
|
|
|
|
Description: self.c.Tr.FileEnter,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
2022-02-26 10:26:39 +02:00
|
|
|
Handler: self.createResetToUpstreamMenu,
|
2022-01-16 05:46:53 +02:00
|
|
|
Description: self.c.Tr.LcViewResetToUpstreamOptions,
|
|
|
|
OpensMenu: true,
|
|
|
|
},
|
2022-02-26 10:26:39 +02:00
|
|
|
{
|
|
|
|
Key: opts.GetKey(opts.Config.Files.ViewResetOptions),
|
|
|
|
Handler: self.createResetMenu,
|
|
|
|
Description: self.c.Tr.LcViewResetOptions,
|
|
|
|
OpensMenu: true,
|
|
|
|
},
|
2022-01-16 05:46:53 +02:00
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.ToggleTreeView),
|
2022-01-16 05:46:53 +02:00
|
|
|
Handler: self.toggleTreeView,
|
|
|
|
Description: self.c.Tr.LcToggleTreeView,
|
|
|
|
},
|
|
|
|
{
|
2022-02-05 01:31:07 +02:00
|
|
|
Key: opts.GetKey(opts.Config.Files.OpenMergeTool),
|
2022-03-26 06:52:35 +02:00
|
|
|
Handler: self.helpers.WorkingTree.OpenMergeTool,
|
2022-01-16 05:46:53 +02:00
|
|
|
Description: self.c.Tr.LcOpenMergeTool,
|
|
|
|
},
|
2022-02-06 06:54:26 +02:00
|
|
|
{
|
|
|
|
Key: opts.GetKey(opts.Config.Files.Fetch),
|
|
|
|
Handler: self.fetch,
|
|
|
|
Description: self.c.Tr.LcFetch,
|
|
|
|
},
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-05 05:42:56 +02:00
|
|
|
func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
|
|
|
|
return []*gocui.ViewMouseBinding{
|
|
|
|
{
|
2022-02-27 02:42:22 +02:00
|
|
|
ViewName: "main",
|
|
|
|
Key: gocui.MouseLeft,
|
|
|
|
Handler: self.onClickMain,
|
|
|
|
FromContext: string(self.context().GetKey()),
|
2022-02-05 05:42:56 +02:00
|
|
|
},
|
|
|
|
{
|
2022-02-27 02:42:22 +02:00
|
|
|
ViewName: "secondary",
|
|
|
|
Key: gocui.MouseLeft,
|
|
|
|
Handler: self.onClickSecondary,
|
|
|
|
FromContext: string(self.context().GetKey()),
|
2022-02-05 05:42:56 +02:00
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-27 02:42:22 +02:00
|
|
|
func (self *FilesController) GetOnClick() func() error {
|
|
|
|
return self.checkSelectedFileNode(self.press)
|
|
|
|
}
|
|
|
|
|
2022-01-16 05:46:53 +02:00
|
|
|
func (self *FilesController) press(node *filetree.FileNode) error {
|
|
|
|
if node.IsLeaf() {
|
|
|
|
file := node.File
|
|
|
|
|
|
|
|
if file.HasInlineMergeConflicts {
|
2022-01-31 13:20:28 +02:00
|
|
|
return self.c.PushContext(self.contexts.Merging)
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if file.HasUnstagedChanges {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.StageFile)
|
|
|
|
if err := self.git.WorkingTree.StageFile(file.Name); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.UnstageFile)
|
|
|
|
if err := self.git.WorkingTree.UnStageFile(file.Names(), file.Tracked); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// if any files within have inline merge conflicts we can't stage or unstage,
|
|
|
|
// or it'll end up with those >>>>>> lines actually staged
|
|
|
|
if node.GetHasInlineMergeConflicts() {
|
|
|
|
return self.c.ErrorMsg(self.c.Tr.ErrStageDirWithInlineMergeConflicts)
|
|
|
|
}
|
|
|
|
|
|
|
|
if node.GetHasUnstagedChanges() {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.StageFile)
|
|
|
|
if err := self.git.WorkingTree.StageFile(node.Path); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// pretty sure it doesn't matter that we're always passing true here
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.UnstageFile)
|
|
|
|
if err := self.git.WorkingTree.UnStageFile([]string{node.Path}, true); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.context().HandleFocus()
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) checkSelectedFileNode(callback func(*filetree.FileNode) error) func() error {
|
|
|
|
return func() error {
|
2022-03-19 00:31:52 +02:00
|
|
|
node := self.context().GetSelected()
|
2022-01-16 05:46:53 +02:00
|
|
|
if node == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return callback(node)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) Context() types.Context {
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.context()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) context() *context.WorkingTreeContext {
|
|
|
|
return self.contexts.Files
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) getSelectedFile() *models.File {
|
2022-03-19 00:31:52 +02:00
|
|
|
node := self.context().GetSelected()
|
2022-01-16 05:46:53 +02:00
|
|
|
if node == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return node.File
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) enter() error {
|
|
|
|
return self.EnterFile(types.OnFocusOpts{ClickedViewName: "", ClickedViewLineIdx: -1})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
|
2022-03-19 00:31:52 +02:00
|
|
|
node := self.context().GetSelected()
|
2022-01-16 05:46:53 +02:00
|
|
|
if node == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
if node.File == nil {
|
|
|
|
return self.handleToggleDirCollapsed()
|
|
|
|
}
|
|
|
|
|
|
|
|
file := node.File
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
submoduleConfigs := self.model.Submodules
|
2022-01-16 05:46:53 +02:00
|
|
|
if file.IsSubmodule(submoduleConfigs) {
|
|
|
|
submoduleConfig := file.SubmoduleConfig(submoduleConfigs)
|
|
|
|
return self.enterSubmodule(submoduleConfig)
|
|
|
|
}
|
|
|
|
|
|
|
|
if file.HasInlineMergeConflicts {
|
|
|
|
return self.switchToMerge()
|
|
|
|
}
|
|
|
|
if file.HasMergeConflicts {
|
|
|
|
return self.c.ErrorMsg(self.c.Tr.FileStagingRequirements)
|
|
|
|
}
|
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
return self.c.PushContext(self.contexts.Staging, opts)
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) allFilesStaged() bool {
|
2022-01-31 13:20:28 +02:00
|
|
|
for _, file := range self.model.Files {
|
2022-01-16 05:46:53 +02:00
|
|
|
if file.HasUnstagedChanges {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) stageAll() error {
|
|
|
|
var err error
|
|
|
|
if self.allFilesStaged() {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.UnstageAllFiles)
|
|
|
|
err = self.git.WorkingTree.UnstageAll()
|
|
|
|
} else {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
|
|
|
|
err = self.git.WorkingTree.StageAll()
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
_ = self.c.Error(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
return self.contexts.Files.HandleFocus()
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
2022-01-23 05:40:28 +02:00
|
|
|
func (self *FilesController) ignore(node *filetree.FileNode) error {
|
2022-01-16 05:46:53 +02:00
|
|
|
if node.GetPath() == ".gitignore" {
|
|
|
|
return self.c.ErrorMsg("Cannot ignore .gitignore")
|
|
|
|
}
|
|
|
|
|
|
|
|
unstageFiles := func() error {
|
|
|
|
return node.ForEachFile(func(file *models.File) error {
|
|
|
|
if file.HasStagedChanges {
|
|
|
|
if err := self.git.WorkingTree.UnStageFile(file.Names(), file.Tracked); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
if node.GetIsTracked() {
|
2022-03-30 08:48:29 +02:00
|
|
|
return self.c.Confirm(types.ConfirmOpts{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: self.c.Tr.IgnoreTracked,
|
|
|
|
Prompt: self.c.Tr.IgnoreTrackedPrompt,
|
|
|
|
HandleConfirm: func() error {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.IgnoreFile)
|
|
|
|
// not 100% sure if this is necessary but I'll assume it is
|
|
|
|
if err := unstageFiles(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := self.git.WorkingTree.RemoveTrackedFiles(node.GetPath()); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := self.git.WorkingTree.Ignore(node.GetPath()); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}})
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.IgnoreFile)
|
|
|
|
|
|
|
|
if err := unstageFiles(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := self.git.WorkingTree.Ignore(node.GetPath()); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) HandleWIPCommitPress() error {
|
|
|
|
skipHookPrefix := self.c.UserConfig.Git.SkipHookPrefix
|
|
|
|
if skipHookPrefix == "" {
|
|
|
|
return self.c.ErrorMsg(self.c.Tr.SkipHookPrefixNotConfigured)
|
|
|
|
}
|
|
|
|
|
|
|
|
self.setCommitMessage(skipHookPrefix)
|
|
|
|
|
|
|
|
return self.HandleCommitPress()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) commitPrefixConfigForRepo() *config.CommitPrefixConfig {
|
|
|
|
cfg, ok := self.c.UserConfig.Git.CommitPrefixes[utils.GetCurrentRepoName()]
|
|
|
|
if !ok {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return &cfg
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) prepareFilesForCommit() error {
|
2022-02-06 06:54:26 +02:00
|
|
|
noStagedFiles := !self.helpers.WorkingTree.AnyStagedFiles()
|
2022-01-16 05:46:53 +02:00
|
|
|
if noStagedFiles && self.c.UserConfig.Gui.SkipNoStagedFilesWarning {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
|
|
|
|
err := self.git.WorkingTree.StageAll()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.syncRefresh()
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// for when you need to refetch files before continuing an action. Runs synchronously.
|
|
|
|
func (self *FilesController) syncRefresh() error {
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) refresh() error {
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.FILES}})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) HandleCommitPress() error {
|
|
|
|
if err := self.prepareFilesForCommit(); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
if len(self.model.Files) == 0 {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoFilesStagedTitle)
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
if !self.helpers.WorkingTree.AnyStagedFiles() {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.promptToStageAllAndRetry(self.HandleCommitPress)
|
|
|
|
}
|
|
|
|
|
2022-02-22 12:16:00 +02:00
|
|
|
savedCommitMessage := self.getSavedCommitMessage()
|
|
|
|
if len(savedCommitMessage) > 0 {
|
|
|
|
self.setCommitMessage(savedCommitMessage)
|
2022-01-16 05:46:53 +02:00
|
|
|
} else {
|
|
|
|
commitPrefixConfig := self.commitPrefixConfigForRepo()
|
|
|
|
if commitPrefixConfig != nil {
|
|
|
|
prefixPattern := commitPrefixConfig.Pattern
|
|
|
|
prefixReplace := commitPrefixConfig.Replace
|
|
|
|
rgx, err := regexp.Compile(prefixPattern)
|
|
|
|
if err != nil {
|
|
|
|
return self.c.ErrorMsg(fmt.Sprintf("%s: %s", self.c.Tr.LcCommitPrefixPatternError, err.Error()))
|
|
|
|
}
|
2022-02-06 06:54:26 +02:00
|
|
|
prefix := rgx.ReplaceAllString(self.helpers.Refs.GetCheckedOutRef().Name, prefixReplace)
|
2022-01-16 05:46:53 +02:00
|
|
|
self.setCommitMessage(prefix)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
if err := self.c.PushContext(self.contexts.CommitMessage); err != nil {
|
2022-01-16 05:46:53 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) promptToStageAllAndRetry(retry func() error) error {
|
2022-03-30 08:48:29 +02:00
|
|
|
return self.c.Confirm(types.ConfirmOpts{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: self.c.Tr.NoFilesStagedTitle,
|
|
|
|
Prompt: self.c.Tr.NoFilesStagedPrompt,
|
|
|
|
HandleConfirm: func() error {
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.StageAllFiles)
|
|
|
|
if err := self.git.WorkingTree.StageAll(); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
if err := self.syncRefresh(); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return retry()
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) handleAmendCommitPress() error {
|
2022-01-31 13:20:28 +02:00
|
|
|
if len(self.model.Files) == 0 {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoFilesStagedTitle)
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
if !self.helpers.WorkingTree.AnyStagedFiles() {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.promptToStageAllAndRetry(self.handleAmendCommitPress)
|
|
|
|
}
|
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
if len(self.model.Commits) == 0 {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoCommitToAmend)
|
|
|
|
}
|
|
|
|
|
2022-03-30 08:48:29 +02:00
|
|
|
return self.c.Confirm(types.ConfirmOpts{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: strings.Title(self.c.Tr.AmendLastCommit),
|
|
|
|
Prompt: self.c.Tr.SureToAmend,
|
|
|
|
HandleConfirm: func() error {
|
|
|
|
cmdObj := self.git.Commit.AmendHeadCmdObj()
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.AmendCommit)
|
2022-02-22 12:16:00 +02:00
|
|
|
return self.helpers.GPG.WithGpgHandling(cmdObj, self.c.Tr.AmendingStatus, nil)
|
2022-01-16 05:46:53 +02:00
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// HandleCommitEditorPress - handle when the user wants to commit changes via
|
|
|
|
// their editor rather than via the popup panel
|
|
|
|
func (self *FilesController) HandleCommitEditorPress() error {
|
2022-01-31 13:20:28 +02:00
|
|
|
if len(self.model.Files) == 0 {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoFilesStagedTitle)
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
if !self.helpers.WorkingTree.AnyStagedFiles() {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.promptToStageAllAndRetry(self.HandleCommitEditorPress)
|
|
|
|
}
|
|
|
|
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.Commit)
|
|
|
|
return self.c.RunSubprocessAndRefresh(
|
|
|
|
self.git.Commit.CommitEditorCmdObj(),
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) handleStatusFilterPressed() error {
|
2022-01-29 10:09:20 +02:00
|
|
|
return self.c.Menu(types.CreateMenuOptions{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: self.c.Tr.FilteringMenuTitle,
|
2022-01-29 10:09:20 +02:00
|
|
|
Items: []*types.MenuItem{
|
2022-01-16 05:46:53 +02:00
|
|
|
{
|
|
|
|
DisplayString: self.c.Tr.FilterStagedFiles,
|
|
|
|
OnPress: func() error {
|
|
|
|
return self.setStatusFiltering(filetree.DisplayStaged)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
DisplayString: self.c.Tr.FilterUnstagedFiles,
|
|
|
|
OnPress: func() error {
|
|
|
|
return self.setStatusFiltering(filetree.DisplayUnstaged)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
DisplayString: self.c.Tr.ResetCommitFilterState,
|
|
|
|
OnPress: func() error {
|
|
|
|
return self.setStatusFiltering(filetree.DisplayAll)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) setStatusFiltering(filter filetree.FileTreeDisplayFilter) error {
|
2022-02-06 06:54:26 +02:00
|
|
|
self.context().FileTreeViewModel.SetFilter(filter)
|
|
|
|
return self.c.PostRefreshUpdate(self.context())
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
2022-01-23 05:40:28 +02:00
|
|
|
func (self *FilesController) edit(node *filetree.FileNode) error {
|
2022-01-16 05:46:53 +02:00
|
|
|
if node.File == nil {
|
|
|
|
return self.c.ErrorMsg(self.c.Tr.ErrCannotEditDirectory)
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.helpers.Files.EditFile(node.GetPath())
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) Open() error {
|
2022-03-19 00:31:52 +02:00
|
|
|
node := self.context().GetSelected()
|
2022-01-16 05:46:53 +02:00
|
|
|
if node == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.helpers.Files.OpenFile(node.GetPath())
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) switchToMerge() error {
|
|
|
|
file := self.getSelectedFile()
|
|
|
|
if file == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-01-23 05:40:28 +02:00
|
|
|
return self.switchToMergeFn(file.Name)
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) createStashMenu() error {
|
2022-01-29 10:09:20 +02:00
|
|
|
return self.c.Menu(types.CreateMenuOptions{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: self.c.Tr.LcStashOptions,
|
2022-01-29 10:09:20 +02:00
|
|
|
Items: []*types.MenuItem{
|
2022-01-16 05:46:53 +02:00
|
|
|
{
|
|
|
|
DisplayString: self.c.Tr.LcStashAllChanges,
|
|
|
|
OnPress: func() error {
|
2022-03-27 08:41:07 +02:00
|
|
|
return self.handleStashSave(self.git.Stash.Save, self.c.Tr.Actions.StashAllChanges)
|
2022-01-16 05:46:53 +02:00
|
|
|
},
|
2022-04-08 11:32:23 +02:00
|
|
|
Key: 'a',
|
2022-01-16 05:46:53 +02:00
|
|
|
},
|
|
|
|
{
|
2022-04-08 11:32:23 +02:00
|
|
|
DisplayString: self.c.Tr.LcStashAllChangesKeepIndex,
|
2022-01-16 05:46:53 +02:00
|
|
|
OnPress: func() error {
|
2022-04-08 11:32:23 +02:00
|
|
|
return self.handleStagedStashSave()
|
2022-01-16 05:46:53 +02:00
|
|
|
},
|
2022-04-08 11:32:23 +02:00
|
|
|
Key: 'i',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
DisplayString: self.c.Tr.LcStashUnstagedChanges,
|
|
|
|
OnPress: func() error {
|
|
|
|
return self.handleStashSave(self.git.Stash.StashAndKeepIndex, self.c.Tr.Actions.StashUnstagedChanges)
|
|
|
|
},
|
|
|
|
Key: 'u',
|
2022-01-16 05:46:53 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) stash() error {
|
2022-03-27 08:41:07 +02:00
|
|
|
return self.handleStashSave(self.git.Stash.Save, self.c.Tr.Actions.StashAllChanges)
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
2022-02-26 10:26:39 +02:00
|
|
|
func (self *FilesController) createResetToUpstreamMenu() error {
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.helpers.Refs.CreateGitResetMenu("@{upstream}")
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) handleToggleDirCollapsed() error {
|
2022-03-19 00:31:52 +02:00
|
|
|
node := self.context().GetSelected()
|
2022-01-16 05:46:53 +02:00
|
|
|
if node == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
self.context().FileTreeViewModel.ToggleCollapsed(node.GetPath())
|
2022-01-16 05:46:53 +02:00
|
|
|
|
2022-01-31 13:20:28 +02:00
|
|
|
if err := self.c.PostRefreshUpdate(self.contexts.Files); err != nil {
|
2022-01-16 05:46:53 +02:00
|
|
|
self.c.Log.Error(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) toggleTreeView() error {
|
2022-02-06 06:54:26 +02:00
|
|
|
self.context().FileTreeViewModel.ToggleShowTree()
|
2022-01-16 05:46:53 +02:00
|
|
|
|
2022-02-06 06:54:26 +02:00
|
|
|
return self.c.PostRefreshUpdate(self.context())
|
2022-01-16 05:46:53 +02:00
|
|
|
}
|
|
|
|
|
2022-04-08 11:32:23 +02:00
|
|
|
func (self *FilesController) handleStagedStashSave() error {
|
|
|
|
if !self.helpers.WorkingTree.AnyStagedFiles() {
|
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoTrackedStagedFilesStash)
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.handleStashSave(self.git.Stash.StashAndKeepIndex, self.c.Tr.Actions.StashStagedChanges)
|
|
|
|
}
|
|
|
|
|
2022-03-27 08:41:07 +02:00
|
|
|
func (self *FilesController) handleStashSave(stashFunc func(message string) error, action string) error {
|
2022-02-06 06:54:26 +02:00
|
|
|
if !self.helpers.WorkingTree.IsWorkingTreeDirty() {
|
2022-01-16 05:46:53 +02:00
|
|
|
return self.c.ErrorMsg(self.c.Tr.NoTrackedStagedFilesStash)
|
|
|
|
}
|
|
|
|
|
2022-01-29 10:09:20 +02:00
|
|
|
return self.c.Prompt(types.PromptOpts{
|
2022-01-16 05:46:53 +02:00
|
|
|
Title: self.c.Tr.StashChanges,
|
|
|
|
HandleConfirm: func(stashComment string) error {
|
2022-03-27 08:41:07 +02:00
|
|
|
self.c.LogAction(action)
|
|
|
|
|
2022-01-16 05:46:53 +02:00
|
|
|
if err := stashFunc(stashComment); err != nil {
|
|
|
|
return self.c.Error(err)
|
|
|
|
}
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.STASH, types.FILES}})
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
2022-02-05 05:42:56 +02:00
|
|
|
|
|
|
|
func (self *FilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
|
2022-02-27 02:42:22 +02:00
|
|
|
return self.EnterFile(types.OnFocusOpts{ClickedViewName: "main", ClickedViewLineIdx: opts.Y})
|
2022-02-05 05:42:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error {
|
2022-02-27 02:42:22 +02:00
|
|
|
return self.EnterFile(types.OnFocusOpts{ClickedViewName: "secondary", ClickedViewLineIdx: opts.Y})
|
2022-02-05 05:42:56 +02:00
|
|
|
}
|
2022-02-06 06:54:26 +02:00
|
|
|
|
|
|
|
func (self *FilesController) fetch() error {
|
|
|
|
return self.c.WithLoaderPanel(self.c.Tr.FetchWait, func() error {
|
|
|
|
if err := self.fetchAux(); err != nil {
|
|
|
|
_ = self.c.Error(err)
|
|
|
|
}
|
|
|
|
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (self *FilesController) fetchAux() (err error) {
|
|
|
|
self.c.LogAction("Fetch")
|
|
|
|
err = self.git.Sync.Fetch(git_commands.FetchOptions{})
|
|
|
|
|
|
|
|
if err != nil && strings.Contains(err.Error(), "exit status 128") {
|
|
|
|
_ = self.c.ErrorMsg(self.c.Tr.PassUnameWrong)
|
|
|
|
}
|
|
|
|
|
|
|
|
_ = self.c.Refresh(types.RefreshOptions{Scope: []types.RefreshableView{types.BRANCHES, types.COMMITS, types.REMOTES, types.TAGS}, Mode: types.ASYNC})
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|