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
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
use std::borrow::Borrow;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::convert::TryFrom;
use std::iter::FromIterator;
use eden_dag::ops::DagPersistent;
use eden_dag::DagAlgorithm;
use eyre::Context;
use itertools::Itertools;
use tracing::{instrument, trace, warn};
use crate::core::eventlog::{CommitActivityStatus, EventCursor, EventReplayer};
use crate::git::{Commit, MaybeZeroOid, NonZeroOid, Repo};
use crate::tui::{Effects, OperationType};
use super::RepoReferencesSnapshot;
impl From<NonZeroOid> for eden_dag::VertexName {
fn from(oid: NonZeroOid) -> Self {
eden_dag::VertexName::copy_from(oid.as_bytes())
}
}
impl TryFrom<eden_dag::VertexName> for NonZeroOid {
type Error = eyre::Error;
fn try_from(value: eden_dag::VertexName) -> Result<Self, Self::Error> {
let oid = git2::Oid::from_bytes(value.as_ref())?;
let oid = MaybeZeroOid::from(oid);
NonZeroOid::try_from(oid)
}
}
pub type CommitSet = eden_dag::NameSet;
pub type CommitVertex = eden_dag::VertexName;
impl From<NonZeroOid> for CommitSet {
fn from(oid: NonZeroOid) -> Self {
let vertex = CommitVertex::from(oid);
CommitSet::from_static_names([vertex])
}
}
impl FromIterator<NonZeroOid> for CommitSet {
fn from_iter<T: IntoIterator<Item = NonZeroOid>>(iter: T) -> Self {
let oids = iter
.into_iter()
.map(CommitVertex::from)
.map(Ok)
.collect_vec();
CommitSet::from_iter(oids)
}
}
#[instrument]
pub fn commit_set_to_vec(commit_set: &CommitSet) -> eyre::Result<Vec<NonZeroOid>> {
let mut result = Vec::new();
for vertex in commit_set.iter().wrap_err("Iterating commit set")? {
let vertex = vertex.wrap_err("Evaluating vertex")?;
let vertex = NonZeroOid::try_from(vertex.clone())
.wrap_err_with(|| format!("Converting vertex to NonZeroOid: {:?}", &vertex))?;
result.push(vertex);
}
Ok(result)
}
pub struct Dag {
inner: eden_dag::Dag,
pub head_commit: CommitSet,
pub main_branch_commit: CommitSet,
pub branch_commits: CommitSet,
pub observed_commits: CommitSet,
pub obsolete_commits: CommitSet,
}
impl Dag {
#[instrument]
pub fn open_and_sync(
effects: &Effects,
repo: &Repo,
event_replayer: &EventReplayer,
event_cursor: EventCursor,
references_snapshot: &RepoReferencesSnapshot,
) -> eyre::Result<Self> {
let mut dag = Self::open_without_syncing(
effects,
repo,
event_replayer,
event_cursor,
references_snapshot,
)?;
dag.sync(effects, repo)?;
Ok(dag)
}
#[instrument]
pub fn open_without_syncing(
effects: &Effects,
repo: &Repo,
event_replayer: &EventReplayer,
event_cursor: EventCursor,
references_snapshot: &RepoReferencesSnapshot,
) -> eyre::Result<Self> {
let observed_commits = event_replayer.get_cursor_oids(event_cursor);
let RepoReferencesSnapshot {
head_oid,
main_branch_oid,
branch_oid_to_names,
} = references_snapshot;
let obsolete_commits = CommitSet::from_iter(
observed_commits
.iter()
.copied()
.filter(|commit_oid| {
match event_replayer
.get_cursor_commit_activity_status(event_cursor, *commit_oid)
{
CommitActivityStatus::Active | CommitActivityStatus::Inactive => false,
CommitActivityStatus::Obsolete => true,
}
})
.map(CommitVertex::from)
.map(Ok)
.collect_vec(),
);
let dag_dir = repo.get_dag_dir();
std::fs::create_dir_all(&dag_dir).wrap_err("Creating .git/branchless/dag dir")?;
let dag = eden_dag::Dag::open(&dag_dir)
.wrap_err_with(|| format!("Opening DAG directory at: {:?}", &dag_dir))?;
let observed_commits =
CommitSet::from_iter(observed_commits.into_iter().map(CommitVertex::from).map(Ok));
let head_commit = match head_oid {
Some(head_oid) => CommitSet::from(*head_oid),
None => CommitSet::empty(),
};
let main_branch_commit = CommitSet::from(*main_branch_oid);
let branch_commits = CommitSet::from_iter(
branch_oid_to_names
.keys()
.copied()
.map(CommitVertex::from)
.map(Ok)
.collect_vec(),
);
Ok(Self {
inner: dag,
head_commit,
main_branch_commit,
branch_commits,
observed_commits,
obsolete_commits,
})
}
fn sync(&mut self, effects: &Effects, repo: &Repo) -> eden_dag::Result<()> {
let master_heads = self.main_branch_commit.clone();
let non_master_heads = self
.observed_commits
.union(&self.head_commit)
.union(&self.branch_commits);
self.sync_from_oids(effects, repo, master_heads, non_master_heads)
}
pub fn sync_from_oids(
&mut self,
effects: &Effects,
repo: &Repo,
master_heads: CommitSet,
non_master_heads: CommitSet,
) -> eden_dag::Result<()> {
let (effects, _progress) = effects.start_operation(OperationType::UpdateCommitGraph);
let _effects = effects;
let parent_func = |v: CommitVertex| -> eden_dag::Result<Vec<CommitVertex>> {
use eden_dag::errors::BackendError;
trace!(?v, "visiting Git commit");
let oid = MaybeZeroOid::from_bytes(v.as_ref())
.map_err(|_e| anyhow::anyhow!("Could not convert to Git oid: {:?}", &v))
.map_err(BackendError::Other)?;
let oid = match oid {
MaybeZeroOid::NonZero(oid) => oid,
MaybeZeroOid::Zero => return Ok(Vec::new()),
};
let commit = repo
.find_commit(oid)
.map_err(|_e| anyhow::anyhow!("Could not resolve to Git commit: {:?}", &v))
.map_err(BackendError::Other)?;
let commit = match commit {
Some(commit) => commit,
None => {
return Ok(Vec::new());
}
};
Ok(commit
.get_parent_oids()
.into_iter()
.map(CommitVertex::from)
.collect())
};
let commit_set_to_vec = |commit_set: CommitSet| -> Vec<CommitVertex> {
let mut result = Vec::new();
for vertex in commit_set
.iter()
.expect("The commit set was produced statically, so iteration should not fail")
{
let vertex = vertex.expect(
"The commit set was produced statically, so accessing a vertex should not fail",
);
result.push(vertex);
}
result
};
self.inner.add_heads_and_flush(
parent_func,
commit_set_to_vec(master_heads).as_slice(),
commit_set_to_vec(non_master_heads).as_slice(),
)?;
Ok(())
}
pub fn set_cursor(
&self,
effects: &Effects,
repo: &Repo,
event_replayer: &EventReplayer,
event_cursor: EventCursor,
) -> eyre::Result<Self> {
let references_snapshot = event_replayer.get_references_snapshot(repo, event_cursor)?;
let dag = Self::open_without_syncing(
effects,
repo,
event_replayer,
event_cursor,
&references_snapshot,
)?;
Ok(dag)
}
#[instrument]
pub fn get_one_merge_base_oid(
&self,
effects: &Effects,
repo: &Repo,
lhs_oid: NonZeroOid,
rhs_oid: NonZeroOid,
) -> eyre::Result<Option<NonZeroOid>> {
let set = vec![CommitVertex::from(lhs_oid), CommitVertex::from(rhs_oid)];
let set = self
.inner
.sort(&CommitSet::from_static_names(set))
.wrap_err("Sorting DAG vertex set")?;
let vertex = self.inner.gca_one(set).wrap_err("Computing merge-base")?;
match vertex {
None => Ok(None),
Some(vertex) => Ok(Some(vertex.to_hex().parse()?)),
}
}
#[instrument]
pub fn get_range(
&self,
effects: &Effects,
repo: &Repo,
parent_oid: NonZeroOid,
child_oid: NonZeroOid,
) -> eyre::Result<Vec<NonZeroOid>> {
let roots = CommitSet::from_static_names(vec![CommitVertex::from(parent_oid)]);
let heads = CommitSet::from_static_names(vec![CommitVertex::from(child_oid)]);
let range = self.inner.range(roots, heads).wrap_err("Computing range")?;
let range = self.inner.sort(&range).wrap_err("Sorting range")?;
let oids = {
let mut result = Vec::new();
for vertex in range.iter()? {
let vertex = vertex?;
let oid = vertex.as_ref();
let oid = MaybeZeroOid::from_bytes(oid)?;
match oid {
MaybeZeroOid::Zero => {
}
MaybeZeroOid::NonZero(oid) => result.push(oid),
}
}
result
};
Ok(oids)
}
pub fn query(&self) -> &eden_dag::Dag {
&*self.inner.borrow()
}
pub fn query_public_commits(&self) -> eyre::Result<CommitSet> {
let public_commits = self.query().ancestors(self.main_branch_commit.clone())?;
Ok(public_commits)
}
pub fn query_active_heads(
&self,
public_commits: &CommitSet,
observed_commits: &CommitSet,
) -> eyre::Result<CommitSet> {
let active_commits = observed_commits.clone();
let active_heads = self.query().heads(active_commits)?;
let active_heads = active_heads.difference(public_commits);
let anomalous_main_branch_commits = self.obsolete_commits.intersection(public_commits);
let active_heads = active_heads
.union(&self.head_commit)
.union(&self.branch_commits)
.union(&self.main_branch_commit)
.union(&anomalous_main_branch_commits);
Ok(active_heads)
}
pub fn find_path_to_merge_base<'repo>(
&self,
effects: &Effects,
repo: &'repo Repo,
commit_oid: NonZeroOid,
target_oid: NonZeroOid,
) -> eyre::Result<Option<Vec<Commit<'repo>>>> {
let range = self.get_range(effects, repo, target_oid, commit_oid)?;
let path = {
let mut path = Vec::new();
for oid in range {
let commit = match repo.find_commit(oid)? {
Some(commit) => commit,
None => {
warn!("Commit in path to merge-base not found: {:?}", oid);
continue;
}
};
path.push(commit)
}
path
};
if path.is_empty() {
Ok(None)
} else {
Ok(Some(path))
}
}
#[instrument]
pub fn find_path_to_main_branch(
&self,
effects: &Effects,
head: CommitSet,
) -> eyre::Result<Option<CommitSet>> {
let merge_base = {
let (_effects, _progress) = effects.start_operation(OperationType::GetMergeBase);
self.query().gca_one(self.main_branch_commit.union(&head))?
};
let merge_base = match merge_base {
Some(merge_base) => merge_base,
None => return Ok(None),
};
let path = {
let (_effects, _progress) = effects.start_operation(OperationType::FindPathToMergeBase);
self.query().range(CommitSet::from(merge_base), head)?
};
Ok(Some(path))
}
}
impl std::fmt::Debug for Dag {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "<Dag>")
}
}
pub fn sort_commit_set<'repo>(
repo: &'repo Repo,
dag: &Dag,
commit_set: &CommitSet,
) -> eyre::Result<Vec<Commit<'repo>>> {
let commit_oids = commit_set_to_vec(commit_set)?;
let mut commits: Vec<Commit> = {
let mut commits = Vec::new();
for commit_oid in commit_oids {
if let Some(commit) = repo.find_commit(commit_oid)? {
commits.push(commit)
}
}
commits
};
let commit_times: HashMap<NonZeroOid, git2::Time> = commits
.iter()
.map(|commit| (commit.get_oid(), commit.get_time()))
.collect();
commits.sort_by(|lhs, rhs| {
let lhs_vertex = CommitVertex::from(lhs.get_oid());
let rhs_vertex = CommitVertex::from(rhs.get_oid());
if dag
.query()
.is_ancestor(lhs_vertex.clone(), rhs_vertex.clone())
.unwrap_or_else(|_| {
warn!(
?lhs_vertex,
?rhs_vertex,
"Could not calculate `is_ancestor`"
);
false
})
{
return Ordering::Less;
} else if dag
.query()
.is_ancestor(rhs_vertex.clone(), lhs_vertex.clone())
.unwrap_or_else(|_| {
warn!(
?lhs_vertex,
?rhs_vertex,
"Could not calculate `is_ancestor`"
);
false
})
{
return Ordering::Greater;
}
(commit_times[&lhs.get_oid()], lhs.get_oid())
.cmp(&(commit_times[&rhs.get_oid()], rhs.get_oid()))
});
Ok(commits)
}
pub enum ResolveCommitsResult<'repo> {
Ok {
commits: Vec<Commit<'repo>>,
},
CommitNotFound {
commit: String,
},
}
#[instrument]
pub fn resolve_commits(repo: &Repo, hashes: Vec<String>) -> eyre::Result<ResolveCommitsResult> {
let mut commits = Vec::new();
for hash in hashes {
let commit = match repo.revparse_single_commit(&hash)? {
Some(commit) => commit,
None => return Ok(ResolveCommitsResult::CommitNotFound { commit: hash }),
};
commits.push(commit)
}
Ok(ResolveCommitsResult::Ok { commits })
}