eazygit 0.5.1

A fast TUI for Git with staging, conflicts, rebase, and palette-first UX
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

use crate::commands::{Command, CommandResult};
use crate::services::GitService;
use crate::app::{AppState, Action, reducer};
use crate::errors::CommandError;
use tracing::instrument;

/// Command to checkout a branch
pub struct CheckoutBranchCommand {
    pub branch_name: String,
}

impl Command for CheckoutBranchCommand {
    #[instrument(skip(self, git, state), fields(branch = %self.branch_name))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        git.checkout_branch(&state.repo_path, &self.branch_name)
            .map_err(|e| CommandError::GitError(e))?;
        
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetFeedback(Some(
            format!("Switched to {}", self.branch_name)
        )));
        new_state.focus = crate::app::state::FocusPane::Status;
        new_state = reducer(new_state, Action::SetRefreshing(true));
        
        Ok(CommandResult::StateUpdate(new_state))
    }
}

/// Command to merge a branch into current
pub struct MergeBranchCommand {
    pub branch_name: String,
}

impl Command for MergeBranchCommand {
    #[instrument(skip(self, git, state), fields(branch = %self.branch_name))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        git.merge(&state.repo_path, &self.branch_name)
            .map_err(|e| CommandError::GitError(e))?;
        
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetFeedback(Some(
            format!("Merged {} successfully", self.branch_name)
        )));
        new_state.focus = crate::app::state::FocusPane::Status;
        new_state = reducer(new_state, Action::SetRefreshing(true));
        
        Ok(CommandResult::StateUpdate(new_state))
    }
}

/// Command to rebase current branch onto another
pub struct RebaseBranchCommand {
    pub branch_name: String,
}

impl Command for RebaseBranchCommand {
    #[instrument(skip(self, git, state), fields(branch = %self.branch_name))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        git.rebase(&state.repo_path, &self.branch_name)
            .map_err(|e| CommandError::GitError(e))?;
        
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetFeedback(Some(
            format!("Rebased onto {} successfully", self.branch_name)
        )));
        new_state.focus = crate::app::state::FocusPane::Status;
        new_state = reducer(new_state, Action::SetRefreshing(true));
        
        Ok(CommandResult::StateUpdate(new_state))
    }
}

/// Command to create a new branch
pub struct CreateBranchCommand {
    pub branch_name: String,
}

impl Command for CreateBranchCommand {
    #[instrument(skip(self, git, state), fields(branch = %self.branch_name))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        if self.branch_name.trim().is_empty() {
            let mut new_state = state.clone();
            new_state = reducer(new_state, Action::SetStatusError(Some("Branch name is empty".into())));
            return Ok(CommandResult::StateUpdate(new_state));
        }

        git.create_branch(&state.repo_path, &self.branch_name)
            .map_err(|e| CommandError::GitError(e))?;
        
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetFeedback(Some(
            format!("Created branch {}", self.branch_name)
        )));
        new_state.branch_create_mode = false;
        new_state.branch_name_input.clear();
        // Explicitly refresh branches list to show the new branch immediately
        new_state = reducer(new_state, Action::RefreshBranches);
        new_state = reducer(new_state, Action::SetRefreshing(true)); // Also trigger status refresh
        
        Ok(CommandResult::StateUpdate(new_state))
    }
}