giff 1.2.0

Visualizes the differences between the current HEAD and a specified branch in a git repository using a formatted table output in your terminal. The differences are displayed with color-coded additions and deletions for better readability.
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

mod event_loop;
mod rebase;
pub(crate) mod render;
mod syntax;
pub(crate) mod theme;
mod types;

#[cfg(test)]
mod tests;

use crate::diff::FileChanges;
use crossterm::{
    event::{DisableMouseCapture, EnableMouseCapture},
    execute,
    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
};
use ratatui::{prelude::*, Terminal};
use std::collections::HashMap;
use std::{error::Error, io};

use event_loop::run_ui;
use types::*;

/// Check if a syntax highlighting theme name is available in syntect.
pub fn is_valid_syntax_theme(name: &str) -> bool {
    syntax::THEME_SET.themes.contains_key(name)
}

/// Restore the terminal to its normal state. Best-effort: errors are ignored
/// because this is typically called during cleanup or panic recovery.
fn restore_terminal() {
    let _ = disable_raw_mode();
    let _ = execute!(io::stdout(), LeaveAlternateScreen, DisableMouseCapture);
}

pub fn run_app(
    file_changes: FileChanges,
    left_label: &str,
    right_label: &str,
    theme: theme::Theme,
    rebase_notification: Option<String>,
) -> Result<(), Box<dyn Error>> {
    // Install a panic hook that restores the terminal before printing the
    // panic message. Without this, a panic leaves the terminal in raw mode
    // with the alternate screen still active, making it unusable.
    let original_hook = std::panic::take_hook();
    std::panic::set_hook(Box::new(move |info| {
        restore_terminal();
        original_hook(info);
    }));

    // Setup terminal
    enable_raw_mode()?;
    let mut stdout = io::stdout();
    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
    let backend = CrosstermBackend::new(stdout);
    let mut terminal = Terminal::new(backend)?;

    // Create app state
    let mut file_names: Vec<String> = file_changes.keys().cloned().collect();
    file_names.sort();

    let mut scroll_positions = HashMap::new();
    for name in &file_names {
        scroll_positions.insert(name.clone(), 0usize);
    }

    // Build theme cycle: [initial, dark, light] with dedup
    let dark = theme::Theme::dark();
    let light = theme::Theme::light();
    let mut theme_cycle = vec![theme.clone()];
    if theme != dark {
        theme_cycle.push(dark);
    }
    if theme != light {
        theme_cycle.push(light);
    }

    let app = App {
        file_changes: &file_changes,
        left_label,
        right_label,
        current_file_idx: 0,
        file_names,
        scroll_positions,
        focused_pane: Pane::FileList,
        view_mode: ViewMode::SideBySide,
        app_mode: AppMode::Diff,
        rebase_changes: HashMap::new(),
        current_change_idx: 0,
        show_rebase_modal: rebase_notification.is_some(),
        rebase_notification,
        status_message: None,
        show_help_modal: false,
        theme,
        theme_cycle,
        theme_cycle_idx: 0,
    };

    // Run the main loop
    let res = run_ui(&mut terminal, app);

    // Restore terminal
    restore_terminal();
    terminal.show_cursor()?;

    match res {
        Ok(true) => {
            println!("Rebase completed successfully. Please re-run giff to see updated changes.");
        }
        Err(err) => {
            println!("{:?}", err);
        }
        _ => {}
    }

    Ok(())
}