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

//! Conflicts popup rendering.

use crate::app::AppState;
use crate::ui::style::{self, Emphasis};
use ratatui::Frame;
use ratatui::layout::Rect;
use ratatui::widgets::{Clear, List, ListItem};
use super::utils;

/// Render the conflicts popup (simple list view).
pub fn render(frame: &mut Frame, area: Rect, state: &AppState) {
    let conflicts: Vec<&crate::git::parsers::status::StatusEntry> = state
        .status_entries
        .iter()
        .filter(|e| e.conflict)
        .collect();
    let max_idx = conflicts.len().saturating_sub(1);
    let selected = state.conflicts_popup_selected.min(max_idx);

    let items: Vec<ListItem> = if conflicts.is_empty() {
        vec![ListItem::new("No conflicts found").style(style::text(&state.theme, Emphasis::Muted))]
    } else {
        conflicts
            .iter()
            .enumerate()
            .map(|(i, entry)| {
                let style_item = if i == selected {
                    style::selection(&state.theme)
                } else {
                    style::body_style(&state.theme)
                };
                ListItem::new(entry.path.clone()).style(style_item)
            })
            .collect()
    };

    let title = format!(
        "Conflicts [{} / {}] (Enter=jump, o=open, Esc=close)",
        selected.saturating_add(1),
        conflicts.len().max(1)
    );
    let popup = utils::center_rect(50, 40, area);
    frame.render_widget(Clear, popup);

    let list = List::new(items)
        .style(style::body_style(&state.theme))
        .block(style::pane_block(&state.theme, title, true));

    frame.render_widget(list, popup);
}