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
//! Data refresh operations (reload from jj)
//!
//! ## Concurrency safety
//!
//! All refresh methods (`refresh_log`, `refresh_status`, etc.) are independent
//! read-only jj commands that could theoretically run in parallel. However,
//! `mark_dirty_and_refresh_current()` only refreshes the **current view**,
//! so at most one jj command runs per call. Other views refresh lazily on
//! navigation via `go_to_view()`. This design (from Phase 17.1 DirtyFlags)
//! makes parallel refresh unnecessary for the current architecture.
use crate::ui::views::ResolveView;
use super::state::{App, DirtyFlags, View};
impl App {
/// Set dirty flags and immediately refresh only the current view if affected.
///
/// Other views will be refreshed lazily when navigated to (via `go_to_view()`).
/// This avoids spawning unnecessary jj subprocesses for views that aren't visible.
pub(crate) fn mark_dirty_and_refresh_current(&mut self, affected: DirtyFlags) {
// Clear entire preview cache when all flags are dirty (undo/redo/fetch/op_restore)
// since we can't know what changed
if affected == DirtyFlags::all() {
self.preview_cache.clear();
}
// Merge affected flags into current dirty state
self.dirty.log |= affected.log;
self.dirty.status |= affected.status;
self.dirty.op_log |= affected.op_log;
self.dirty.bookmarks |= affected.bookmarks;
// Refresh only the currently visible view if it's dirty
match self.current_view {
View::Log if self.dirty.log => {
let revset = self.log_view.current_revset.clone();
self.refresh_log(revset.as_deref());
self.dirty.log = false;
// Schedule preview update so it loads on next idle tick.
// Without this, dialog-based operations (fix, abandon, etc.)
// leave "No preview available" until the user presses j/k.
self.update_preview_if_needed();
}
View::Status if self.dirty.status => {
self.refresh_status();
self.dirty.status = false;
}
View::Operation if self.dirty.op_log => {
self.refresh_operation_log();
self.dirty.op_log = false;
}
View::Bookmark if self.dirty.bookmarks => {
self.refresh_bookmark_view();
self.dirty.bookmarks = false;
}
_ => {}
}
}
/// Refresh the log view with optional revset
///
/// Also invalidates the preview cache, since repository state may have changed
/// (e.g., after describe, edit, squash, rebase, etc.).
pub fn refresh_log(&mut self, revset: Option<&str>) {
self.preview_pending_id = None;
let reversed = self.log_view.reversed;
match self.jj.log_changes(revset, reversed) {
Ok(changes) => {
self.log_view.set_changes(changes);
// Validate cache against new change list: evict stale entries,
// update bookmarks for entries whose commit_id still matches
self.preview_cache.validate(&self.log_view.changes);
self.log_view.current_revset = revset.map(|s| s.to_string());
self.error_message = None;
}
Err(e) => {
self.set_error(format!("jj error: {}", e));
}
}
}
/// Refresh the status view
pub fn refresh_status(&mut self) {
match self.jj.status() {
Ok(status) => {
self.status_view.set_status(status);
self.error_message = None;
}
Err(e) => {
self.set_error(format!("jj status error: {}", e));
}
}
}
/// Refresh the operation history view
pub fn refresh_operation_log(&mut self) {
match self.jj.op_log(Some(50)) {
Ok(operations) => {
self.operation_view.set_operations(operations);
self.error_message = None;
}
Err(e) => {
self.set_error(format!("jj op log error: {}", e));
}
}
}
/// Refresh the resolve list for the current resolve view
pub(crate) fn refresh_resolve_list(&mut self, revision: &str, is_working_copy: bool) {
match self.jj.resolve_list(Some(revision)) {
Ok(files) => {
if files.is_empty() {
// All resolved - go back (simple message for Log View title bar)
self.notify_success("All conflicts resolved!");
self.resolve_view = None;
self.go_back();
// Refresh log to update conflict indicators
let revset = self.log_view.current_revset.clone();
self.refresh_log(revset.as_deref());
} else if let Some(ref mut view) = self.resolve_view {
view.set_files(files);
} else {
self.resolve_view = Some(ResolveView::new(
revision.to_string(),
is_working_copy,
files,
));
}
}
Err(e) => {
// "No conflicts found" means all conflicts were just resolved
let err_msg = e.to_string();
if err_msg.contains("No conflicts") {
// All resolved - simple message for Log View title bar
self.notify_success("All conflicts resolved!");
self.resolve_view = None;
self.go_back();
let revset = self.log_view.current_revset.clone();
self.refresh_log(revset.as_deref());
} else {
self.set_error(format!("Failed to refresh conflicts: {}", e));
}
}
}
}
/// Execute refresh for current view (Ctrl+L)
///
/// Force-refreshes the data for the current view and clears only that
/// view's dirty flag. Other views' dirty flags are preserved so they
/// still refresh when navigated to.
///
/// Note: Selection position is NOT preserved after refresh.
pub(crate) fn execute_refresh(&mut self) {
match self.current_view {
View::Log => {
let revset = self.log_view.current_revset.clone();
self.refresh_log(revset.as_deref());
self.dirty.log = false;
self.update_preview_if_needed();
self.notify_info("Refreshed");
}
View::Status => {
self.refresh_status();
self.dirty.status = false;
self.notify_info("Refreshed");
}
View::Operation => {
self.refresh_operation_log();
self.dirty.op_log = false;
self.notify_info("Refreshed");
}
View::Diff => {
// Only refresh if diff_view is loaded
if let Some(ref diff_view) = self.diff_view {
if let Some(ref compare_info) = diff_view.compare_info {
// Compare mode: re-run diff --from --to
let from = compare_info.from.commit_id.to_string();
let to = compare_info.to.commit_id.to_string();
self.open_compare_diff(&from, &to);
} else {
// Normal mode: re-run jj show
let revision = diff_view.revision.clone();
self.open_diff(&revision);
}
self.notify_info("Refreshed");
}
// If diff_view is None, do nothing (no notification)
}
View::Resolve => {
// Refresh resolve list
if let Some(ref resolve_view) = self.resolve_view {
let revision = resolve_view.revision.clone();
let is_wc = resolve_view.is_working_copy;
self.refresh_resolve_list(&revision, is_wc);
self.notify_info("Refreshed");
}
}
View::Bookmark => {
self.refresh_bookmark_view();
self.dirty.bookmarks = false;
self.notify_info("Refreshed");
}
View::Blame => {
// Only refresh if blame_view is loaded
if let Some(ref blame_view) = self.blame_view {
let file_path = blame_view.file_path().to_string();
let revision = blame_view.revision().map(|s| s.to_string());
self.open_blame(&file_path, revision.as_deref());
self.notify_info("Refreshed");
}
}
View::Evolog => {
// Refresh evolog view
if let Some(ref evolog_view) = self.evolog_view {
let revision = evolog_view.revision.clone();
self.open_evolog(&revision);
// Only show "Refreshed" if open_evolog didn't set an error/notification
if self.error_message.is_none() && self.notification.is_none() {
self.notify_info("Refreshed");
}
}
}
View::Tag => {
self.refresh_tag_view();
self.notify_info("Refreshed");
}
View::CommandHistory => {
// Command history is in-memory data, no external refresh needed
}
View::Help => {
// Help is static content, no refresh needed, no notification
}
}
}
}