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
#![warn(missing_docs)]
#![warn(
clippy::all,
clippy::as_conversions,
clippy::clone_on_ref_ptr,
clippy::dbg_macro
)]
#![allow(clippy::too_many_arguments, clippy::blocks_in_if_conditions)]
use std::collections::HashSet;
use std::ffi::OsString;
use std::fmt::Write;
use std::io;
use std::time::SystemTime;
use cursive::backends::crossterm;
use cursive::CursiveRunnable;
use cursive_buffered_backend::BufferedBackend;
use eden_dag::DagAlgorithm;
use git_branchless_invoke::CommandContext;
use git_branchless_opts::RecordArgs;
use git_record::Recorder;
use git_record::{RecordError, RecordState};
use itertools::Itertools;
use lib::core::check_out::{check_out_commit, CheckOutCommitOptions};
use lib::core::config::get_restack_preserve_timestamps;
use lib::core::dag::{commit_set_to_vec, CommitSet, Dag};
use lib::core::effects::{Effects, OperationType};
use lib::core::eventlog::{EventLogDb, EventReplayer, EventTransactionId};
use lib::core::formatting::Pluralize;
use lib::core::repo_ext::RepoExt;
use lib::core::rewrite::{
execute_rebase_plan, BuildRebasePlanError, BuildRebasePlanOptions, ExecuteRebasePlanOptions,
ExecuteRebasePlanResult, MergeConflictRemediation, RebasePlanBuilder, RebasePlanPermissions,
RepoResource,
};
use lib::git::{
process_diff_for_record, update_index, CategorizedReferenceName, FileMode, GitRunInfo,
NonZeroOid, Repo, ResolvedReferenceInfo, Stage, UpdateIndexCommand, WorkingCopyChangesType,
WorkingCopySnapshot,
};
use lib::util::ExitCode;
use rayon::ThreadPoolBuilder;
use tracing::instrument;
#[instrument]
pub fn command_main(ctx: CommandContext, args: RecordArgs) -> eyre::Result<ExitCode> {
let CommandContext {
effects,
git_run_info,
} = ctx;
let RecordArgs {
message,
interactive,
create,
detach,
insert,
} = args;
record(
&effects,
&git_run_info,
message,
interactive,
create,
detach,
insert,
)
}
#[instrument]
fn record(
effects: &Effects,
git_run_info: &GitRunInfo,
message: Option<String>,
interactive: bool,
branch_name: Option<String>,
detach: bool,
insert: bool,
) -> eyre::Result<ExitCode> {
let now = SystemTime::now();
let repo = Repo::from_dir(&git_run_info.working_directory)?;
let conn = repo.get_db_conn()?;
let event_log_db = EventLogDb::new(&conn)?;
let event_tx_id = event_log_db.make_transaction_id(now, "record")?;
let (snapshot, working_copy_changes_type) = {
let head_info = repo.get_head_info()?;
let index = repo.get_index()?;
let (snapshot, _status) =
repo.get_status(effects, git_run_info, &index, &head_info, Some(event_tx_id))?;
let working_copy_changes_type = snapshot.get_working_copy_changes_type()?;
match working_copy_changes_type {
WorkingCopyChangesType::None => {
writeln!(
effects.get_output_stream(),
"There are no changes to tracked files in the working copy to commit."
)?;
return Ok(ExitCode(0));
}
WorkingCopyChangesType::Unstaged | WorkingCopyChangesType::Staged => {}
WorkingCopyChangesType::Conflicts => {
writeln!(
effects.get_output_stream(),
"Cannot commit changes while there are unresolved merge conflicts."
)?;
writeln!(
effects.get_output_stream(),
"Resolve them and try again. Aborting."
)?;
return Ok(ExitCode(1));
}
}
(snapshot, working_copy_changes_type)
};
if let Some(branch_name) = branch_name {
let exit_code = check_out_commit(
effects,
git_run_info,
&repo,
&event_log_db,
event_tx_id,
None,
&CheckOutCommitOptions {
additional_args: vec![OsString::from("-b"), OsString::from(branch_name)],
reset: false,
render_smartlog: false,
},
)?;
if !exit_code.is_success() {
return Ok(exit_code);
}
}
let commit_exit_code = if interactive {
if working_copy_changes_type == WorkingCopyChangesType::Staged {
writeln!(
effects.get_output_stream(),
"Cannot select changes interactively while there are already staged changes."
)?;
writeln!(
effects.get_output_stream(),
"Either commit or unstage your changes and try again. Aborting."
)?;
ExitCode(1)
} else {
record_interactive(
effects,
git_run_info,
&repo,
&snapshot,
event_tx_id,
message.as_deref(),
)?
}
} else {
let args = {
let mut args = vec!["commit"];
if let Some(message) = &message {
args.extend(["--message", message]);
}
if working_copy_changes_type == WorkingCopyChangesType::Unstaged {
args.push("--all");
}
args
};
git_run_info.run_direct_no_wrapping(Some(event_tx_id), &args)?
};
if !commit_exit_code.is_success() {
return Ok(commit_exit_code);
}
if detach {
let head_info = repo.get_head_info()?;
if let ResolvedReferenceInfo {
oid: Some(oid),
reference_name: Some(reference_name),
} = &head_info
{
let head_commit = repo.find_commit_or_fail(*oid)?;
return match head_commit.get_parents().as_slice() {
[] => git_run_info.run(
effects,
Some(event_tx_id),
&[
"update-ref",
"-d",
reference_name.as_str(),
&oid.to_string(),
],
),
[parent_commit] => {
let branch_name =
CategorizedReferenceName::new(reference_name).remove_prefix()?;
repo.detach_head(&head_info)?;
git_run_info.run(
effects,
Some(event_tx_id),
&[
"branch",
"-f",
&branch_name,
&parent_commit.get_oid().to_string(),
],
)
}
parent_commits => {
eyre::bail!("git-branchless record --detach called on a merge commit, but it should only be capable of creating zero- or one-parent commits. Parents: {parent_commits:?}");
}
};
}
}
if insert {
let exit_code = insert_before_siblings(effects, git_run_info, now, event_tx_id)?;
if !exit_code.is_success() {
return Ok(exit_code);
}
}
Ok(ExitCode(0))
}
#[instrument]
fn record_interactive(
effects: &Effects,
git_run_info: &GitRunInfo,
repo: &Repo,
snapshot: &WorkingCopySnapshot,
event_tx_id: EventTransactionId,
message: Option<&str>,
) -> eyre::Result<ExitCode> {
let file_states = {
let (effects, _progress) = effects.start_operation(OperationType::CalculateDiff);
let old_tree = snapshot.commit_stage0.get_tree()?;
let new_tree = snapshot.commit_unstaged.get_tree()?;
let diff = repo.get_diff_between_trees(
&effects,
Some(&old_tree),
&new_tree,
0,
)?;
process_diff_for_record(repo, &diff)?
};
let record_state = RecordState { file_states };
let siv = CursiveRunnable::new(|| -> io::Result<_> {
let crossterm_backend = crossterm::Backend::init()?;
Ok(Box::new(BufferedBackend::new(crossterm_backend)))
});
let siv = siv.into_runner();
let recorder = Recorder::new(record_state);
let result = recorder.run(siv);
let RecordState {
file_states: result,
} = match result {
Ok(result) => result,
Err(RecordError::Cancelled) => {
println!("Aborted.");
return Ok(ExitCode(1));
}
};
let update_index_script: Vec<UpdateIndexCommand> = result
.into_iter()
.map(|(path, file_state)| -> eyre::Result<UpdateIndexCommand> {
let (selected, _unselected) = file_state.get_selected_contents();
let oid = repo.create_blob_from_contents(selected.as_bytes())?;
let command = UpdateIndexCommand::Update {
path,
stage: Stage::Stage0,
mode: FileMode::Blob,
oid,
};
Ok(command)
})
.try_collect()?;
let index = repo.get_index()?;
update_index(
git_run_info,
repo,
&index,
event_tx_id,
&update_index_script,
)?;
let args = {
let mut args = vec!["commit"];
if let Some(message) = message {
args.extend(["--message", message]);
}
args
};
git_run_info.run_direct_no_wrapping(Some(event_tx_id), &args)
}
#[instrument]
fn insert_before_siblings(
effects: &Effects,
git_run_info: &GitRunInfo,
now: SystemTime,
event_tx_id: EventTransactionId,
) -> eyre::Result<ExitCode> {
let repo = Repo::from_dir(&git_run_info.working_directory)?;
let conn = repo.get_db_conn()?;
let event_log_db = EventLogDb::new(&conn)?;
let references_snapshot = repo.get_references_snapshot()?;
let event_replayer = EventReplayer::from_event_log_db(effects, &repo, &event_log_db)?;
let event_cursor = event_replayer.make_default_cursor();
let head_info = repo.get_head_info()?;
let head_oid = match head_info {
ResolvedReferenceInfo {
oid: Some(head_oid),
reference_name: _,
} => head_oid,
ResolvedReferenceInfo {
oid: None,
reference_name: _,
} => {
return Ok(ExitCode(0));
}
};
let dag = Dag::open_and_sync(
effects,
&repo,
&event_replayer,
event_cursor,
&references_snapshot,
)?;
let head_commit = repo.find_commit_or_fail(head_oid)?;
let head_commit_set = CommitSet::from(head_oid);
let parents = dag.query().parents(head_commit_set.clone())?;
let children = dag.query().children(parents)?;
let siblings = children.difference(&head_commit_set);
let siblings = dag.filter_visible_commits(siblings)?;
let build_options = BuildRebasePlanOptions {
force_rewrite_public_commits: false,
dump_rebase_constraints: false,
dump_rebase_plan: false,
detect_duplicate_commits_via_patch_id: true,
};
let rebase_plan_result =
match RebasePlanPermissions::verify_rewrite_set(&dag, build_options, &siblings)? {
Err(err) => Err(err),
Ok(permissions) => {
let head_commit_parents: HashSet<_> =
head_commit.get_parent_oids().into_iter().collect();
let mut builder = RebasePlanBuilder::new(&dag, permissions);
for sibling_oid in commit_set_to_vec(&siblings)? {
let sibling_commit = repo.find_commit_or_fail(sibling_oid)?;
let parent_oids = sibling_commit.get_parent_oids();
let new_parent_oids = parent_oids
.into_iter()
.map(|parent_oid| {
if head_commit_parents.contains(&parent_oid) {
head_oid
} else {
parent_oid
}
})
.collect_vec();
builder.move_subtree(sibling_oid, new_parent_oids)?;
}
let thread_pool = ThreadPoolBuilder::new().build()?;
let repo_pool = RepoResource::new_pool(&repo)?;
builder.build(effects, &thread_pool, &repo_pool)?
}
};
let rebase_plan = match rebase_plan_result {
Ok(Some(rebase_plan)) => rebase_plan,
Ok(None) => {
return Ok(ExitCode(0));
}
Err(BuildRebasePlanError::ConstraintCycle { .. }) => {
writeln!(
effects.get_output_stream(),
"BUG: constraint cycle detected when moving siblings, which shouldn't be possible."
)?;
return Ok(ExitCode(1));
}
Err(err @ BuildRebasePlanError::MoveIllegalCommits { .. }) => {
err.describe(effects, &repo)?;
return Ok(ExitCode(1));
}
Err(BuildRebasePlanError::MovePublicCommits {
public_commits_to_move,
}) => {
let example_bad_commit_oid = public_commits_to_move
.first()?
.ok_or_else(|| eyre::eyre!("BUG: could not get OID of a public commit to move"))?;
let example_bad_commit_oid = NonZeroOid::try_from(example_bad_commit_oid)?;
let example_bad_commit = repo.find_commit_or_fail(example_bad_commit_oid)?;
writeln!(
effects.get_output_stream(),
"\
You are trying to rewrite {}, such as: {}
It is generally not advised to rewrite public commits, because your
collaborators will have difficulty merging your changes.
To proceed anyways, run: git move -f -s 'siblings(.)",
Pluralize {
determiner: None,
amount: public_commits_to_move.count()?,
unit: ("public commit", "public commits")
},
effects
.get_glyphs()
.render(example_bad_commit.friendly_describe(effects.get_glyphs())?)?,
)?;
return Ok(ExitCode(0));
}
};
let execute_options = ExecuteRebasePlanOptions {
now,
event_tx_id,
preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
force_in_memory: true,
force_on_disk: false,
resolve_merge_conflicts: false,
check_out_commit_options: Default::default(),
};
let result = execute_rebase_plan(
effects,
git_run_info,
&repo,
&event_log_db,
&rebase_plan,
&execute_options,
)?;
match result {
ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => Ok(ExitCode(0)),
ExecuteRebasePlanResult::DeclinedToMerge { failed_merge_info } => {
failed_merge_info.describe(effects, &repo, MergeConflictRemediation::Insert)?;
Ok(ExitCode(0))
}
ExecuteRebasePlanResult::Failed { exit_code } => Ok(exit_code),
}
}