New PR comments

Signed-off-by: Gabriel Lanata <[email protected]>

pkg/gui/controllers/undo_controller.go

@@ -88,29 +88,31 @@ func (self *UndoController) reflogUndo() error {
 		}
 
 		switch action.kind {
-		case COMMIT:
-			self.c.Confirm(types.ConfirmOpts{
-				Title:  self.c.Tr.Actions.Undo,
-				Prompt: fmt.Sprintf(self.c.Tr.SoftResetAutostashPrompt, action.from),
-				HandleConfirm: func() error {
-					self.c.LogAction(self.c.Tr.Actions.Undo)
-					return self.resetWithAutoStash(action.from, resetOptions{
-						Mode:          "soft",
-						EnvVars:       undoEnvVars,
-						WaitingStatus: undoingStatus,
-					})
-				},
-			})
-			return true, nil
+		case COMMIT, REBASE:
+			var resetMode string
+			switch action.kind {
+			case COMMIT:
+				resetMode = "soft"
+			case REBASE:
+				resetMode = "hard"
+			}
+
+			var resetPrompt string
+			switch resetMode {
+			case "hard":
+				resetPrompt = self.c.Tr.HardResetAutostashPrompt
+			case "soft":
+				resetPrompt = self.c.Tr.SoftResetAutostashPrompt
+			}
 
-		case REBASE:
+			// 3. Use those in the confirm step
 			self.c.Confirm(types.ConfirmOpts{
 				Title:  self.c.Tr.Actions.Undo,
-				Prompt: fmt.Sprintf(self.c.Tr.HardResetAutostashPrompt, action.from),
+				Prompt: fmt.Sprintf(resetPrompt, action.from),
 				HandleConfirm: func() error {
 					self.c.LogAction(self.c.Tr.Actions.Undo)
 					return self.resetWithAutoStash(action.from, resetOptions{
-						Mode:          "hard",
+						Mode:          resetMode,
 						EnvVars:       undoEnvVars,
 						WaitingStatus: undoingStatus,
 					})
@@ -158,22 +160,7 @@ func (self *UndoController) reflogRedo() error {
 		}
 
 		switch action.kind {
-		case COMMIT:
-			self.c.Confirm(types.ConfirmOpts{
-				Title:  self.c.Tr.Actions.Redo,
-				Prompt: fmt.Sprintf(self.c.Tr.SoftResetAutostashPrompt, action.to),
-				HandleConfirm: func() error {
-					self.c.LogAction(self.c.Tr.Actions.Redo)
-					return self.resetWithAutoStash(action.to, resetOptions{
-						Mode:          "soft",
-						EnvVars:       redoEnvVars,
-						WaitingStatus: redoingStatus,
-					})
-				},
-			})
-			return true, nil
-
-		case REBASE:
+		case COMMIT, REBASE:
 			self.c.Confirm(types.ConfirmOpts{
 				Title:  self.c.Tr.Actions.Redo,
 				Prompt: fmt.Sprintf(self.c.Tr.HardResetAutostashPrompt, action.to),