gitorii 0.6.5

A human-first Git client with simplified commands, snapshots, multi-platform mirrors and built-in secret scanning
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
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202

use ratatui::{
    Frame,
    layout::{Constraint, Direction, Layout, Rect},
    style::{Modifier, Style},
    text::{Line, Span},
    widgets::{Block, Borders, Clear, List, ListItem, ListState},
};

use crate::tui::app::App;
use super::super::ui::{C_WHITE, C_SUBTLE, C_DIM, C_CYAN, C_YELLOW, C_GREEN, C_RED};

pub fn render(f: &mut Frame, app: &App, area: Rect) {
    let bc = app.brand_color();
    let focused = !app.sidebar_focused;

    let chunks = Layout::default()
        .direction(Direction::Horizontal)
        .constraints([Constraint::Percentage(62), Constraint::Percentage(38)])
        .split(area);

    // ── Commit list ───────────────────────────────────────────────────────────
    let inner_width = chunks[0].width.saturating_sub(4) as usize;
    let msg_width = inner_width.saturating_sub(32);

    let display_indices: Vec<usize> = if app.log.filtered.is_empty() && app.log.search_query.is_empty() {
        (0..app.commits.len()).collect()
    } else {
        app.log.filtered.clone()
    };

    // Graph prefixes are always rendered in the Log view (toggleable via
    // Settings → graph style if the user wants to fall back to ascii).
    let graph_on = !app.log.graph_rows.is_empty();
    let graph_width = if graph_on {
        app.log
            .graph_rows
            .iter()
            .map(|r| r.commit_line.chars().count())
            .max()
            .unwrap_or(0)
    } else {
        0
    };
    let msg_width = msg_width.saturating_sub(graph_width + 1);

    let items: Vec<ListItem> = display_indices.iter().map(|&i| {
        let c = &app.commits[i];
        let is_sel = i == app.log.idx;
        let style = if is_sel {
            Style::default().bg(app.selected_bg()).add_modifier(Modifier::BOLD)
        } else {
            Style::default()
        };
        let prefix = if is_sel { "█ " } else { "  " };
        let msg = truncate(&c.message, msg_width);
        let msg_color = if !app.log.search_query.is_empty() && !app.log.filtered.is_empty() {
            C_GREEN
        } else {
            C_WHITE
        };

        let mut spans = vec![
            Span::styled(prefix, Style::default().fg(bc)),
        ];
        if graph_on {
            let row = app.log.graph_rows.get(i);
            let glyphs = row.map(|r| r.commit_line.as_str()).unwrap_or("");
            let color = row
                .map(|r| ratatui::style::Color::Indexed(crate::graph::lane_color(r.lane)))
                .unwrap_or(C_CYAN);
            // Explicitly cancel BOLD here — the parent ListItem style applies
            // BOLD when selected, but many monospace fonts ship narrower
            // bullseye/half-circle glyphs in bold (or fall back to a thinner
            // proxy), making the selected commit glyph visibly shrink.
            spans.push(Span::styled(
                format!("{:<width$} ", glyphs, width = graph_width),
                Style::default().fg(color).remove_modifier(Modifier::BOLD),
            ));
        }
        spans.push(Span::styled(format!("{} ", c.hash), Style::default().fg(C_YELLOW)));
        spans.push(Span::styled(format!("{:<width$}", msg, width = msg_width), Style::default().fg(if is_sel { C_WHITE } else { msg_color })));
        spans.push(Span::styled(format!(" {:>10}", truncate(&c.author, 10)), Style::default().fg(C_CYAN)));
        spans.push(Span::styled(format!(" {}", c.time), Style::default().fg(C_DIM)));

        ListItem::new(Line::from(spans)).style(style)
    }).collect();

    let sel_pos = display_indices.iter().position(|&i| i == app.log.idx);
    let mut state = ListState::default();
    if let Some(pos) = sel_pos { state.select(Some(pos)); }

    let total = app.commits.len();
    let loaded_hint = if app.log.all_loaded { String::new() } else { "  ↓ more".to_string() };
    let title = if app.log.search_mode {
        format!(" log — search: {}█ ", app.log.search_query)
    } else if !app.log.search_query.is_empty() {
        format!(" log — \"{}\"  {} matches ", app.log.search_query, display_indices.len())
    } else {
        format!(" log — {} ({} commits){} ", app.branch, total, loaded_hint)
    };

    let title_color = if app.log.search_mode { C_YELLOW } else if focused { C_WHITE } else { bc };

    let list_block = Block::default()
        .title(Span::styled(title, Style::default().fg(title_color).add_modifier(
            if focused || app.log.search_mode { Modifier::BOLD } else { Modifier::empty() }
        )))
        .borders(Borders::ALL).border_type(app.border_type())
        .border_style(if focused { Style::default().fg(C_WHITE) } else { Style::default().fg(bc) });
    f.render_stateful_widget(List::new(items).block(list_block), chunks[0], &mut state);

    // ── Files panel ───────────────────────────────────────────────────────────
    let file_items: Vec<ListItem> = if app.log.commit_files.is_empty() {
        vec![ListItem::new(Span::styled("  no changes", Style::default().fg(C_DIM)))]
    } else {
        app.log.commit_files.iter().map(|f| {
            let (status_str, status_color) = match f.status {
                'A' => ("+ ", C_GREEN),
                'D' => ("- ", C_RED),
                'R' => ("→ ", C_CYAN),
                _   => ("~ ", C_YELLOW),
            };
            ListItem::new(Line::from(vec![
                Span::styled(status_str, Style::default().fg(status_color).add_modifier(Modifier::BOLD)),
                Span::styled(file_basename(&f.path), Style::default().fg(C_WHITE)),
                Span::styled(file_dir(&f.path), Style::default().fg(C_DIM)),
            ]))
        }).collect()
    };

    let commit_info = app.commits.get(app.log.idx).map(|c| {
        format!(" {} — {} files ", &c.hash, app.log.commit_files.len())
    }).unwrap_or_default();

    let files_block = Block::default()
        .title(Span::styled(commit_info, Style::default().fg(bc)))
        .borders(Borders::ALL).border_type(app.border_type())
        .border_style(Style::default().fg(bc));
    f.render_widget(List::new(file_items).block(files_block), chunks[1]);

    // ── Ops dropdown overlay ──────────────────────────────────────────────────
    if app.log.ops_mode {
        const OPS: &[(&str, bool)] = &[
            ("diff",       false),
            ("copy hash",  false),
            ("search",     false),
        ];
        let dropdown_w = 16u16;
        let dropdown_h = OPS.len() as u16 + 2;
        let sel_display_pos = sel_pos.unwrap_or(0);
        let entry_y = chunks[0].y + 1 + sel_display_pos as u16 + 1;
        let drop_y = if entry_y + dropdown_h < chunks[0].y + chunks[0].height {
            entry_y
        } else {
            chunks[0].y + chunks[0].height - dropdown_h
        };
        let drop_area = Rect::new(chunks[0].x + 3, drop_y, dropdown_w, dropdown_h);

        let drop_items: Vec<ListItem> = OPS.iter().enumerate().map(|(i, (label, danger))| {
            let is_sel = i == app.log.ops_idx;
            let color = if *danger { C_RED } else if is_sel { C_WHITE } else { C_SUBTLE };
            let prefix = if is_sel { "▶ " } else { "  " };
            let style = if is_sel {
                Style::default().bg(app.selected_bg()).add_modifier(Modifier::BOLD)
            } else {
                Style::default()
            };
            ListItem::new(Line::from(vec![
                Span::styled(prefix, Style::default().fg(bc)),
                Span::styled(*label, Style::default().fg(color)),
            ])).style(style)
        }).collect();

        let mut drop_state = ListState::default();
        drop_state.select(Some(app.log.ops_idx));

        let drop_block = Block::default()
            .borders(Borders::ALL).border_type(app.border_type())
            .border_style(Style::default().fg(bc));

        f.render_widget(Clear, drop_area);
        f.render_stateful_widget(List::new(drop_items).block(drop_block), drop_area, &mut drop_state);
    }
}

fn file_basename(path: &str) -> String {
    path.rfind('/').map(|i| path[i+1..].to_string()).unwrap_or_else(|| path.to_string())
}

fn file_dir(path: &str) -> String {
    match path.rfind('/') {
        Some(i) => format!("  {}/", &path[..i]),
        None    => String::new(),
    }
}

fn truncate(s: &str, max: usize) -> String {
    if max == 0 { return String::new(); }
    if s.chars().count() <= max { return s.to_string(); }
    let cut: String = s.chars().take(max.saturating_sub(1)).collect();
    format!("{}…", cut)
}