tij 0.4.27

Text-mode interface for Jujutsu - a TUI for jj version control
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
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
//! Rendering for LogView

use ratatui::{
    Frame,
    layout::{Constraint, Layout, Rect},
    style::{Color, Modifier, Style, Stylize},
    text::{Line, Span},
    widgets::Paragraph,
};

use crate::jj::constants;
use crate::model::{Change, Notification};
use crate::ui::{components, symbols, theme};

use super::{InputMode, LogView, RebaseMode, RebaseSource, empty_text};

impl LogView {
    /// Render the view with optional notification in title bar
    pub fn render(&mut self, frame: &mut Frame, area: Rect, notification: Option<&Notification>) {
        // Split area for input bar if in input modes
        let (log_area, input_area) = match self.input_mode {
            InputMode::Normal
            | InputMode::RebaseModeSelect
            | InputMode::RebaseSelect
            | InputMode::SquashSelect
            | InputMode::CompareSelect
            | InputMode::InterdiffSelect
            | InputMode::BisectSelect
            | InputMode::ParallelizeSelect => (area, None),
            InputMode::SearchInput
            | InputMode::RevsetInput
            | InputMode::DescribeInput
            | InputMode::BookmarkInput
            | InputMode::RebaseRevsetInput => {
                let chunks =
                    Layout::vertical([Constraint::Min(1), Constraint::Length(3)]).split(area);
                (chunks[0], Some(chunks[1]))
            }
        };

        self.render_log_list(frame, log_area, notification);

        // Render input bar if in input mode
        if let Some(input_area) = input_area {
            self.render_input_bar(frame, input_area);
        }
    }

    fn render_log_list(&self, frame: &mut Frame, area: Rect, notification: Option<&Notification>) {
        let title = self.build_title();

        // Build notification line for title bar (with truncation if needed)
        let title_width = title.width();
        let available_for_notif = area.width.saturating_sub(title_width as u16 + 4) as usize; // +4 for borders/padding
        let notif_line = notification
            .filter(|n| !n.is_expired())
            .map(|n| components::build_notification_title(n, Some(available_for_notif)))
            .filter(|line| !line.spans.is_empty());

        let block = components::bordered_block_with_notification(title, notif_line);

        if self.changes.is_empty() {
            self.render_empty_state(frame, area, block);
            return;
        }

        let inner_height = area.height.saturating_sub(2) as usize; // borders
        if inner_height == 0 {
            return;
        }

        // Calculate scroll offset to keep selection visible
        let scroll_offset = self.calculate_scroll_offset(inner_height);

        // Build lines - each change is one line (graph prefix from jj)
        let mut lines: Vec<Line> = Vec::new();
        for (idx, change) in self.changes.iter().enumerate().skip(scroll_offset) {
            if lines.len() >= inner_height {
                break;
            }

            let is_selected = idx == self.selected_index && !change.is_graph_only;
            let line = self.build_change_line(change, is_selected);
            lines.push(line);
        }

        let paragraph = Paragraph::new(lines).block(block);

        frame.render_widget(paragraph, area);
    }

    fn build_title(&self) -> Line<'static> {
        // Special title for RebaseModeSelect mode
        if self.input_mode == InputMode::RebaseModeSelect {
            return Line::from(" Tij - Log View [Rebase: Select mode (r/s/b/A/B)] ")
                .bold()
                .yellow()
                .centered();
        }

        // Special title for RebaseRevsetInput mode
        if self.input_mode == InputMode::RebaseRevsetInput {
            let mode_label = match self.rebase_mode {
                RebaseMode::Revision => "-r",
                RebaseMode::Source => "-s",
                RebaseMode::Branch => "-b",
                _ => "",
            };
            return Line::from(format!(
                " Tij - Log View [Rebase {}: Enter revset] ",
                mode_label
            ))
            .bold()
            .yellow()
            .centered();
        }

