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
use std::convert::TryFrom;
use std::fmt::Write;
use std::time::SystemTime;
use eden_dag::DagAlgorithm;
use rayon::ThreadPoolBuilder;
use tracing::instrument;
use crate::opts::MoveOptions;
use lib::core::config::get_restack_preserve_timestamps;
use lib::core::dag::{resolve_commits, CommitSet, Dag, ResolveCommitsResult};
use lib::core::effects::Effects;
use lib::core::eventlog::{EventLogDb, EventReplayer};
use lib::core::rewrite::{
execute_rebase_plan, BuildRebasePlanOptions, ExecuteRebasePlanOptions, ExecuteRebasePlanResult,
RebasePlanBuilder, RepoResource,
};
use lib::git::{GitRunInfo, NonZeroOid, Repo};
#[instrument]
fn resolve_base_commit(
dag: &Dag,
merge_base_oid: Option<NonZeroOid>,
oid: NonZeroOid,
) -> eyre::Result<NonZeroOid> {
let bases = match merge_base_oid {
Some(merge_base_oid) => {
let range = dag
.query()
.range(CommitSet::from(merge_base_oid), CommitSet::from(oid))?;
let roots = dag.query().roots(range.clone())?;
let bases = dag.query().children(roots)?.intersection(&range);
bases
}
None => {
let ancestors = dag.query().ancestors(CommitSet::from(oid))?;
let bases = dag.query().roots(ancestors)?;
bases
}
};
match bases.first()? {
Some(base) => NonZeroOid::try_from(base),
None => Ok(oid),
}
}
#[instrument]
pub fn r#move(
effects: &Effects,
git_run_info: &GitRunInfo,
source: Option<String>,
dest: Option<String>,
base: Option<String>,
move_options: &MoveOptions,
) -> eyre::Result<isize> {
let repo = Repo::from_current_dir()?;
let head_oid = repo.get_head_info()?.oid;
let (source, should_resolve_base_commit) = match (source, base) {
(Some(_), Some(_)) => {
writeln!(
effects.get_output_stream(),
"The --source and --base options cannot both be provided."
)?;
return Ok(1);
}
(Some(source), None) => (source, false),
(None, Some(base)) => (base, true),
(None, None) => {
let source_oid = match head_oid {
Some(oid) => oid,
None => {
writeln!(effects.get_output_stream(), "No --source or --base argument was provided, and no OID for HEAD is available as a default")?;
return Ok(1);
}
};
(source_oid.to_string(), true)
}
};
let dest = match dest {
Some(dest) => dest,
None => match head_oid {
Some(oid) => oid.to_string(),
None => {
writeln!(effects.get_output_stream(), "No --dest argument was provided, and no OID for HEAD is available as a default")?;
return Ok(1);
}
},
};
let references_snapshot = repo.get_references_snapshot()?;
let conn = repo.get_db_conn()?;
let event_log_db = EventLogDb::new(&conn)?;
let event_replayer = EventReplayer::from_event_log_db(effects, &repo, &event_log_db)?;
let event_cursor = event_replayer.make_default_cursor();
let mut dag = Dag::open_and_sync(
effects,
&repo,
&event_replayer,
event_cursor,
&references_snapshot,
)?;
let (source_oid, dest_oid) =
match resolve_commits(effects, &repo, &mut dag, vec![source, dest])? {
ResolveCommitsResult::Ok { commits } => match &commits.as_slice() {
[source_commit, dest_commit] => (source_commit.get_oid(), dest_commit.get_oid()),
_ => eyre::bail!("Unexpected number of returns values from resolve_commits"),
},
ResolveCommitsResult::CommitNotFound { commit } => {
writeln!(effects.get_output_stream(), "Commit not found: {}", commit)?;
return Ok(1);
}
};
let source_oid = if should_resolve_base_commit {
let merge_base_oid = dag.get_one_merge_base_oid(effects, &repo, source_oid, dest_oid)?;
resolve_base_commit(&dag, merge_base_oid, source_oid)?
} else {
source_oid
};
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 now = SystemTime::now();
let event_tx_id = event_log_db.make_transaction_id(now, "move")?;
let pool = ThreadPoolBuilder::new().build()?;
let repo_pool = RepoResource::new_pool(&repo)?;
let rebase_plan = {
let mut builder = RebasePlanBuilder::new(&dag);
builder.move_subtree(source_oid, dest_oid)?;
builder.build(
effects,
&pool,
&repo_pool,
&BuildRebasePlanOptions {
dump_rebase_constraints,
dump_rebase_plan,
detect_duplicate_commits_via_patch_id,
},
)?
};
let result = match rebase_plan {
Ok(None) => {
writeln!(effects.get_output_stream(), "Nothing to do.")?;
return Ok(0);
}
Ok(Some(rebase_plan)) => {
let 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: Default::default(),
};
execute_rebase_plan(effects, git_run_info, &repo, &rebase_plan, &options)?
}
Err(err) => {
err.describe(effects, &repo)?;
return Ok(1);
}
};
match result {
ExecuteRebasePlanResult::Succeeded { rewritten_oids: _ } => Ok(0),
ExecuteRebasePlanResult::DeclinedToMerge { merge_conflict } => {
merge_conflict.describe(effects, &repo)?;
Ok(1)
}
ExecuteRebasePlanResult::Failed { exit_code } => Ok(exit_code),
}
}
