Skip to content

Automatically convert spaces to dashes in branch names #2916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pBouillon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Automatically convert spaces to dashes in branch names #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions src/popups/create_branch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ use crate::{
};
use anyhow::Result;
use asyncgit::sync::{self, RepoPathRef};
use crossterm::event::Event;
use crossterm::event::{Event, KeyCode, KeyEvent};
use easy_cast::Cast;
use ratatui::{layout::Rect, widgets::Paragraph, Frame};
use std::borrow::Cow;

pub struct CreateBranchPopup {
repo: RepoPathRef,
Expand All @@ -34,6 +35,13 @@ impl DrawableComponent for CreateBranchPopup {
}
}

const fn normalize_branch_name_char(c: char) -> char {
Copy link
Copy Markdown
Collaborator

@extrawurst extrawurst Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets not duplicate this code

Copy link
Copy Markdown
Author

@pBouillon pBouillon Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, where would you like it being moved to in order to keep things organized in the repo?

match c {
' ' => '-',
c => c,
}
}

impl Component for CreateBranchPopup {
fn commands(
&self,
Expand All @@ -57,11 +65,28 @@ impl Component for CreateBranchPopup {

fn event(&mut self, ev: &Event) -> Result<EventState> {
if self.is_visible() {
if self.input.event(ev)?.is_consumed() {
let ev = match ev {
Event::Key(KeyEvent {
code: KeyCode::Char(c),
modifiers,
kind,
state,
}) => Cow::Owned(Event::Key(KeyEvent {
code: KeyCode::Char(normalize_branch_name_char(
*c,
)),
modifiers: *modifiers,
kind: *kind,
state: *state,
})),
_ => Cow::Borrowed(ev),
};

if self.input.event(&ev)?.is_consumed() {
return Ok(EventState::Consumed);
}

if let Event::Key(e) = ev {
if let Event::Key(e) = ev.as_ref() {
if key_match(e, self.key_config.keys.enter) {
self.create_branch();
}
Expand Down Expand Up @@ -168,3 +193,19 @@ impl CreateBranchPopup {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_spaces_are_replaced_by_dashes_in_branch_name() {
let input = "feature/auto replace spaces in branch name";
let output: String =
input.chars().map(normalize_branch_name_char).collect();
assert_eq!(
output,
"feature/auto-replace-spaces-in-branch-name"
);
}
}
47 changes: 44 additions & 3 deletions src/popups/rename_branch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ use crate::{
};
use anyhow::Result;
use asyncgit::sync::{self, RepoPathRef};
use crossterm::event::Event;
use crossterm::event::{Event, KeyCode, KeyEvent};
use easy_cast::Cast;
use ratatui::{layout::Rect, widgets::Paragraph, Frame};
use std::borrow::Cow;

pub struct RenameBranchPopup {
repo: RepoPathRef,
Expand All @@ -34,6 +35,13 @@ impl DrawableComponent for RenameBranchPopup {
}
}

const fn normalize_branch_name_char(c: char) -> char {
match c {
' ' => '-',
c => c,
}
}

impl Component for RenameBranchPopup {
fn commands(
&self,
Expand All @@ -57,11 +65,28 @@ impl Component for RenameBranchPopup {

fn event(&mut self, ev: &Event) -> Result<EventState> {
if self.is_visible() {
if self.input.event(ev)?.is_consumed() {
let ev = match ev {
Event::Key(KeyEvent {
code: KeyCode::Char(c),
modifiers,
kind,
state,
}) => Cow::Owned(Event::Key(KeyEvent {
code: KeyCode::Char(normalize_branch_name_char(
*c,
)),
modifiers: *modifiers,
kind: *kind,
state: *state,
})),
_ => Cow::Borrowed(ev),
};

if self.input.event(&ev)?.is_consumed() {
return Ok(EventState::Consumed);
}

if let Event::Key(e) = ev {
if let Event::Key(e) = ev.as_ref() {
if key_match(e, self.key_config.keys.enter) {
self.rename_branch();
}
Expand Down Expand Up @@ -186,3 +211,19 @@ impl RenameBranchPopup {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_spaces_are_replaced_by_dashes_in_branch_name() {
let input = "feature/auto replace spaces in branch name";
let output: String =
input.chars().map(normalize_branch_name_char).collect();
assert_eq!(
output,
"feature/auto-replace-spaces-in-branch-name"
);
}
}
Loading