        // Special title for RebaseSelect mode (varies by rebase_mode)
        if self.input_mode == InputMode::RebaseSelect {
            // When revset is active, show the revset string in the title
            if matches!(self.rebase_source, Some(RebaseSource::Revset(_))) {
                let revset_src = match &self.rebase_source {
                    Some(RebaseSource::Revset(s)) => s.as_str(),
                    _ => "?",
                };
                let mode_label = match self.rebase_mode {
                    RebaseMode::Revision => "-r",
                    RebaseMode::Source => "-s",
                    RebaseMode::Branch => "-b",
                    _ => "",
                };
                return Line::from(format!(
                    " Tij - Log View [Rebase {} \"{}\": Select destination] ",
                    mode_label, revset_src
                ))
                .bold()
                .yellow()
                .centered();
            }

            let title = match self.rebase_mode {
                RebaseMode::Revision => " Tij - Log View [Rebase: Select destination] ".to_string(),
                RebaseMode::Source => {
                    " Tij - Log View [Rebase -s: Select destination (with descendants)] "
                        .to_string()
                }
                RebaseMode::Branch => {
                    " Tij - Log View [Rebase -b: Select destination (branch)] ".to_string()
                }
                RebaseMode::InsertAfter => {
                    " Tij - Log View [Rebase: Select insert-after target] ".to_string()
                }
                RebaseMode::InsertBefore => {
                    " Tij - Log View [Rebase: Select insert-before target] ".to_string()
                }
            };
            return Line::from(title).bold().yellow().centered();
        }

        // Special title for SquashSelect mode
        if self.input_mode == InputMode::SquashSelect {
            return Line::from(" Tij - Log View [Squash: Select destination] ")
                .bold()
                .yellow()
                .centered();
        }

        // Special title for CompareSelect mode
        if self.input_mode == InputMode::CompareSelect {
            let from_id = self
                .compare_from
                .as_ref()
                .map(|(cid, _)| cid.as_str())
                .unwrap_or("?");
            return Line::from(format!(
                " Tij - Log View [Compare: From={}, Select To] ",
                from_id
            ))
            .bold()
            .yellow()
            .centered();
        }

        // Special title for InterdiffSelect mode
        if self.input_mode == InputMode::InterdiffSelect {
            let from_id = self
                .interdiff_from
                .as_ref()
                .map(|(cid, _)| cid.as_str())
                .unwrap_or("?");
            return Line::from(format!(
                " Tij - Log View [Interdiff: From={}, Select To] ",
                from_id
            ))
            .bold()
            .yellow()
            .centered();
        }

        // Special title for BisectSelect mode
        if self.input_mode == InputMode::BisectSelect {
            let bad_id = self
                .bisect_bad
                .as_ref()
                .map(|(_, short)| short.as_str())
                .unwrap_or("?");
            return Line::from(format!(
                " Tij - Log View [Bisect: Bad={}, Select Good] ",
                bad_id
            ))
            .bold()
            .yellow()
            .centered();
        }

        // Special title for ParallelizeSelect mode
        if self.input_mode == InputMode::ParallelizeSelect {
            let from_id = self
                .parallelize_from
                .as_ref()
                .map(|(cid, _)| cid.as_str())
                .unwrap_or("?");
            return Line::from(format!(
                " Tij - Log View [Parallelize: From={}, Select end] ",
                from_id
            ))
            .bold()
            .yellow()
            .centered();
        }

        // Build count suffix for revset queries and truncated default view
        let count_suffix = if self.current_revset.is_some() {
            let count = self.changes.iter().filter(|c| !c.is_graph_only).count();
            if self.truncated {
                format!(" ({}+)", count)
            } else {
                format!(" ({})", count)
            }
        } else if self.truncated {
            let count = self.changes.iter().filter(|c| !c.is_graph_only).count();
            format!(" ({}+)", count)
        } else {
            String::new()
        };

