glog-tui 0.1.2

An interactive git log and git show browser
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
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
use std::collections::{HashMap, HashSet, VecDeque};

use crate::{
    diff::{self, FileSection},
    git::{self, Commit, CommitKind},
};

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum Mode {
    Log,
    Show,
}

#[derive(Clone, Debug)]
pub struct ShowRow {
    pub text: String,
    pub source: usize,
    pub file: Option<usize>,
    pub folded: bool,
    pub fold_separator: bool,
}

pub struct App {
    pub commits: Vec<Commit>,
    pub selected: usize,
    pub mode: Mode,
    pub log_offset: usize,
    pub show_offset: usize,
    pub show_text: String,
    pub show_rows: Vec<ShowRow>,
    pub status: Option<String>,
    pub search: Option<String>,
    pub search_input: Option<String>,
    pub search_reverse: bool,
    pub search_match: Option<(Mode, usize)>,
    pub show_help: bool,
    pub log_row_origin: u16,
    pub visible_log_rows: Vec<Option<usize>>,
    pub show_row_origin: u16,
    pub visible_show_rows: usize,
    pub watch: bool,
    pub context: String,
    pub log_tab_start: u16,
    pub log_tab_end: u16,
    pub show_tab_start: u16,
    pub show_tab_end: u16,
    pub quit: bool,
    cache: HashMap<String, String>,
    cache_order: VecDeque<String>,
    show_files: Vec<FileSection>,
    expanded_folds: HashSet<String>,
}

impl App {
    pub fn new(commits: Vec<Commit>) -> Self {
        Self {
            commits,
            selected: 0,
            mode: Mode::Log,
            log_offset: 0,
            show_offset: 0,
            show_text: String::new(),
            show_rows: Vec::new(),
            status: None,
            search: None,
            search_input: None,
            search_reverse: false,
            search_match: None,
            show_help: false,
            log_row_origin: 0,
            visible_log_rows: Vec::new(),
            show_row_origin: 0,
            visible_show_rows: 0,
            watch: false,
            context: String::new(),
            log_tab_start: 7,
            log_tab_end: 12,
            show_tab_start: 13,
            show_tab_end: 19,
            quit: false,
            cache: HashMap::new(),
            cache_order: VecDeque::new(),
            show_files: Vec::new(),
            expanded_folds: HashSet::new(),
        }
    }

    pub fn switch_mode(&mut self) {
        self.mode = if self.mode == Mode::Log {
            Mode::Show
        } else {
            Mode::Log
        };
        if self.mode == Mode::Show {
            self.load_show();
        }
    }

    pub fn move_by(&mut self, delta: isize, page: usize) {
        match self.mode {
            Mode::Log => {
                if self.commits.is_empty() {
                    return;
                }
                let amount = if delta.abs() == 1 { 1 } else { page.max(1) };
                self.selected = if delta < 0 {
                    self.selected.saturating_sub(amount)
                } else {
                    (self.selected + amount).min(self.commits.len() - 1)
                };
            }
            Mode::Show => {
                let amount = if delta.abs() == 1 { 1 } else { page.max(1) };
                self.show_offset = if delta < 0 {
                    self.show_offset.saturating_sub(amount)
                } else {
                    self.show_offset.saturating_add(amount)
                };
            }
        }
    }

    pub fn move_selection(&mut self, delta: isize) -> bool {
        if self.commits.is_empty() {
            return false;
        }
        let selected = if delta < 0 {
            self.selected.saturating_sub(1)
        } else {
            (self.selected + 1).min(self.commits.len() - 1)
        };
        if selected == self.selected {
            return false;
        }
        self.selected = selected;
        true
    }

    pub fn replace_commits(&mut self, commits: Vec<Commit>) {
        let selected = self
            .commits
            .get(self.selected)
            .map(|commit| (commit.kind, commit.hash.clone()));
        self.commits = commits;
        self.selected = selected
            .and_then(|key| {
                self.commits
                    .iter()
                    .position(|commit| commit.kind == key.0 && commit.hash == key.1)
            })
            .unwrap_or_else(|| self.selected.min(self.commits.len().saturating_sub(1)));
        self.log_offset = 0;
        if self.mode == Mode::Show {
            self.show_offset = 0;
            self.load_show();
        }
    }

    pub fn top(&mut self) {
        match self.mode {
            Mode::Log => self.selected = 0,
            Mode::Show => self.show_offset = 0,
        }
    }
    pub fn bottom(&mut self) {
        match self.mode {
            Mode::Log => self.selected = self.commits.len().saturating_sub(1),
            Mode::Show => self.show_offset = self.show_rows.len().saturating_sub(1),
        }
    }

