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
use std::fmt::Write;
use std::time::SystemTime;
use eden_dag::DagAlgorithm;
use itertools::Itertools;
use rayon::ThreadPoolBuilder;
use crate::opts::MoveOptions;
use lib::core::config::get_restack_preserve_timestamps;
use lib::core::dag::{resolve_commits, sort_commit_set, CommitSet, Dag, ResolveCommitsResult};
use lib::core::effects::{Effects, OperationType};
use lib::core::eventlog::{EventLogDb, EventReplayer};
use lib::core::formatting::{printable_styled_string, Glyphs, StyledStringBuilder};
use lib::core::rewrite::{
execute_rebase_plan, BuildRebasePlanError, BuildRebasePlanOptions, ExecuteRebasePlanOptions,
ExecuteRebasePlanResult, RebasePlan, RebasePlanBuilder, RepoResource,
};
use lib::git::{CheckOutCommitOptions, Commit, GitRunInfo, NonZeroOid, Repo};
fn get_stack_roots(dag: &Dag) -> eyre::Result<CommitSet> {
let public_commits = dag.query_public_commits()?;
let active_heads = dag.query_active_heads(
&public_commits,
&dag.observed_commits.difference(&dag.obsolete_commits),
)?;
let draft_commits = dag
.query()
.range(public_commits.clone(), active_heads)?
.difference(&public_commits);
let draft_roots = dag.query().roots(draft_commits)?;
Ok(draft_roots)
}
pub fn sync(
effects: &Effects,
git_run_info: &GitRunInfo,
update_refs: bool,
force: bool,
move_options: &MoveOptions,
commits: Vec<String>,
) -> eyre::Result<isize> {
let glyphs = Glyphs::detect();
let repo = Repo::from_current_dir()?;
let conn = repo.get_db_conn()?;
let event_log_db = EventLogDb::new(&conn)?;
let now = SystemTime::now();
let event_tx_id = event_log_db.make_transaction_id(now, "sync fetch")?;
if update_refs {
let exit_code = git_run_info.run(effects, Some(event_tx_id), &["fetch", "--all"])?;
if exit_code != 0 {
return Ok(exit_code);
}
}
let event_replayer = EventReplayer::from_event_log_db(effects, &repo, &event_log_db)?;
let event_cursor = event_replayer.make_default_cursor();
let references_snapshot = repo.get_references_snapshot()?;
let mut dag = Dag::open_and_sync(
effects,
&repo,
&event_replayer,
event_cursor,
&references_snapshot,
)?;
let commits = match resolve_commits(effects, &repo, &mut dag, commits)? {
ResolveCommitsResult::Ok { commits } => commits,
ResolveCommitsResult::CommitNotFound { commit } => {
writeln!(effects.get_output_stream(), "Commit not found: {}", commit)?;
return Ok(1);
}
};
let root_commits = if commits.is_empty() {
get_stack_roots(&dag)?
} else {
let commits: CommitSet = commits.into_iter().map(|commit| commit.get_oid()).collect();
dag.query().roots(commits)?
};
let root_commits = sort_commit_set(&repo, &dag, &root_commits)?;
let MoveOptions {
force_in_memory,
force_on_disk,
detect_duplicate_commits_via_patch_id,
resolve_merge_conflicts,
dump_rebase_constraints,
dump_rebase_plan,
} = *move_options;
let pool = ThreadPoolBuilder::new().build()?;
let repo_pool = RepoResource::new_pool(&repo)?;
let root_commit_and_plans: Vec<(NonZeroOid, Option<RebasePlan>)> = {
let builder = RebasePlanBuilder::new(&dag);
let root_commit_oids = root_commits
.into_iter()
.map(|commit| commit.get_oid())
.collect_vec();
let root_commit_and_plans = pool.install(|| -> eyre::Result<_> {
let result = root_commit_oids
.into_iter()
.map(
|root_commit_oid| -> eyre::Result<
Result<(NonZeroOid, Option<RebasePlan>), BuildRebasePlanError>,
> {
let mut builder = builder.clone();
let repo = repo_pool.try_create()?;
let root_commit = repo.find_commit_or_fail(root_commit_oid)?;
let only_parent_id =
root_commit.get_only_parent().map(|parent| parent.get_oid());
if only_parent_id == Some(references_snapshot.main_branch_oid) && !force {
return Ok(Ok((root_commit_oid, None)));
}
builder.move_subtree(
root_commit.get_oid(),
references_snapshot.main_branch_oid,
)?;
let rebase_plan = builder.build(
effects,
&pool,
&repo_pool,
&BuildRebasePlanOptions {
detect_duplicate_commits_via_patch_id,
dump_rebase_constraints,
dump_rebase_plan,
},
)?;
Ok(rebase_plan.map(|rebase_plan| (root_commit_oid, rebase_plan)))
},
)
.collect::<eyre::Result<Vec<_>>>()?
.into_iter()
.collect::<Result<Vec<_>, BuildRebasePlanError>>();
Ok(result)
})?;
match root_commit_and_plans {
Ok(root_commit_and_plans) => root_commit_and_plans,
Err(err) => {
err.describe(effects, &repo)?;
return Ok(1);
}
}
};
let now = SystemTime::now();
let event_tx_id = event_log_db.make_transaction_id(now, "sync")?;
let execute_options = ExecuteRebasePlanOptions {
now,
event_tx_id,
preserve_timestamps: get_restack_preserve_timestamps(&repo)?,
force_in_memory,
force_on_disk,
resolve_merge_conflicts,
check_out_commit_options: CheckOutCommitOptions {
additional_args: &[],
render_smartlog: false,
},
};
let (success_commits, merge_conflict_commits, skipped_commits) = {
let mut success_commits: Vec<Commit> = Vec::new();
let mut merge_conflict_commits: Vec<Commit> = Vec::new();
let mut skipped_commits: Vec<Commit> = Vec::new();
let (effects, progress) = effects.start_operation(OperationType::SyncCommits);
progress.notify_progress(0, root_commit_and_plans.len());
for (root_commit_oid, rebase_plan) in root_commit_and_plans {
let root_commit = repo.find_commit_or_fail(root_commit_oid)?;
let rebase_plan = match rebase_plan {
Some(rebase_plan) => rebase_plan,
None => {
skipped_commits.push(root_commit);
continue;
}
};
let result = execute_rebase_plan(
&effects,
git_run_info,
&repo,
&rebase_plan,
&execute_options,
)?;
progress.notify_progress_inc(1);
match result {
ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => {
success_commits.push(root_commit);
}
ExecuteRebasePlanResult::DeclinedToMerge { merge_conflict: _ } => {
merge_conflict_commits.push(root_commit);
}
ExecuteRebasePlanResult::Failed { exit_code } => {
return Ok(exit_code);
}
}
}
(success_commits, merge_conflict_commits, skipped_commits)
};
for success_commit in success_commits {
writeln!(
effects.get_output_stream(),
"{}",
printable_styled_string(
&glyphs,
StyledStringBuilder::new()
.append_plain("Synced ")
.append(success_commit.friendly_describe(&glyphs)?)
.build()
)?
)?;
}
for merge_conflict_commit in merge_conflict_commits {
writeln!(
effects.get_output_stream(),
"{}",
printable_styled_string(
&glyphs,
StyledStringBuilder::new()
.append_plain("Merge conflict for ")
.append(merge_conflict_commit.friendly_describe(&glyphs)?)
.build()
)?
)?;
}
for skipped_commit in skipped_commits {
writeln!(
effects.get_output_stream(),
"Not moving up-to-date stack at {}",
printable_styled_string(&glyphs, skipped_commit.friendly_describe(&glyphs)?)?
)?;
}
Ok(0)
}