diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-02-13 18:04:09 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
commit | 8a555dd62ebdb985041f421dca650b941007afc1 (patch) | |
tree | 79262b68dfa7013ffdc1380ff313a967f1adfe45 /pkg/gui/controllers/files_controller.go | |
parent | bef26b9634a6a4c85028dcb1577161ed2c662b4e (diff) |
refactor
Diffstat (limited to 'pkg/gui/controllers/files_controller.go')
-rw-r--r-- | pkg/gui/controllers/files_controller.go | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 6868586e6..018322f1a 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -99,12 +99,6 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types Description: self.c.Tr.LcIgnoreFile, }, { - Key: opts.GetKey(opts.Config.Universal.Remove), - Handler: self.checkSelectedFileNode(self.remove), - Description: self.c.Tr.LcViewDiscardOptions, - OpensMenu: true, - }, - { Key: opts.GetKey(opts.Config.Files.RefreshFiles), Handler: self.refresh, Description: self.c.Tr.LcRefreshFiles, @@ -619,28 +613,6 @@ func (self *FilesController) OpenMergeTool() error { }) } -func (self *FilesController) ResetSubmodule(submodule *models.SubmoduleConfig) error { - return self.c.WithWaitingStatus(self.c.Tr.LcResettingSubmoduleStatus, func() error { - self.c.LogAction(self.c.Tr.Actions.ResetSubmodule) - - file := self.helpers.WorkingTree.FileForSubmodule(submodule) - if file != nil { - if err := self.git.WorkingTree.UnStageFile(file.Names(), file.Tracked); err != nil { - return self.c.Error(err) - } - } - - if err := self.git.Submodule.Stash(submodule); err != nil { - return self.c.Error(err) - } - if err := self.git.Submodule.Reset(submodule); err != nil { - return self.c.Error(err) - } - - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.SUBMODULES}}) - }) -} - func (self *FilesController) handleStashSave(stashFunc func(message string) error) error { if !self.helpers.WorkingTree.IsWorkingTreeDirty() { return self.c.ErrorMsg(self.c.Tr.NoTrackedStagedFilesStash) |