    pub fn load_show(&mut self) {
        let Some(commit) = self.commits.get(self.selected).cloned() else {
            self.show_text = "No commits matched the supplied arguments.".to_owned();
            return;
        };
        if commit.kind == CommitKind::Revision {
            if let Some(text) = self.cache.get(&commit.hash) {
                let changed = self.show_text != *text;
                self.show_text = text.clone();
                if changed {
                    self.reset_show_folds();
                }
                return;
            }
        }
        self.show_offset = 0;
        match git::show(&commit) {
            Ok(text) => {
                self.show_text = text.clone();
                self.reset_show_folds();
                if commit.kind == CommitKind::Revision {
                    self.insert_cache(commit.hash, text);
                }
                self.status = None;
            }
            Err(error) => {
                self.show_text = error.clone();
                self.reset_show_folds();
                self.status = Some(error);
            }
        }
    }

    fn reset_show_folds(&mut self) {
        self.show_files = diff::file_sections(&self.show_text);
        self.expanded_folds.clear();
        self.rebuild_show_rows();
    }

    pub fn ensure_show_rows(&mut self) {
        if self.show_rows.is_empty() && !self.show_text.is_empty() {
            self.reset_show_folds();
        }
    }

    fn rebuild_show_rows(&mut self) {
        let lines: Vec<_> = self.show_text.lines().collect();
        let mut rows = Vec::new();
        let mut source = 0;
        for (file_index, file) in self.show_files.iter().enumerate() {
            for (index, line) in lines[source..file.start].iter().enumerate() {
                rows.push(ShowRow {
                    text: (*line).to_owned(),
                    source: source + index,
                    file: None,
                    folded: false,
                    fold_separator: false,
                });
            }
            if (file.lockfile || file.untracked) && !self.expanded_folds.contains(&file.path) {
                rows.push(ShowRow {
                    text: String::new(),
                    source: file.start,
                    file: Some(file_index),
                    folded: false,
                    fold_separator: true,
                });
                rows.push(ShowRow {
                    text: format!(
                        "â–¶ {}{} ({}; Enter/z to expand)",
                        file.path,
                        if file.lazy_untracked_path.is_some() {
                            String::new()
                        } else {
                            format!(" — +{} −{}", file.additions, file.deletions)
                        },
                        if file.untracked {
                            if file.lazy_untracked_path.is_some() {
                                "untracked file, contents not loaded"
                            } else {
                                "untracked file folded"
                            }
                        } else {
                            "lockfile folded"
                        }
                    ),
                    source: file.start,
                    file: Some(file_index),
                    folded: true,
                    fold_separator: false,
                });
                rows.push(ShowRow {
                    text: String::new(),
                    source: file.start,
                    file: Some(file_index),
                    folded: false,
                    fold_separator: true,
                });
            } else {
                for (index, line) in lines[file.start..file.end].iter().enumerate() {
                    rows.push(ShowRow {
                        text: (*line).to_owned(),
                        source: file.start + index,
                        file: Some(file_index),
                        folded: false,
                        fold_separator: false,
                    });
                }
            }
            source = file.end;
        }
        for (index, line) in lines[source..].iter().enumerate() {
            rows.push(ShowRow {
                text: (*line).to_owned(),
                source: source + index,
                file: None,
                folded: false,
                fold_separator: false,
            });
        }
        self.show_rows = rows;
        self.show_offset = self.show_offset.min(self.show_rows.len().saturating_sub(1));
    }

    pub fn toggle_show_file(&mut self) {
        let Some(file_index) = self
            .show_rows
            .get(self.show_offset)
            .and_then(|row| row.file)
        else {
            return;
        };
        let file = &self.show_files[file_index];
        if !file.lockfile && !file.untracked {
            return;
        }
        let path = file.path.clone();
        let source = file.start;
        let loaded = if let Some(untracked_path) = file.lazy_untracked_path.clone() {
            match git::show_untracked(&untracked_path) {
                Ok(text) => {
                    let mut lines: Vec<_> = self.show_text.lines().map(str::to_owned).collect();
                    lines.splice(file.start..file.end, text.lines().map(str::to_owned));
                    self.show_text = lines.join("\n");
                    self.show_text.push('\n');
                    self.show_files = diff::file_sections(&self.show_text);
                    self.expanded_folds.insert(path.clone());
                    self.status = None;
                    true
                }
                Err(error) => {
                    self.status = Some(error);
                    return;
                }
            }
        } else {
            false
        };
        if loaded || !self.expanded_folds.remove(&path) {
            self.expanded_folds.insert(path);
        }
        self.search_match = None;
        self.rebuild_show_rows();
        self.show_offset = self
            .show_rows
            .iter()
            .position(|row| row.source == source)
            .unwrap_or(self.show_offset);
    }

