Add confirmation for hard reset (#4704)

- **PR Description**

Doing a hard reset is really destructive because it loses all
uncommitted changes, so add a confirmation in case there are any.

Fixes #3085
Fixes #3709
Fixes #4688

Author: stefanhaller

pkg/gui/controllers/branches_controller.go

@@ -724,17 +724,11 @@ func (self *BranchesController) rename(branch *models.Branch) error {
 	// I could do an explicit check here for whether the branch is tracking a remote branch
 	// but if we've selected it we'll already know that via Pullables and Pullables.
 	// Bit of a hack but I'm lazy.
-	if !branch.IsTrackingRemote() {
-		return promptForNewName()
-	}
-
-	self.c.Confirm(types.ConfirmOpts{
+	return self.c.ConfirmIf(branch.IsTrackingRemote(), types.ConfirmOpts{
 		Title:         self.c.Tr.RenameBranch,
 		Prompt:        self.c.Tr.RenameBranchWarning,
 		HandleConfirm: promptForNewName,
 	})
-
-	return nil
 }
 
 func (self *BranchesController) newBranch(selectedBranch *models.Branch) error {

pkg/gui/controllers/commits_files_controller.go

@@ -426,20 +426,18 @@ func (self *CommitFilesController) toggleForPatch(selectedNodes []*filetree.Comm
 	}
 
 	from, to, reverse := self.currentFromToReverseForPatchBuilding()
-	if self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse) {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.DiscardPatch,
-			Prompt: self.c.Tr.DiscardPatchConfirm,
-			HandleConfirm: func() error {
+	mustDiscardPatch := self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse)
+	return self.c.ConfirmIf(mustDiscardPatch, types.ConfirmOpts{
+		Title:  self.c.Tr.DiscardPatch,
+		Prompt: self.c.Tr.DiscardPatchConfirm,
+		HandleConfirm: func() error {
+			if mustDiscardPatch {
 				self.c.Git().Patch.PatchBuilder.Reset()
-				return toggle()
-			},
-		})
-
-		return nil
-	}
+			}
 
-	return toggle()
+			return toggle()
+		},
+	})
 }
 
 func (self *CommitFilesController) toggleAllForPatch(_ *filetree.CommitFileNode) error {
@@ -479,32 +477,26 @@ func (self *CommitFilesController) enterCommitFile(node *filetree.CommitFileNode
 			keybindings.Label(self.c.UserConfig().Keybinding.Universal.IncreaseContextInDiffView))
 	}
 
-	enterTheFile := func() error {
-		if !self.c.Git().Patch.PatchBuilder.Active() {
-			if err := self.startPatchBuilder(); err != nil {
-				return err
-			}
-		}
-
-		self.c.Context().Push(self.c.Contexts().CustomPatchBuilder, opts)
-		return nil
-	}
-
 	from, to, reverse := self.currentFromToReverseForPatchBuilding()
