mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revset_graph: ignore missing edges thoroughly in remove_transitive_edges()

Browse source
This commit is contained in:
Yuya Nishihara 2025-08-03 15:08:19 +09:00
parent 13a2bbe1b8
commit ad7c42e04b
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/default_index/revset_graph_iterator.rs
View file

@ -250,21 +250,19 @@ impl<'a> RevsetGraphWalk<'a> {
if !edges.iter().any(|edge| edge.is_indirect()) {
return Ok(edges);
}
let Some(max_position) = edges.iter().map(|edge| edge.target).max() else {
let Some(max_position) = reachable_positions(&edges).max() else {
return Ok(edges);
};
let mut min_generation = u32::MAX;
let mut initial_targets = PositionsBitSet::with_max_pos(max_position);
let mut work = vec![];
// To start with, add the edges one step after the input edges.
for edge in &edges {
initial_targets.set(edge.target);
if !edge.is_missing() {
assert!(self.look_ahead.binary_search(&edge.target).is_ok());
let entry = index.commits().entry_by_pos(edge.target);
min_generation = min(min_generation, entry.generation_number());
work.extend_from_slice(self.edges_from_internal_commit(index, &entry)?);
}
for pos in reachable_positions(&edges) {
initial_targets.set(pos);
assert!(self.look_ahead.binary_search(&pos).is_ok());
let entry = index.commits().entry_by_pos(pos);
min_generation = min(min_generation, entry.generation_number());
work.extend_from_slice(self.edges_from_internal_commit(index, &entry)?);
}
// Find commits reachable transitively and add them to the `unwanted` set.
let mut unwanted = PositionsBitSet::with_max_pos(max_position);
@ -336,3 +334,12 @@ impl RevWalk<CompositeIndex> for RevsetGraphWalk<'_> {
self.try_next(index).transpose()
}
}
fn reachable_positions(
edges: &[CommitGraphEdge],
) -> impl DoubleEndedIterator<Item = GlobalCommitPosition> {
edges
.iter()
.filter(|edge| !edge.is_missing())
.map(|edge| edge.target)
}