    pub fn toggle_all_lockfiles(&mut self) {
        let current_source = self.show_rows.get(self.show_offset).map(|row| row.source);
        let lockfiles: Vec<_> = self
            .show_files
            .iter()
            .filter(|file| file.lockfile)
            .map(|file| file.path.clone())
            .collect();
        if lockfiles
            .iter()
            .any(|path| !self.expanded_folds.contains(path))
        {
            self.expanded_folds.extend(lockfiles);
        } else {
            self.expanded_folds.retain(|path| {
                !self
                    .show_files
                    .iter()
                    .any(|file| file.lockfile && file.path == *path)
            });
        }
        self.search_match = None;
        self.rebuild_show_rows();
        if let Some(source) = current_source {
            self.show_offset = self
                .show_rows
                .iter()
                .rposition(|row| row.source <= source)
                .unwrap_or(0);
        }
    }

    pub fn jump_show_file(&mut self, delta: isize) {
        let Some(current_source) = self.show_rows.get(self.show_offset).map(|row| row.source)
        else {
            return;
        };
        let target = if delta < 0 {
            self.show_files
                .iter()
                .rev()
                .find(|file| file.start < current_source)
        } else {
            self.show_files
                .iter()
                .find(|file| file.start > current_source)
        };
        if let Some(target) = target {
            self.show_offset = self
                .show_rows
                .iter()
                .position(|row| row.source == target.start)
                .unwrap_or(self.show_offset);
        }
    }

    pub fn click_show_row(&mut self, visible_row: usize) {
        let clicked = self.show_offset.saturating_add(visible_row);
        if self.show_rows.get(clicked).is_some_and(|row| row.folded) {
            self.show_offset = clicked;
            self.toggle_show_file();
        }
    }

    fn insert_cache(&mut self, hash: String, text: String) {
        if self.cache.len() >= 8 {
            if let Some(old) = self.cache_order.pop_front() {
                self.cache.remove(&old);
            }
        }
        self.cache_order.push_back(hash.clone());
        self.cache.insert(hash, text);
    }

