feat(branch): add delete branch functionality #350

rachartier · 2025-04-17T19:52:16Z

Hello,

I've added code to delete a branch by its name, or one selected by branch from Y.
Tell me what you think, and if I need to improve or change something.

Thanks for this amazing project.

altsem

Hi. Nice to see this addition!

I got some feedback. See if they make sense.
A few tests are needed too. I found the related ones here:

gitu/src/tests/mod.rs

Lines 260 to 288 in 947da1b

    
           mod checkout { 
        
               use super::*; 
        
               #[test] 
        
               pub(crate) fn checkout_menu() { 
        
                   let ctx = TestContext::setup_clone(); 
        
                   run(ctx.dir.path(), &["git", "branch", "other-branch"]); 
        
                   snapshot!(ctx, "Yjb"); 
        
               } 
        
               #[test] 
        
               pub(crate) fn switch_branch_selected() { 
        
                   let ctx = TestContext::setup_clone(); 
        
                   run(ctx.dir.path(), &["git", "branch", "other-branch"]); 
        
                   snapshot!(ctx, "Yjjbb<enter>"); 
        
               } 
        
               #[test] 
        
               pub(crate) fn switch_branch_input() { 
        
                   let ctx = TestContext::setup_clone(); 
        
                   run(ctx.dir.path(), &["git", "branch", "hi"]); 
        
                   snapshot!(ctx, "Yjjbbhi<enter>"); 
        
               } 
        
               #[test] 
        
               pub(crate) fn checkout_new_branch() { 
        
                   snapshot!(TestContext::setup_clone(), "bcf<esc>bcx<enter>"); 
        
               } 
        
           }

src/ops/delete_branch.rs

src/menu.rs

src/default_config.toml

rachartier · 2025-04-19T16:23:28Z

Does it seem better?

I've tried to implement all your suggestions. Thanks for the input!

Tell me what you think

altsem

Hey. Looks pretty good. I did some testing and found some things still. Good job though. Let's make it great :)

src/default_config.toml

src/ops/checkout.rs

src/tests/mod.rs

src/ops/checkout.rs

src/tests/mod.rs

src/ops/mod.rs

codecov · 2025-04-19T22:44:42Z

Codecov Report

Attention: Patch coverage is 80.72289% with 16 lines in your changes missing coverage. Please review.

Project coverage is 86.61%. Comparing base (5b0a23b) to head (a361099).
Report is 2 commits behind head on master.

Files with missing lines	Patch %	Lines
src/ops/checkout.rs	75.00%	10 Missing ⚠️
src/error.rs	0.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #350      +/-   ##
==========================================
- Coverage   86.63%   86.61%   -0.03%     
==========================================
  Files          66       66              
  Lines        6127     6237     +110     
==========================================
+ Hits         5308     5402      +94     
- Misses        819      835      +16

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rachartier · 2025-04-30T23:35:24Z

Thank you a lot for your prompt modifications. It made it a whole lot easier!

I've made a new version that you can review.

altsem

It looks pretty good! I have only two requests:

Consistency with "Discard" action

I found some more code while testing it out. This already existing action doesn't support deleting unmerged branches like the new one. It feels fine to have both of them, two different entry-points. K is always at-the-cursor, bK would prompt for a branch.
But perhaps they should share the underlying implementation?
https://github.com/altsem/gitu/blob/master/src/ops/discard.rs#L46-L57

Found here:
https://github.com/altsem/gitu/blob/master/src/ops/discard.rs#L46-L57

The generated changelog is off

gitu on  rachartier/master:master ❯ git cliff --unreleased
# Changelog

All notable changes to this project will be documented in this file.

## [unreleased]

### 🚀 Features

- Expose selected branch in state
- *(checkout)* Prompt before deleting unmerged branch
- *(config)* Add 'x' as default keybindings for branch operations
- *(branch)* Add delete branch functionality

see https://github.com/altsem/gitu/blob/master/docs/dev-tooling.md

Some ideas:

feat(branch): Deleting (unmerged) branches via the branch menu
feat(discard): Support for deleteing unmerged branches

altsem · 2025-05-01T08:19:47Z

src/ops/checkout.rs

+    if is_unmerged {
+        let branch_to_delete = branch.to_string();
+
+        match state.confirm(term, "Branch is unmerged. Really delete?") {


Suggested change

match state.confirm(term, "Branch is unmerged. Really delete?") {

match state.confirm(term, "Branch is unmerged. Really delete? (y or n)") {

Ugly, but...
Let's throw in a (y or n) to make it consistent with the other ones? I should've just taken the effort to bake it into state.confirm, perhaps later.

altsem · 2025-05-20T19:30:02Z

This was picked up in #367, I'll close this.
Gj though, we laid out the ground for it.

feat(branch): add delete branch functionality

8bc5206

altsem requested changes Apr 18, 2025

View reviewed changes

refactor: Improve branch deletion

bfdfa86

rachartier added 3 commits April 19, 2025 18:25

feat(config): add 'x' as default keybindings for branch operations

9f43cc8

refactor(checkout): move delete branch functionality

06cb89e

test(checkout): add tests for delete branch menu

a361099

altsem requested changes Apr 19, 2025

View reviewed changes

rachartier added 2 commits April 20, 2025 02:48

chore(config): change delete branch keybinding to 'K'

e7336f2

feat(checkout): prompt before deleting unmerged branch

f99c261

altsem mentioned this pull request Apr 22, 2025

refactor: add new state.prompt() function and simplify event handling #356

Merged

rachartier added 3 commits May 1, 2025 00:58

chore: fix merge conflicts

7ee7f19

feat: expose selected branch in state

d3072d2

test(checkout): add snapshot test after unmerged changes

4c55b0b

altsem requested changes May 1, 2025

View reviewed changes

altsem mentioned this pull request May 20, 2025

feat: add delete option to branch menu #367

Merged

altsem closed this May 20, 2025

	mod checkout {
	use super::*;

	#[test]
	pub(crate) fn checkout_menu() {
	let ctx = TestContext::setup_clone();
	run(ctx.dir.path(), &["git", "branch", "other-branch"]);
	snapshot!(ctx, "Yjb");
	}

	#[test]
	pub(crate) fn switch_branch_selected() {
	let ctx = TestContext::setup_clone();
	run(ctx.dir.path(), &["git", "branch", "other-branch"]);
	snapshot!(ctx, "Yjjbb<enter>");
	}

	#[test]
	pub(crate) fn switch_branch_input() {
	let ctx = TestContext::setup_clone();
	run(ctx.dir.path(), &["git", "branch", "hi"]);
	snapshot!(ctx, "Yjjbbhi<enter>");
	}

	#[test]
	pub(crate) fn checkout_new_branch() {
	snapshot!(TestContext::setup_clone(), "bcf<esc>bcx<enter>");
	}
	}

	match state.confirm(term, "Branch is unmerged. Really delete?") {
	match state.confirm(term, "Branch is unmerged. Really delete? (y or n)") {

feat(branch): add delete branch functionality #350

feat(branch): add delete branch functionality #350

Uh oh!

Conversation

rachartier commented Apr 17, 2025

Uh oh!

altsem left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rachartier commented Apr 19, 2025

Uh oh!

altsem left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 19, 2025

Codecov Report

Uh oh!

rachartier commented Apr 30, 2025

Uh oh!

altsem left a comment

Choose a reason for hiding this comment

Consistency with "Discard" action

The generated changelog is off

Uh oh!

altsem May 1, 2025

Choose a reason for hiding this comment

Uh oh!

altsem commented May 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants