diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-30 10:23:39 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 2692637fbeac353d805399dd97714c235f88f303 (patch) | |
| tree | 3352c0067a5ae99e82d0bd5e66db9b1d4fc01388 /pkg/gui/controllers/undo_controller.go | |
| parent | 77d0732fa81baad97dff7d2e5abd3fa6f6c9cda1 (diff) | |
standardise naming
Diffstat (limited to 'pkg/gui/controllers/undo_controller.go')
| -rw-r--r-- | pkg/gui/controllers/undo_controller.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go index 571be4251..89bc6ea9e 100644 --- a/pkg/gui/controllers/undo_controller.go +++ b/pkg/gui/controllers/undo_controller.go @@ -23,7 +23,7 @@ type UndoController struct { c *types.ControllerCommon git *commands.GitCommand - refHelper IRefHelper + refsHelper IRefsHelper workingTreeHelper IWorkingTreeHelper getFilteredReflogCommits func() []*models.Commit @@ -34,7 +34,7 @@ var _ types.IController = &UndoController{} func NewUndoController( c *types.ControllerCommon, git *commands.GitCommand, - refHelper IRefHelper, + refsHelper IRefsHelper, workingTreeHelper IWorkingTreeHelper, getFilteredReflogCommits func() []*models.Commit, @@ -42,7 +42,7 @@ func NewUndoController( return &UndoController{ c: c, git: git, - refHelper: refHelper, + refsHelper: refsHelper, workingTreeHelper: workingTreeHelper, getFilteredReflogCommits: getFilteredReflogCommits, @@ -111,7 +111,7 @@ func (self *UndoController) reflogUndo() error { }) case CHECKOUT: self.c.LogAction(self.c.Tr.Actions.Undo) - return true, self.refHelper.CheckoutRef(action.from, types.CheckoutRefOptions{ + return true, self.refsHelper.CheckoutRef(action.from, types.CheckoutRefOptions{ EnvVars: undoEnvVars, WaitingStatus: undoingStatus, }) @@ -149,7 +149,7 @@ func (self *UndoController) reflogRedo() error { }) case CHECKOUT: self.c.LogAction(self.c.Tr.Actions.Redo) - return true, self.refHelper.CheckoutRef(action.to, types.CheckoutRefOptions{ + return true, self.refsHelper.CheckoutRef(action.to, types.CheckoutRefOptions{ EnvVars: redoEnvVars, WaitingStatus: redoingStatus, }) @@ -224,7 +224,7 @@ type hardResetOptions struct { // only to be used in the undo flow for now (does an autostash) func (self *UndoController) hardResetWithAutoStash(commitSha string, options hardResetOptions) error { reset := func() error { - if err := self.refHelper.ResetToRef(commitSha, "hard", options.EnvVars); err != nil { + if err := self.refsHelper.ResetToRef(commitSha, "hard", options.EnvVars); err != nil { return self.c.Error(err) } return nil |