-	if self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse) {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.DiscardPatch,
-			Prompt: self.c.Tr.DiscardPatchConfirm,
-			HandleConfirm: func() error {
+	mustDiscardPatch := self.c.Git().Patch.PatchBuilder.Active() && self.c.Git().Patch.PatchBuilder.NewPatchRequired(from, to, reverse)
+	return self.c.ConfirmIf(mustDiscardPatch, types.ConfirmOpts{
+		Title:  self.c.Tr.DiscardPatch,
+		Prompt: self.c.Tr.DiscardPatchConfirm,
+		HandleConfirm: func() error {
+			if mustDiscardPatch {
 				self.c.Git().Patch.PatchBuilder.Reset()
-				return enterTheFile()
-			},
-		})
+			}
 
-		return nil
-	}
+			if !self.c.Git().Patch.PatchBuilder.Active() {
+				if err := self.startPatchBuilder(); err != nil {
+					return err
+				}
+			}
 
-	return enterTheFile()
+			self.c.Context().Push(self.c.Contexts().CustomPatchBuilder, opts)
+			return nil
+		},
+	})
 }
 
 func (self *CommitFilesController) handleToggleCommitFileDirCollapsed(node *filetree.CommitFileNode) error {

pkg/gui/controllers/custom_patch_options_menu_action.go

@@ -173,28 +173,19 @@ func (self *CustomPatchOptionsMenuAction) handleMovePatchIntoWorkingTree() error
 
 	self.returnFocusFromPatchExplorerIfNecessary()
 
-	pull := func(stash bool) error {
-		return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
-			commitIndex := self.getPatchCommitIndex()
-			self.c.LogAction(self.c.Tr.Actions.MovePatchIntoIndex)
-			err := self.c.Git().Patch.MovePatchIntoIndex(self.c.Model().Commits, commitIndex, stash)
-			return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
-		})
-	}
-
-	if self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.MustStashTitle,
-			Prompt: self.c.Tr.MustStashWarning,
-			HandleConfirm: func() error {
-				return pull(true)
-			},
-		})
-
-		return nil
-	}
-
-	return pull(false)
+	mustStash := self.c.Helpers().WorkingTree.IsWorkingTreeDirty()
+	return self.c.ConfirmIf(mustStash, types.ConfirmOpts{
+		Title:  self.c.Tr.MustStashTitle,
+		Prompt: self.c.Tr.MustStashWarning,
+		HandleConfirm: func() error {
+			return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
+				commitIndex := self.getPatchCommitIndex()
+				self.c.LogAction(self.c.Tr.Actions.MovePatchIntoIndex)
+				err := self.c.Git().Patch.MovePatchIntoIndex(self.c.Model().Commits, commitIndex, mustStash)
+				return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
+			})
+		},
+	})
 }
 
 func (self *CustomPatchOptionsMenuAction) handlePullPatchIntoNewCommit() error {
@@ -272,40 +263,31 @@ func (self *CustomPatchOptionsMenuAction) handleApplyPatch(reverse bool) error {
 
 	affectedUnstagedFiles := self.getAffectedUnstagedFiles()
 
-	apply := func() error {
-		action := self.c.Tr.Actions.ApplyPatch
-		if reverse {
-			action = "Apply patch in reverse"
-		}
-		self.c.LogAction(action)
-
-		if len(affectedUnstagedFiles) > 0 {
-			if err := self.c.Git().WorkingTree.StageFiles(affectedUnstagedFiles, nil); err != nil {
-				return err
+	mustStageFiles := len(affectedUnstagedFiles) > 0
+	return self.c.ConfirmIf(mustStageFiles, types.ConfirmOpts{
+		Title:  self.c.Tr.MustStageFilesAffectedByPatchTitle,
+		Prompt: self.c.Tr.MustStageFilesAffectedByPatchWarning,
+		HandleConfirm: func() error {
+			action := self.c.Tr.Actions.ApplyPatch
+			if reverse {
+				action = "Apply patch in reverse"
 			}
-		}
+			self.c.LogAction(action)
 
-		if err := self.c.Git().Patch.ApplyCustomPatch(reverse, true); err != nil {
-			return err
-		}
-
-		self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
-		return nil
-	}
-
-	if len(affectedUnstagedFiles) > 0 {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.MustStageFilesAffectedByPatchTitle,
-			Prompt: self.c.Tr.MustStageFilesAffectedByPatchWarning,
-			HandleConfirm: func() error {
-				return apply()
-			},
-		})
+			if mustStageFiles {
+				if err := self.c.Git().WorkingTree.StageFiles(affectedUnstagedFiles, nil); err != nil {
+					return err
+				}
+			}
 
-		return nil
-	}
+			if err := self.c.Git().Patch.ApplyCustomPatch(reverse, true); err != nil {
+				return err
+			}
 
-	return apply()
+			self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
+			return nil
+		},
+	})
 }
 
 func (self *CustomPatchOptionsMenuAction) copyPatchToClipboard() error {

pkg/gui/controllers/files_controller.go

@@ -794,19 +794,17 @@ func (self *FilesController) handleAmendCommitPress() error {
 				},
 			},
 		})
