diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-02-06 15:54:26 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 722410aded4e3d14356c7ab94bfa15abe10359fa (patch) | |
| tree | 8e8a57503b0b57bccca5fa8cd146bc699960033f /pkg/gui/patch_options_panel.go | |
| parent | b93b8cc00a2f2ea339b1ecdbc380320556490d3b (diff) | |
refactor controllers
Diffstat (limited to 'pkg/gui/patch_options_panel.go')
| -rw-r--r-- | pkg/gui/patch_options_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go index d69dbda27..81d232da2 100644 --- a/pkg/gui/patch_options_panel.go +++ b/pkg/gui/patch_options_panel.go @@ -102,7 +102,7 @@ func (gui *Gui) handleDeletePatchFromCommit() error { commitIndex := gui.getPatchCommitIndex() gui.c.LogAction(gui.c.Tr.Actions.RemovePatchFromCommit) err := gui.git.Patch.DeletePatchesFromCommit(gui.State.Model.Commits, commitIndex) - return gui.helpers.Rebase.CheckMergeOrRebase(err) + return gui.helpers.MergeAndRebase.CheckMergeOrRebase(err) }) } @@ -119,7 +119,7 @@ func (gui *Gui) handleMovePatchToSelectedCommit() error { commitIndex := gui.getPatchCommitIndex() gui.c.LogAction(gui.c.Tr.Actions.MovePatchToSelectedCommit) err := gui.git.Patch.MovePatchToSelectedCommit(gui.State.Model.Commits, commitIndex, gui.State.Contexts.BranchCommits.GetSelectedLineIdx()) - return gui.helpers.Rebase.CheckMergeOrRebase(err) + return gui.helpers.MergeAndRebase.CheckMergeOrRebase(err) }) } @@ -137,7 +137,7 @@ func (gui *Gui) handleMovePatchIntoWorkingTree() error { commitIndex := gui.getPatchCommitIndex() gui.c.LogAction(gui.c.Tr.Actions.MovePatchIntoIndex) err := gui.git.Patch.MovePatchIntoIndex(gui.State.Model.Commits, commitIndex, stash) - return gui.helpers.Rebase.CheckMergeOrRebase(err) + return gui.helpers.MergeAndRebase.CheckMergeOrRebase(err) }) } @@ -167,7 +167,7 @@ func (gui *Gui) handlePullPatchIntoNewCommit() error { commitIndex := gui.getPatchCommitIndex() gui.c.LogAction(gui.c.Tr.Actions.MovePatchIntoNewCommit) err := gui.git.Patch.PullPatchIntoNewCommit(gui.State.Model.Commits, commitIndex) - return gui.helpers.Rebase.CheckMergeOrRebase(err) + return gui.helpers.MergeAndRebase.CheckMergeOrRebase(err) }) } |