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

//! Cherry-pick and revert commands.
//!
//! Handles applying commits from other branches and reverting commits.

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

/// Cherry-pick a commit
pub struct CherryPickCommand {
    pub hash: String,
}

impl Command for CherryPickCommand {
    #[instrument(skip(self, git, state), fields(hash = %self.hash))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetOpStatus(Some("cherry-picking…".into())));
        match git.cherry_pick(&state.repo_path, &self.hash) {
            Ok(_) => {
                new_state = reducer(new_state, Action::SetFeedback(Some(format!("Cherry-picked {}", self.hash))));
                new_state = reducer(
                    new_state,
                    Action::AppendOpLog(
                        "Cherry-pick done. If history was rewritten, push with --force-with-lease (P).".into(),
                    ),
                );
                new_state = reducer(
                    new_state,
                    Action::SetOpStatus(Some(
                        "Cherry-pick done. Push with --force-with-lease (P) if shared.".into(),
                    )),
                );
                new_state = reducer(new_state, Action::SetRefreshing(true));
                new_state = reducer(new_state, Action::AppendOpLog(format!("cherry-pick {}", self.hash)));
            }
            Err(e) => {
                new_state = reducer(new_state, Action::AppendOpLog(format!("cherry-pick error: {e}")));
                new_state = reducer(new_state, Action::SetStatusError(Some(format!("cherry-pick error: {e}"))));
            }
        }
        new_state = reducer(new_state, Action::SetOpStatus(None));
        Ok(CommandResult::StateUpdate(new_state))
    }
}

/// Revert a commit
pub struct RevertCommand {
    pub hash: String,
}

impl Command for RevertCommand {
    #[instrument(skip(self, git, state), fields(hash = %self.hash))]
    fn execute(
        &self,
        git: &GitService,
        state: &AppState,
    ) -> Result<CommandResult, CommandError> {
        let mut new_state = state.clone();
        new_state = reducer(new_state, Action::SetOpStatus(Some("reverting…".into())));
        match git.revert(&state.repo_path, &self.hash) {
            Ok(_) => {
                new_state = reducer(new_state, Action::SetFeedback(Some(format!("Reverted {}", self.hash))));
                new_state = reducer(
                    new_state,
                    Action::AppendOpLog(
                        "Revert done. If history was rewritten, push with --force-with-lease (P).".into(),
                    ),
                );
                new_state = reducer(
                    new_state,
                    Action::SetOpStatus(Some(
                        "Revert done. Push with --force-with-lease (P) if shared.".into(),
                    )),
                );
                new_state = reducer(new_state, Action::SetRefreshing(true));
                new_state = reducer(new_state, Action::AppendOpLog(format!("revert {}", self.hash)));
            }
            Err(e) => {
                new_state = reducer(new_state, Action::AppendOpLog(format!("revert error: {e}")));
                new_state = reducer(new_state, Action::SetStatusError(Some(format!("revert error: {e}"))));
            }
        }
        new_state = reducer(new_state, Action::SetOpStatus(None));
        Ok(CommandResult::StateUpdate(new_state))
    }
}