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
//! Commit, amend, and editor flows.
use std::path::Path;
use super::App;
use crate::editor::{self, EditorPurpose, EditorRequest};
impl App {
/// Editor command at the point of use: config beats `$DIFFLER_EDITOR`
/// beats `$EDITOR` beats `vi`.
pub(super) fn editor_command(&self) -> String {
editor::resolve(
self.config.editor.command.as_deref(),
std::env::var("DIFFLER_EDITOR").ok().as_deref(),
std::env::var("EDITOR").ok().as_deref(),
)
}
/// Queue the editor on a repo-relative path, optionally at a line.
pub(crate) fn request_editor(&mut self, path: &str, line: Option<u32>) {
let absolute = self.review.repo_root.join(path);
let cmd = editor::command_for(&self.editor_command(), &absolute, line);
self.pending_editor = Some(EditorRequest {
cmd,
purpose: EditorPurpose::OpenFile {
path: path.to_owned(),
},
});
}
// --- network ops (push/pull/fetch) ---
/// Queue a network git op: resolve its argv from the backend and set
/// `pending_git`, plus a "running …" status so the next draw shows it. The
/// main loop runs the process in the background and reports back through
/// [`AppEvent::GitDone`], so the event loop never freezes on the network.
/// `c c`: straight to the editor on a gitcommit-style message file when
/// something is staged.
pub(crate) fn commit_flow(&mut self) {
let staged = &self.review.status.staged.files;
if staged.is_empty() {
self.info("nothing staged");
return;
}
let template = editor::commit_template(staged);
self.queue_message_editor("COMMIT_EDITMSG", template, |msg_path| {
EditorPurpose::Commit { msg_path }
});
}
/// `c e`: extend HEAD with the staged index, reusing its message (no
/// editor). Refused on an empty index (nothing to add) or unborn branch.
pub(crate) fn commit_extend(&mut self) {
if self.review.status.staged.files.is_empty() {
self.info("nothing staged");
return;
}
if self.head.oid7.is_empty() {
self.info("no commit to extend");
return;
}
self.apply_amend(None, true);
}
/// `c a`: amend HEAD via the editor on its message, folding the staged
/// index into the new commit.
pub(crate) fn commit_amend(&mut self) {
self.amend_via_editor(true);
}
/// `c w`: reword HEAD via the editor on its message, keeping its tree.
pub(crate) fn commit_reword(&mut self) {
self.amend_via_editor(false);
}
pub(super) fn amend_via_editor(&mut self, use_index: bool) {
if self.head.oid7.is_empty() {
self.info("no commit to amend");
return;
}
let existing = match self.review.vcs.head_message() {
Ok(message) => message,
Err(err) => {
self.error(err.to_string());
return;
}
};
// a reword keeps HEAD's tree, so its template lists no staged files
let staged: &[diffler_core::model::FileDiff] = if use_index {
&self.review.status.staged.files
} else {
&[]
};
let template = editor::amend_template(&existing, staged);
self.queue_message_editor("COMMIT_EDITMSG", template, move |msg_path| {
EditorPurpose::Amend {
msg_path,
use_index,
}
});
}
/// Write `template` to `file_name` in the git dir and queue the editor on
/// it. The gitdir comes from libgit2 (not `<root>/.git`) so linked
/// worktrees work. Reports whether the editor was queued, so a caller
/// holding state for the round trip can put it back when it was not.
pub(super) fn queue_message_editor(
&mut self,
file_name: &str,
template: String,
purpose: impl FnOnce(std::path::PathBuf) -> EditorPurpose,
) -> bool {
let git_dir = match self.review.vcs.git_dir() {
Ok(dir) => dir,
Err(err) => {
self.error(err.to_string());
return false;
}
};
let msg_path = git_dir.join(file_name);
if let Err(err) = std::fs::write(&msg_path, template) {
self.error(format!("cannot write {}: {err}", msg_path.display()));
return false;
}
let cmd = editor::command_for(&self.editor_command(), &msg_path, None);
self.pending_editor = Some(EditorRequest {
cmd,
purpose: purpose(msg_path),
});
true
}
/// Run the backend amend and report. `message` `None` reuses HEAD's
/// message (extend); `use_index` folds the staged index in.
pub(super) fn apply_amend(&mut self, message: Option<&str>, use_index: bool) {
match self.review.vcs.amend(message, use_index) {
Ok(oid) => {
// an extend reuses HEAD's message, so its subject is the one
// already on screen
let subject = message
.and_then(|text| text.lines().next())
.unwrap_or(&self.head.subject)
.to_owned();
self.queue_refresh();
let oid7 = oid.get(..7).unwrap_or(&oid).to_owned();
if self.message.is_none() {
self.info(format!("amended {oid7} {subject}"));
}
}
Err(err) => self.error(err.to_string()),
}
}
/// Called by the main loop after the editor subprocess ended and the
/// terminal is back. `outcome` is the editor's success, or the spawn
/// failure message.
pub fn editor_finished(&mut self, purpose: EditorPurpose, outcome: Result<bool, String>) {
self.message = None;
match purpose {
EditorPurpose::Commit { msg_path } => self.finish_commit(&msg_path, outcome),
EditorPurpose::Amend {
msg_path,
use_index,
} => self.finish_amend(&msg_path, use_index, outcome),
EditorPurpose::PrBody {
msg_path,
mut draft,
} => {
match outcome {
Ok(_) => match std::fs::read_to_string(&msg_path) {
Ok(body) => draft.body = body,
Err(err) => {
self.error(format!("cannot read {}: {err}", msg_path.display()));
}
},
Err(err) => self.error(format!("editor failed: {err}")),
}
self.modal = Some(super::Modal::CreatePr { draft });
}
EditorPurpose::OpenFile { path } => {
if let Err(err) = outcome {
self.error(format!("editor failed: {err}"));
}
self.queue_refresh();
if self.message.is_none() {
self.info(format!("edited {path}"));
}
}
}
}
pub(super) fn finish_commit(&mut self, msg_path: &Path, outcome: Result<bool, String>) {
match outcome {
Err(err) => {
self.error(format!("editor failed: {err}"));
return;
}
// a non-zero editor exit (e.g. vim's :cq) aborts the commit
Ok(false) => {
self.info("commit aborted");
return;
}
Ok(true) => {}
}
let raw = match std::fs::read_to_string(msg_path) {
Ok(raw) => raw,
Err(err) => {
self.error(format!("cannot read {}: {err}", msg_path.display()));
return;
}
};
let Some(message) = editor::strip_commit_message(&raw) else {
self.info("commit aborted");
return;
};
match self.review.vcs.commit(&message) {
Ok(oid) => {
let subject = message.lines().next().unwrap_or_default().to_owned();
let oid7 = oid.get(..7).unwrap_or(&oid).to_owned();
self.queue_refresh();
if self.message.is_none() {
self.info(format!("committed {oid7} {subject}"));
}
}
Err(err) => self.error(err.to_string()),
}
}
pub(super) fn finish_amend(
&mut self,
msg_path: &Path,
use_index: bool,
outcome: Result<bool, String>,
) {
match outcome {
Err(err) => {
self.error(format!("editor failed: {err}"));
return;
}
// a non-zero editor exit (e.g. vim's :cq) aborts the amend
Ok(false) => {
self.info("amend aborted");
return;
}
Ok(true) => {}
}
let raw = match std::fs::read_to_string(msg_path) {
Ok(raw) => raw,
Err(err) => {
self.error(format!("cannot read {}: {err}", msg_path.display()));
return;
}
};
let Some(message) = editor::strip_commit_message(&raw) else {
self.info("amend aborted");
return;
};
self.apply_amend(Some(&message), use_index);
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::config::LoadedConfig;
use crate::test_support::standard_fixture;
/// A commit made through diffler's own flow reports the ordinary
/// "committed …" message: a walkthrough is its own review source now,
/// with nothing tying it to the working tree or the commit it becomes.
#[test]
fn committing_reports_the_ordinary_commit_message() {
let fixture = standard_fixture();
let mut app = App::new(fixture.review(), LoadedConfig::default());
let msg_path = app.review.repo_root.join("MSG");
std::fs::write(&msg_path, "a plain commit\n").expect("write commit message");
app.finish_commit(&msg_path, Ok(true));
assert!(
app.message
.as_ref()
.is_some_and(|m| m.text.starts_with("committed ")),
"{:?}",
app.message
);
}
}