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

//! Merge status commands.
//!
//! Handles checking merge status (ahead/behind) for branches.

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

/// Check merge status (ahead/behind)
pub struct CheckMergeStatusCommand {
    pub base: String,
}

impl Command for CheckMergeStatusCommand {
    #[instrument(skip(self, git, state), fields(base = %self.base))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetOpStatus(Some(format!("checking {}…", self.base))));
        match git.ahead_behind_remote(&state.repo_path, &self.base) {
            Ok((ahead, behind)) => {
                new_state = reducer(new_state, Action::SetMergeAhead(Some(ahead)));
                new_state = reducer(new_state, Action::AppendOpLog(format!("{} ahead {}, behind {}", self.base, ahead, behind)));
                new_state = reducer(new_state, Action::SetFeedback(Some(format!("{} ahead {}, behind {}", self.base, ahead, behind))));
                new_state = reducer(
                    new_state,
                    Action::AppendMergeLog(format!("{} ahead {}, behind {}", self.base, ahead, behind)),
                );
            }
            Err(e) => {
                new_state = reducer(new_state, Action::AppendOpLog(format!("merge check error: {e}")));
                new_state = reducer(new_state, Action::SetStatusError(Some(format!("merge check error: {e}"))));
                new_state = reducer(new_state, Action::AppendMergeLog(format!("{}: error {}", self.base, e)));
            }
        }
        new_state = reducer(new_state, Action::SetOpStatus(None));
        Ok(CommandResult::StateUpdate(new_state))
    }
}