        let title_text = match (&self.current_revset, &self.last_search_query) {
            (Some(revset), Some(query)) => {
                format!(
                    " Tij - Log View [{}{}] [Search: {}] ",
                    revset, count_suffix, query
                )
            }
            (Some(revset), None) => {
                format!(" Tij - Log View [{}{}] ", revset, count_suffix)
            }
            (None, Some(query)) => {
                format!(" Tij - Log View{} [Search: {}] ", count_suffix, query)
            }
            (None, None) => {
                if count_suffix.is_empty() {
                    " Tij - Log View ".to_string()
                } else {
                    format!(" Tij - Log View{} ", count_suffix)
                }
            }
        };
        Line::from(title_text).bold().cyan().centered()
    }

    fn render_empty_state(
        &self,
        frame: &mut Frame,
        area: Rect,
        block: ratatui::widgets::Block<'static>,
    ) {
        let paragraph =
            components::empty_state(empty_text::TITLE, Some(empty_text::HINT)).block(block);

        frame.render_widget(paragraph, area);
    }

    fn calculate_scroll_offset(&self, visible_changes: usize) -> usize {
        if visible_changes == 0 {
            return 0;
        }

        let mut offset = self.scroll_offset;

        // Ensure selected item is visible
        if self.selected_index < offset {
            offset = self.selected_index;
        } else if self.selected_index >= offset + visible_changes {
            offset = self.selected_index - visible_changes + 1;
        }

        offset
    }

    fn build_change_line(&self, change: &Change, is_selected: bool) -> Line<'static> {
        let mut spans = Vec::new();

        // Graph prefix (from jj output)
        if !change.graph_prefix.is_empty() {
            spans.push(Span::styled(
                change.graph_prefix.clone(),
                Style::default().fg(theme::log_view::GRAPH_LINE),
            ));
        }

        // For graph-only lines, just return the prefix
        if change.is_graph_only {
            return Line::from(spans);
        }

        // Change ID
        spans.push(Span::styled(
            format!("{} ", change.short_id()),
            Style::default().fg(theme::log_view::CHANGE_ID),
        ));

        // Author (if not root)
        if change.change_id != constants::ROOT_CHANGE_ID {
            spans.push(Span::raw(format!("{} ", change.author)));
            spans.push(Span::styled(
                format!("{} ", change.timestamp),
                Style::default().fg(theme::log_view::TIMESTAMP),
            ));
        }

        // Bookmarks
        if !change.bookmarks.is_empty() {
            spans.push(Span::styled(
                format!("{} ", change.bookmarks.join(", ")),
                Style::default().fg(theme::log_view::BOOKMARK),
            ));
        }

        // Workspace markers (other workspaces' working copies)
        // Skip if this is the current WC and only 1 workspace name (already shown as @ in graph)
        let show_ws_markers = !(change.working_copy_names.is_empty()
            || change.is_working_copy && change.working_copy_names.len() == 1);
        if show_ws_markers {
            let marker = change
                .working_copy_names
                .iter()
                .map(|name| format!("{}@", name))
                .collect::<Vec<_>>()
                .join(" ");
            spans.push(Span::styled(
                format!("{} ", marker),
                Style::default().fg(Color::Magenta),
            ));
        }

        // Conflict indicator
        if change.has_conflict {
            spans.push(Span::styled(
                "[CONFLICT] ",
                Style::default().fg(Color::Red).add_modifier(Modifier::BOLD),
            ));
        }

        // Description
        let description = change.display_description();
        if change.is_empty && description == symbols::empty::NO_DESCRIPTION {
            spans.push(Span::styled(
                format!("{} ", symbols::empty::CHANGE_LABEL),
                Style::default().fg(theme::log_view::EMPTY_LABEL),
            ));
        }
        spans.push(Span::raw(description.to_string()));

        let mut line = Line::from(spans);

        // Check if this is the rebase source (in RebaseModeSelect, RebaseSelect, or RebaseRevsetInput mode)
        let is_rebase_source = matches!(
            self.input_mode,
            InputMode::RebaseModeSelect | InputMode::RebaseSelect | InputMode::RebaseRevsetInput
        ) && matches!(
            &self.rebase_source,
            Some(RebaseSource::Selected { change_id, .. }) if *change_id == change.change_id
        );

        // Check if this is the squash source (in SquashSelect mode)
        let is_squash_source = self.input_mode == InputMode::SquashSelect
            && self
                .squash_source
                .as_ref()
                .is_some_and(|(cid, _)| *cid == change.change_id);

        // Check if this is the compare "from" (in CompareSelect mode)
        let is_compare_from = self.input_mode == InputMode::CompareSelect
            && self
                .compare_from
                .as_ref()
                .is_some_and(|(cid, _)| *cid == change.change_id);

        // Check if this is the interdiff "from" (in InterdiffSelect mode)
        let is_interdiff_from = self.input_mode == InputMode::InterdiffSelect
            && self
                .interdiff_from
                .as_ref()
                .is_some_and(|(cid, _)| *cid == change.change_id);

        // Check if this is the bisect "bad" (in BisectSelect mode)
        let is_bisect_bad = self.input_mode == InputMode::BisectSelect
            && self
                .bisect_bad
                .as_ref()
                .is_some_and(|(cid, _)| *cid == change.change_id);

        // Check if this is the parallelize "from" (in ParallelizeSelect mode)
        let is_parallelize_from = self.input_mode == InputMode::ParallelizeSelect
            && self
                .parallelize_from
                .as_ref()
                .is_some_and(|(cid, _)| *cid == change.change_id);

        // Apply styling
        if is_rebase_source
            || is_squash_source
            || is_compare_from
            || is_interdiff_from
            || is_bisect_bad
            || is_parallelize_from
        {
            // Highlight rebase/squash source with distinct background
            line = line.style(
                Style::default()
                    .bg(Color::DarkGray)
                    .fg(Color::Yellow)
                    .add_modifier(Modifier::BOLD),
            );
        } else if is_selected {
            line = line.style(
                Style::default()
                    .fg(theme::selection::FG)
                    .bg(theme::selection::BG)
                    .add_modifier(Modifier::BOLD),
            );
        }

        line
    }

    fn render_input_bar(&self, frame: &mut Frame, area: Rect) {
        let Some((prompt, title)) = self.input_mode.input_bar_meta() else {
            return;
        };

        let input_text = format!("{}{}", prompt, self.input_buffer);

        // Calculate available width (area width minus borders)
        let available_width = area.width.saturating_sub(2) as usize;

        // Early return if no space for input
        if available_width == 0 {
            return;
        }

        // Truncate display text if too long (show end of input, UTF-8 safe)
        let char_count = input_text.chars().count();
        let display_text = if char_count > available_width {
            let skip = char_count.saturating_sub(available_width.saturating_sub(1)); // -1 for ellipsis
            format!("{}", input_text.chars().skip(skip).collect::<String>())
        } else {
            input_text.clone()
        };

        let paragraph =
            Paragraph::new(display_text).block(components::bordered_block(Line::from(title)));

        frame.render_widget(paragraph, area);

        // Show cursor (clamped to available width, character-based)
        let cursor_pos = char_count.min(available_width);
        frame.set_cursor_position((area.x + cursor_pos as u16 + 1, area.y + 1));
    }
}