    pub fn begin_search(&mut self, reverse: bool) {
        self.search_input = Some(String::new());
        self.search_reverse = reverse;
    }
    pub fn submit_search(&mut self) {
        if let Some(query) = self.search_input.take() {
            if !query.is_empty() {
                self.search = Some(query);
                self.search_match = None;
                self.next_match(self.search_reverse);
            }
        }
    }
    pub fn repeat_search(&mut self, opposite: bool) {
        self.next_match(self.search_reverse ^ opposite);
    }
    pub fn next_match(&mut self, reverse: bool) {
        let Some(query) = self.search.as_ref().map(|s| s.to_lowercase()) else {
            return;
        };
        match self.mode {
            Mode::Log => {
                let n = self.commits.len();
                let start = self
                    .search_match
                    .filter(|(mode, _)| *mode == Mode::Log)
                    .map_or(self.selected, |(_, index)| index);
                for step in 1..=n {
                    let i = if reverse {
                        (start + n - step % n) % n
                    } else {
                        (start + step) % n
                    };
                    let c = &self.commits[i];
                    if format!("{} {} {}", c.short_hash, c.decorations, c.subject)
                        .to_lowercase()
                        .contains(&query)
                    {
                        self.selected = i;
                        self.search_match = Some((Mode::Log, i));
                        self.status = None;
                        return;
                    }
                }
            }
            Mode::Show => {
                let lines: Vec<_> = self.show_text.lines().collect();
                let n = lines.len();
                let start = self
                    .search_match
                    .filter(|(mode, _)| *mode == Mode::Show)
                    .and_then(|(_, index)| self.show_rows.get(index))
                    .or_else(|| self.show_rows.get(self.show_offset))
                    .map_or(0, |row| row.source);
                for step in 1..=n {
                    let i = if reverse {
                        (start + n - step % n) % n
                    } else {
                        (start + step) % n
                    };
                    if lines[i].to_lowercase().contains(&query) {
                        if let Some(file) = self.show_files.iter().find(|file| {
                            (file.lockfile || file.untracked) && (file.start..file.end).contains(&i)
                        }) {
                            self.expanded_folds.insert(file.path.clone());
                            self.rebuild_show_rows();
                        }
                        if let Some(visible) = self.show_rows.iter().position(|row| row.source == i)
                        {
                            self.show_offset = visible;
                            self.search_match = Some((Mode::Show, visible));
                        }
                        self.status = None;
                        return;
                    }
                }
            }
        }
        self.status = Some(format!("Pattern not found: {query}"));
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    fn commit(subject: &str) -> Commit {
        Commit {
            kind: CommitKind::Revision,
            hash: subject.repeat(40).chars().take(40).collect(),
            short_hash: subject.to_owned(),
            decorations: String::new(),
            subject: subject.to_owned(),
            graph: vec!["* ".to_owned()],
        }
    }
    #[test]
    fn selection_is_bounded() {
        let mut app = App::new(vec![commit("a"), commit("b")]);
        app.move_by(-1, 1);
        assert_eq!(app.selected, 0);
        app.move_by(2, 20);
        assert_eq!(app.selected, 1);
    }

    #[test]
    fn log_search_wraps() {
        let mut app = App::new(vec![commit("first"), commit("needle"), commit("last")]);
        app.selected = 2;
        app.search = Some("needle".to_owned());
        app.next_match(false);
        assert_eq!(app.selected, 1);
        assert_eq!(app.search_match, Some((Mode::Log, 1)));
    }

    #[test]
    fn adjacent_selection_stops_at_history_boundaries() {
        let mut app = App::new(vec![commit("newer"), commit("older")]);
        assert!(!app.move_selection(-1));
        assert!(app.move_selection(1));
        assert_eq!(app.selected, 1);
        assert!(!app.move_selection(1));
        assert!(app.move_selection(-1));
        assert_eq!(app.selected, 0);
    }

    #[test]
    fn refresh_preserves_selected_commit_identity() {
        let mut app = App::new(vec![commit("head"), commit("selected")]);
        app.selected = 1;

        app.replace_commits(vec![commit("new-head"), commit("head"), commit("selected")]);

        assert_eq!(app.selected, 2);
        assert_eq!(app.commits[app.selected].subject, "selected");
    }

    #[test]
    fn lockfiles_start_folded_and_can_be_expanded() {
        let mut app = App::new(Vec::new());
        app.show_text = "commit metadata\ndiff --git a/src/main.rs b/src/main.rs\n--- a/src/main.rs\n+++ b/src/main.rs\n-old\n+new\ndiff --git a/Cargo.lock b/Cargo.lock\n--- a/Cargo.lock\n+++ b/Cargo.lock\n-old dep\n+new dep\n"
            .to_owned();
        app.reset_show_folds();

        assert!(app.show_rows.iter().any(|row| row.folded));
        assert_eq!(
            app.show_rows
                .iter()
                .filter(|row| row.fold_separator)
                .count(),
            2
        );
        assert!(!app.show_rows.iter().any(|row| row.text == "+new dep"));

        app.show_offset = app.show_rows.iter().position(|row| row.folded).unwrap();
        app.toggle_show_file();
        assert!(app.show_rows.iter().any(|row| row.text == "+new dep"));
    }

    #[test]
    fn untracked_files_start_folded_individually() {
        let mut app = App::new(Vec::new());
        app.show_text = "diff --git a/one.txt b/one.txt\nnew file mode 100644\n--- /dev/null\n+++ b/one.txt\n@@ -0,0 +1 @@\n+one\ndiff --git a/two.txt b/two.txt\nnew file mode 100644\n--- /dev/null\n+++ b/two.txt\n@@ -0,0 +1 @@\n+two\n"
            .to_owned();
        app.reset_show_folds();

        let folded: Vec<_> = app.show_rows.iter().filter(|row| row.folded).collect();
        assert_eq!(folded.len(), 2);
        assert!(folded.iter().any(|row| row.text.contains("one.txt")));
        assert!(folded.iter().any(|row| row.text.contains("two.txt")));
        assert!(!app.show_rows.iter().any(|row| row.text == "+one"));

        app.show_offset = app.show_rows.iter().position(|row| row.folded).unwrap();
        app.toggle_show_file();
        assert!(app.show_rows.iter().any(|row| row.text == "+one"));
        assert!(!app.show_rows.iter().any(|row| row.text == "+two"));
    }

    #[test]
    fn search_reveals_a_match_inside_a_folded_lockfile() {
        let mut app = App::new(Vec::new());
        app.mode = Mode::Show;
        app.show_text = "diff --git a/Cargo.lock b/Cargo.lock\n--- a/Cargo.lock\n+++ b/Cargo.lock\n+hidden-needle\n"
            .to_owned();
        app.reset_show_folds();
        app.search = Some("hidden-needle".to_owned());

        app.next_match(false);

        assert_eq!(app.show_rows[app.show_offset].text, "+hidden-needle");
        assert_eq!(app.search_match, Some((Mode::Show, app.show_offset)));
    }
}