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
|
mod show_commit_state;
mod util;
mod view_builder;
#[cfg(test)]
mod tests;
use std::sync::Arc;
use anyhow::{anyhow, Error};
use captur::capture;
use parking_lot::Mutex;
use self::{
show_commit_state::ShowCommitState,
util::get_show_commit_help_lines,
view_builder::{ViewBuilder, ViewBuilderOptions},
};
use crate::{
components::help::Help,
config::{Config, DiffIgnoreWhitespaceSetting, DiffShowWhitespaceSetting},
git::{CommitDiff, CommitDiffLoaderOptions, Repository},
input::{Event, InputOptions, KeyBindings, StandardEvent},
module::{Module, State},
process::Results,
select,
todo_file::TodoFile,
util::handle_view_data_scroll,
view::{RenderContext, ViewData},
};
// TODO Remove `union` call when bitflags/bitflags#180 is resolved
const INPUT_OPTIONS: InputOptions = InputOptions::UNDO_REDO
.union(InputOptions::MOVEMENT)
.union(InputOptions::HELP);
pub(crate) struct ShowCommit {
commit_diff_loader_options: CommitDiffLoaderOptions,
diff: Option<CommitDiff>,
diff_view_data: ViewData,
help: Help,
overview_view_data: ViewData,
repository: Repository,
state: ShowCommitState,
todo_file: Arc<Mutex<TodoFile>>,
view_builder: ViewBuilder,
}
impl Module for ShowCommit {
fn activate(&mut self, _: State) -> Results {
let mut results = Results::new();
if let Some(selected_line) = self.todo_file.lock().get_selected_line() {
// skip loading commit data if the currently loaded commit has not changed, this retains
// position after returning to the list view or help
if let Some(diff) = self.diff.as_ref() {
if diff.commit().hash() == selected_line.get_hash() {
return results;
}
}
self.overview_view_data.update_view_data(|updater| {
updater.clear();
updater.reset_scroll_position();
});
self.diff_view_data.update_view_data(|updater| {
updater.clear();
updater.reset_scroll_position();
});
let new_diff = self
.repository
.load_commit_diff(selected_line.get_hash(), &self.commit_diff_loader_options);
match new_diff {
Ok(diff) => {
self.diff = Some(diff);
},
Err(e) => {
results.error_with_return(Error::from(e), State::List);
},
}
}
else {
results.error_with_return(anyhow!("No valid commit to show"), State::List);
}
results
}
fn build_view_data(&mut self, context: &RenderContext) -> &ViewData {
if self.help.is_active() {
return self.help.get_view_data();
}
let diff = self.diff.as_ref().unwrap(); // will only fail on programmer error
let state = &self.state;
let view_builder = &self.view_builder;
let is_full_width = context.is_full_width();
match *state {
ShowCommitState::Overview => {
if self.overview_view_data.is_empty() {
self.overview_view_data.update_view_data(|updater| {
capture!(view_builder, diff);
view_builder.build_view_data_for_overview(updater, diff, is_full_width);
});
}
&self.overview_view_data
},
ShowCommitState::Diff => {
if self.diff_view_data.is_empty() {
self.diff_view_data.update_view_data(|updater| {
capture!(view_builder, diff);
view_builder.build_view_data_diff(updater, diff, is_full_width);
});
}
&self.diff_view_data
},
}
}
fn input_options(&self) -> &InputOptions {
select!(default & INPUT_OPTIONS, self.help.input_options())
}
fn read_event(&self, event: Event, key_bindings: &KeyBindings) -> Event {
select!(
default {
key_bindings
.show_diff
.contains(&event)
.then(|| Event::from(StandardEvent::ShowDiff))
.unwrap_or(event)
},
self.help.read_event(event)
)
}
fn handle_event(&mut self, event: Event, view_state: &crate::view::State) -> Results {
select!(
default {
let mut results = Results::new();
let active_view_data = match self.state {
ShowCommitState::Overview => &mut self.overview_view_data,
ShowCommitState::Diff => &mut self.diff_view_data,
};
match event {
Event::Standard(StandardEvent::ShowDiff) => {
active_view_data.update_view_data(|updater| updater.clear());
self.state = match self.state {
ShowCommitState::Overview => ShowCommitState::Diff,
ShowCommitState::Diff => ShowCommitState::Overview,
}
},
Event::Standard(StandardEvent::Help) => self.help.set_active(),
Event::Key(_) => {
active_view_data.update_view_data(|updater| updater.clear());
if self.state == ShowCommitState::Diff {
self.state = ShowCommitState::Overview;
}
else {
results.state(State::List);
}
},
Event::Resize(..) => active_view_data.update_view_data(|updater| updater.clear()),
_ => {},
}
results
},
self.help.handle_event(event, view_state),
handle_view_data_scroll(event, view_state)
)
}
}
impl ShowCommit {
pub(crate) fn new(config: &Config, repository: Repository, todo_file: Arc<Mutex<TodoFile>>) -> Self {
let overview_view_data = ViewData::new(|updater| {
updater.set_show_title(true);
updater.set_show_help(true);
});
let diff_view_data = ViewData::new(|updater| {
updater.set_show_title(true);
updater.set_show_help(true);
});
let view_builder_options = ViewBuilderOptions::new(
config.diff_tab_width as usize,
config.diff_tab_symbol.as_str(),
config.diff_space_symbol.as_str(),
config.diff_show_whitespace == DiffShowWhitespaceSetting::Both
|| config.diff_show_whitespace == DiffShowWhitespaceSetting::Leading,
config.diff_show_whitespace == DiffShowWhitespaceSetting::Both
|| config.diff_show_whitespace == DiffShowWhitespaceSetting::Trailing,
);
let commit_diff_loader_options = CommitDiffLoaderOptions::new()
.context_lines(config.git.diff_context)
.copies(config.git.diff_copies)
.ignore_whitespace(config.diff_ignore_whitespace == DiffIgnoreWhitespaceSetting::All)
.ignore_whitespace_change(config.diff_ignore_whitespace == DiffIgnoreWhitespaceSetting::Change)
.ignore_blank_lines(config.diff_ignore_blank_lines)
.interhunk_context(config.git.diff_interhunk_lines)
.renames(config.git.diff_renames, config.git.diff_rename_limit);
Self {
commit_diff_loader_options,
diff: None,
diff_view_data,
help: Help::new_from_keybindings(&get_show_commit_help_lines(&config.key_bindings)),
overview_view_data,
repository,
state: ShowCommitState::Overview,
todo_file,
view_builder: ViewBuilder::new(view_builder_options),
}
}
}
|