-	} else if !self.c.UserConfig().Gui.SkipAmendWarning {
-		self.c.Confirm(types.ConfirmOpts{
+	}
+
+	return self.c.ConfirmIf(!self.c.UserConfig().Gui.SkipAmendWarning,
+		types.ConfirmOpts{
 			Title:  self.c.Tr.AmendLastCommitTitle,
 			Prompt: self.c.Tr.SureToAmend,
 			HandleConfirm: func() error {
 				return doAmend()
 			},
-		})
-
-		return nil
-	}
-
-	return doAmend()
+		},
+	)
 }
 
 func (self *FilesController) isResolvingConflicts() bool {

pkg/gui/controllers/helpers/commits_helper.go

@@ -256,20 +256,13 @@ func (self *CommitsHelper) pasteCommitMessageFromClipboard() error {
 		return nil
 	}
 
-	if currentMessage := self.JoinCommitMessageAndUnwrappedDescription(); currentMessage == "" {
-		self.SetMessageAndDescriptionInView(message)
-		return nil
-	}
-
-	// Confirm before overwriting the commit message
-	self.c.Confirm(types.ConfirmOpts{
+	currentMessage := self.JoinCommitMessageAndUnwrappedDescription()
+	return self.c.ConfirmIf(currentMessage != "", types.ConfirmOpts{
 		Title:  self.c.Tr.PasteCommitMessageFromClipboard,
 		Prompt: self.c.Tr.SurePasteCommitMessage,
 		HandleConfirm: func() error {
 			self.SetMessageAndDescriptionInView(message)
 			return nil
 		},
 	})
-
-	return nil
 }

pkg/gui/controllers/helpers/fixup_helper.go

@@ -128,32 +128,22 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error {
 	// and that's the one we want to select.
 	_, index, _ := self.findCommit(commits, hashGroups[NOT_MERGED][0])
 
-	doIt := func() error {
-		if !hasStagedChanges {
-			if err := self.c.Git().WorkingTree.StageAll(); err != nil {
-				return err
+	return self.c.ConfirmIf(warnAboutAddedLines, types.ConfirmOpts{
+		Title:  self.c.Tr.FindBaseCommitForFixup,
+		Prompt: self.c.Tr.HunksWithOnlyAddedLinesWarning,
+		HandleConfirm: func() error {
+			if !hasStagedChanges {
+				if err := self.c.Git().WorkingTree.StageAll(); err != nil {
+					return err
+				}
+				self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}})
 			}
-			self.c.Refresh(types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.FILES}})
-		}
-
-		self.c.Contexts().LocalCommits.SetSelection(index)
-		self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
-		return nil
-	}
 
-	if warnAboutAddedLines {
-		self.c.Confirm(types.ConfirmOpts{
-			Title:  self.c.Tr.FindBaseCommitForFixup,
-			Prompt: self.c.Tr.HunksWithOnlyAddedLinesWarning,
-			HandleConfirm: func() error {
-				return doIt()
-			},
-		})
-
-		return nil
-	}
-
-	return doIt()
+			self.c.Contexts().LocalCommits.SetSelection(index)
+			self.c.Context().Push(self.c.Contexts().LocalCommits, types.OnFocusOpts{})
+			return nil
+		},
+	})
 }
 
 func (self *FixupHelper) getDiff() (string, bool, error) {

pkg/gui/controllers/helpers/refs_helper.go

@@ -248,8 +248,15 @@ func (self *RefsHelper) CreateGitResetMenu(name string, ref string) error {
 				style.FgRed.Sprintf("reset --%s %s", row.strength, name),
 			},
 			OnPress: func() error {
-				self.c.LogAction("Reset")
-				return self.ResetToRef(ref, row.strength, []string{})
+				return self.c.ConfirmIf(row.strength == "hard" && IsWorkingTreeDirty(self.c.Model().Files),
+					types.ConfirmOpts{
+						Title:  self.c.Tr.Actions.HardReset,
+						Prompt: self.c.Tr.ResetHardConfirmation,
+						HandleConfirm: func() error {
+							self.c.LogAction("Reset")
+							return self.ResetToRef(ref, row.strength, []string{})
+						},
+					})
 			},
 			Key:     row.key,
 			Tooltip: row.tooltip,

pkg/gui/controllers/helpers/tags_helper.go

@@ -23,43 +23,34 @@ func NewTagsHelper(c *HelperCommon, commitsHelper *CommitsHelper, gpg *GpgHelper
 }
 
 func (self *TagsHelper) OpenCreateTagPrompt(ref string, onCreate func()) error {
-	doCreateTag := func(tagName string, description string, force bool) error {
-		var command *oscommands.CmdObj
-		if description != "" || self.c.Git().Config.GetGpgTagSign() {
-			self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
-			command = self.c.Git().Tag.CreateAnnotatedObj(tagName, ref, description, force)
-		} else {
-			self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
-			command = self.c.Git().Tag.CreateLightweightObj(tagName, ref, force)
-		}
-
-		return self.gpg.WithGpgHandling(command, git_commands.TagGpgSign, self.c.Tr.CreatingTag, func() error {
-			return nil
-		}, []types.RefreshableView{types.COMMITS, types.TAGS})
-	}
-
 	onConfirm := func(tagName string, description string) error {
-		if self.c.Git().Tag.HasTag(tagName) {
-			prompt := utils.ResolvePlaceholderString(
-				self.c.Tr.ForceTagPrompt,
-				map[string]string{
-					"tagName":    tagName,
-					"cancelKey":  self.c.UserConfig().Keybinding.Universal.Return,
-					"confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm,
-				},
-			)
-			self.c.Confirm(types.ConfirmOpts{
-				Title:  self.c.Tr.ForceTag,
-				Prompt: prompt,
-				HandleConfirm: func() error {
-					return doCreateTag(tagName, description, true)
-				},
-			})
-
-			return nil
-		}
+		prompt := utils.ResolvePlaceholderString(
+			self.c.Tr.ForceTagPrompt,
+			map[string]string{
+				"tagName":    tagName,
+				"cancelKey":  self.c.UserConfig().Keybinding.Universal.Return,
+				"confirmKey": self.c.UserConfig().Keybinding.Universal.Confirm,
+			},
+		)
+		force := self.c.Git().Tag.HasTag(tagName)
+		return self.c.ConfirmIf(force, types.ConfirmOpts{
+			Title:  self.c.Tr.ForceTag,
+			Prompt: prompt,
+			HandleConfirm: func() error {
+				var command *oscommands.CmdObj
+				if description != "" || self.c.Git().Config.GetGpgTagSign() {
+					self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
+					command = self.c.Git().Tag.CreateAnnotatedObj(tagName, ref, description, force)
+				} else {
+					self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
+					command = self.c.Git().Tag.CreateLightweightObj(tagName, ref, force)
+				}
 
-		return doCreateTag(tagName, description, false)
+				return self.gpg.WithGpgHandling(command, git_commands.TagGpgSign, self.c.Tr.CreatingTag, func() error {
+					return nil
+				}, []types.RefreshableView{types.COMMITS, types.TAGS})
+			},
+		})
 	}
 
 	self.commitsHelper.OpenCommitMessagePanel(