Replace space characters with minus charcater when naming new branch names

pkg/gui/controllers/branches_controller.go

@@ -703,8 +703,9 @@ func (self *BranchesController) createResetMenu(selectedBranch *models.Branch) e
 func (self *BranchesController) rename(branch *models.Branch) error {
 	promptForNewName := func() error {
 		self.c.Prompt(types.PromptOpts{
-			Title:          self.c.Tr.NewBranchNamePrompt + " " + branch.Name + ":",
-			InitialContent: branch.Name,
+			Title:                   self.c.Tr.NewBranchNamePrompt + " " + branch.Name + ":",
+			InitialContent:          branch.Name,
+			ReplaceSpacesWithDashes: true,
 			HandleConfirm: func(newBranchName string) error {
 				self.c.LogAction(self.c.Tr.Actions.RenameBranch)
 				if err := self.c.Git().Branch.Rename(branch.Name, helpers.SanitizedBranchName(newBranchName)); err != nil {

pkg/gui/controllers/helpers/refs_helper.go

@@ -355,8 +355,9 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 	}
 
 	self.c.Prompt(types.PromptOpts{
-		Title:          message,
-		InitialContent: suggestedBranchName,
+		Title:                   message,
+		InitialContent:          suggestedBranchName,
+		ReplaceSpacesWithDashes: true,
 		HandleConfirm: func(response string) error {
 			self.c.LogAction(self.c.Tr.Actions.CreateBranch)
 			newBranchName := SanitizedBranchName(response)
@@ -418,8 +419,9 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error {
 		}
 
 		self.c.Prompt(types.PromptOpts{
-			Title:          prompt,
-			InitialContent: suggestedBranchName,
+			Title:                   prompt,
+			InitialContent:          suggestedBranchName,
+			ReplaceSpacesWithDashes: true,
 			HandleConfirm: func(response string) error {
 				self.c.LogAction(self.c.Tr.MoveCommitsToNewBranch)
 				newBranchName := SanitizedBranchName(response)

pkg/gui/editors.go

@@ -73,6 +73,15 @@ func (gui *Gui) commitDescriptionEditor(v *gocui.View, key gocui.Key, ch rune, m
 }
 
 func (gui *Gui) promptEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) bool {
+	// Replace spaces with dashes if the option is enabled
+	if key == gocui.KeySpace {
+		if opts := gui.State.GetCurrentPopupOpts(); opts != nil && opts.ReplaceSpacesWithDashes {
+			v.TextArea.TypeRune('-')
+			v.RenderTextArea()
+			return true
+		}
+	}
+
 	matched := gui.handleEditorKeypress(v.TextArea, key, ch, mod, false)
 
 	v.RenderTextArea()

pkg/gui/popup/popup_handler.go

@@ -131,17 +131,18 @@ func (self *PopupHandler) ConfirmIf(condition bool, opts types.ConfirmOpts) erro
 
 func (self *PopupHandler) Prompt(opts types.PromptOpts) {
 	self.createPopupPanelFn(context.Background(), types.CreatePopupPanelOpts{
-		Title:                  opts.Title,
-		Prompt:                 opts.InitialContent,
-		Editable:               true,
-		HandleConfirmPrompt:    opts.HandleConfirm,
-		HandleClose:            opts.HandleClose,
-		HandleDeleteSuggestion: opts.HandleDeleteSuggestion,
-		FindSuggestionsFunc:    opts.FindSuggestionsFunc,
-		AllowEditSuggestion:    opts.AllowEditSuggestion,
-		AllowEmptyInput:        opts.AllowEmptyInput,
-		PreserveWhitespace:     opts.PreserveWhitespace,
-		Mask:                   opts.Mask,
+		Title:                   opts.Title,
+		Prompt:                  opts.InitialContent,
+		Editable:                true,
+		HandleConfirmPrompt:     opts.HandleConfirm,
+		HandleClose:             opts.HandleClose,
+		HandleDeleteSuggestion:  opts.HandleDeleteSuggestion,
+		FindSuggestionsFunc:     opts.FindSuggestionsFunc,
+		AllowEditSuggestion:     opts.AllowEditSuggestion,
+		AllowEmptyInput:         opts.AllowEmptyInput,
+		PreserveWhitespace:      opts.PreserveWhitespace,
+		Mask:                    opts.Mask,
+		ReplaceSpacesWithDashes: opts.ReplaceSpacesWithDashes,
 	})
 }
 

pkg/gui/types/common.go

@@ -169,11 +169,12 @@ type CreatePopupPanelOpts struct {
 	HandleClose            func() error
 	HandleDeleteSuggestion func(int) error
 
-	FindSuggestionsFunc func(string) []*Suggestion
-	Mask                bool
-	AllowEditSuggestion bool
-	AllowEmptyInput     bool
-	PreserveWhitespace  bool
+	FindSuggestionsFunc     func(string) []*Suggestion
+	Mask                    bool
+	AllowEditSuggestion     bool
+	AllowEmptyInput         bool
+	PreserveWhitespace      bool
+	ReplaceSpacesWithDashes bool
 }
 
 type ConfirmOpts struct {
@@ -195,9 +196,10 @@ type PromptOpts struct {
 	AllowEmptyInput     bool
 	PreserveWhitespace  bool
 	// CAPTURE THIS
-	HandleClose            func() error
-	HandleDeleteSuggestion func(int) error
-	Mask                   bool
+	HandleClose             func() error
+	HandleDeleteSuggestion  func(int) error
+	Mask                    bool
+	ReplaceSpacesWithDashes bool
 }
 
 type MenuSection struct {