#[cfg(test)]
mod tests {
    use super::LogView;
    use crate::jj::constants;
    use crate::model::{Change, ChangeId, CommitId};

    fn create_selectable_changes(count: usize) -> Vec<Change> {
        (0..count)
            .map(|i| Change {
                change_id: ChangeId::new(format!("chg{i:05}")),
                commit_id: CommitId::new(format!("commit{i:05}")),
                author: "user@example.com".to_string(),
                timestamp: "2024-01-29".to_string(),
                description: format!("Commit {i}"),
                is_working_copy: i == 0,
                is_empty: false,
                bookmarks: vec![],
                graph_prefix: if i == 0 {
                    "@  ".to_string()
                } else {
                    "".to_string()
                },
                is_graph_only: false,
                has_conflict: false,
                working_copy_names: Vec::new(),
            })
            .collect()
    }

    fn title_text(view: &LogView) -> String {
        let mut text = String::new();
        for span in view.build_title().spans {
            text.push_str(span.content.as_ref());
        }
        text
    }

    #[test]
    fn test_build_title_includes_revset_count() {
        let mut view = LogView::new();
        view.current_revset = Some("ancestors(@, 5)".to_string());
        view.set_changes(create_selectable_changes(5));

        assert_eq!(title_text(&view), " Tij - Log View [ancestors(@, 5) (5)] ");
    }

    #[test]
    fn test_build_title_includes_truncated_indicator_for_revset() {
        let mut view = LogView::new();
        view.current_revset = Some("all()".to_string());
        let limit = constants::DEFAULT_LOG_LIMIT.parse::<usize>().unwrap();
        view.set_changes(create_selectable_changes(limit));
        view.truncated = true;

        assert_eq!(
            title_text(&view),
            format!(" Tij - Log View [all() ({}+)] ", limit)
        );
    }

    #[test]
    fn test_build_title_includes_truncated_indicator_without_revset() {
        let mut view = LogView::new();
        let limit = constants::DEFAULT_LOG_LIMIT.parse::<usize>().unwrap();
        view.set_changes(create_selectable_changes(limit));
        view.truncated = true;

        assert_eq!(title_text(&view), format!(" Tij - Log View ({}+) ", limit));
    }
}