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

//! Conflict resolution command definitions.
//!
//! Commands for navigating and resolving merge conflicts.

use  crate::palette::command::{CommandCategory, CommandDef, CommandId};
use crate::app::Action;

pub fn conflicts_commands() -> Vec<CommandDef> {
    vec![
        CommandDef {
            id: CommandId::ConflictsOnly,
            name: "Conflicts only",
            key: "cf",
            category: CommandCategory::Conflicts,
            description: "Filter to show only conflicted files",
            action_factory: |_| Some(Action::FilterConflictsOnly),
            is_enabled: |_| true,
            keywords: &["conflicts", "only", "filter"],
        },
        CommandDef {
            id: CommandId::ConflictsPopup,
            name: "Conflicts popup",
            key: "cfp",
            category: CommandCategory::Conflicts,
            description: "Show conflicts popup",
            action_factory: |_| Some(Action::ShowConflictsPopup),
            is_enabled: |_| true,
            keywords: &["conflicts", "popup", "show"],
        },
        CommandDef {
            id: CommandId::ConflictNext,
            name: "Next conflict",
            key: "cn",
            category: CommandCategory::Conflicts,
            description: "Jump to next conflict",
            action_factory: |_| Some(Action::StatusNextConflict),
            is_enabled: |_| true,
            keywords: &["conflict", "next"],
        },
        CommandDef {
            id: CommandId::ConflictPrev,
            name: "Prev conflict",
            key: "cp",
            category: CommandCategory::Conflicts,
            description: "Jump to previous conflict",
            action_factory: |_| Some(Action::StatusPrevConflict),
            is_enabled: |_| true,
            keywords: &["conflict", "prev", "previous"],
        },
        CommandDef {
            id: CommandId::ConflictsPopup, // Reusing ConflictsPopup ID since ShowConflictsGuided doesn't exist in CommandId enum
            name: "Show conflicts guided",
            key: "cfg",
            category: CommandCategory::Conflicts,
            description: "Show guided conflict resolution",
            action_factory: |_| Some(Action::ShowConflictsGuided),
            is_enabled: |_| true,
            keywords: &["conflicts", "guided", "help"],
        },
    ]
}